diff options
| author | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
|---|---|---|
| committer | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
| commit | a4e533f1588a5d34dca4ab462b58ddd83eed37c5 (patch) | |
| tree | 58bb3b57ec5664e094ae151c18b6c1915256e364 /config/boot.rb | |
| parent | d473fce1d0451c913d3ef697d3b45bd58c6fff54 (diff) | |
| parent | e649c2a7f19d0a75206149d886ff47b3ccda4e91 (diff) | |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'config/boot.rb')
| -rw-r--r-- | config/boot.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/boot.rb b/config/boot.rb index 90fd9cd4d..0f5e661ed 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -31,7 +31,7 @@ module Rails end def vendor_rails? - File.exist?("#{RAILS_ROOT}/vendor/rails") + File.exist?("#{RAILS_ROOT}/vendor/rails/Rakefile") end def preinitialize |