diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 18:17:13 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 18:17:13 -0300 |
| commit | 08754f12e65a9ec79633a605e986d0f1ffa4b251 (patch) | |
| tree | 19afe9d285cc9169d68de7ea850625833c7bb09c /railties/lib/rails | |
| parent | 0533893df59a11e5c80a9a64d6db018aa46b3459 (diff) | |
| parent | fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 (diff) | |
| download | rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.tar.gz rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.tar.bz2 rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.zip | |
Merge branch 'rm-remove-mocha'
Conflicts:
actionpack/test/abstract_unit.rb
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/app_rails_loader.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb index 56f05b3844..39d8007333 100644 --- a/railties/lib/rails/app_rails_loader.rb +++ b/railties/lib/rails/app_rails_loader.rb @@ -2,6 +2,8 @@ require 'pathname' module Rails module AppRailsLoader + extend self + RUBY = Gem.ruby EXECUTABLES = ['bin/rails', 'script/rails'] BUNDLER_WARNING = <<EOS @@ -26,7 +28,7 @@ generate it and add it to source control: EOS - def self.exec_app_rails + def exec_app_rails original_cwd = Dir.pwd loop do @@ -54,7 +56,7 @@ EOS end end - def self.find_executable + def find_executable EXECUTABLES.find { |exe| File.file?(exe) } end end |