diff options
| author | Andre Arko <andre@arko.net> | 2013-03-27 20:23:13 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2013-03-27 20:23:13 -0700 |
| commit | b77bbab25ed90ecccca1f5c23feb641ce1f9ef51 (patch) | |
| tree | a6587d5a2f0d04cfc6a3b14e084eb53e8b349678 /railties | |
| parent | c6fd1fcc91fa4975664177f7f2254a40deacb500 (diff) | |
| download | rails-b77bbab25ed90ecccca1f5c23feb641ce1f9ef51.tar.gz rails-b77bbab25ed90ecccca1f5c23feb641ce1f9ef51.tar.bz2 rails-b77bbab25ed90ecccca1f5c23feb641ce1f9ef51.zip | |
script/rails could never be from bundler
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/app_rails_loader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb index 5697c862ae..40524a8089 100644 --- a/railties/lib/rails/app_rails_loader.rb +++ b/railties/lib/rails/app_rails_loader.rb @@ -20,7 +20,7 @@ module Rails # the application is generated in the original working directory. exec_app_rails unless cwd == Dir.pwd end - else + elsif exe.match(%r(bin/rails$)) # this is a Bundler binstub, so we load the app ourselves Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd)) require File.expand_path('../boot', APP_PATH) |