diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-09-10 07:05:17 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-09-10 07:05:17 -0700 |
| commit | 005b33222d5d6b6642402003a4e6d710ea456e42 (patch) | |
| tree | 862430af11b47ba4d2be12ba17ee5bbaff372f81 /railties/lib/rails | |
| parent | a46fa8df063e6ac1aea2bfdfffbf69cd28fef858 (diff) | |
| parent | 3dffe65d9151598d63ed14aca8773d205fdfe99d (diff) | |
| download | rails-005b33222d5d6b6642402003a4e6d710ea456e42.tar.gz rails-005b33222d5d6b6642402003a4e6d710ea456e42.tar.bz2 rails-005b33222d5d6b6642402003a4e6d710ea456e42.zip | |
Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commit
Revert fixes
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/api/task.rb | 12 | ||||
| -rw-r--r-- | railties/lib/rails/app_rails_loader.rb | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/railties/lib/rails/api/task.rb b/railties/lib/rails/api/task.rb index 1f9568fb5f..3e32576040 100644 --- a/railties/lib/rails/api/task.rb +++ b/railties/lib/rails/api/task.rb @@ -16,8 +16,7 @@ module Rails :include => %w( README.rdoc lib/active_record/**/*.rb - ), - :exclude => 'lib/active_record/vendor/*' + ) }, 'activemodel' => { @@ -33,23 +32,22 @@ module Rails lib/abstract_controller/**/*.rb lib/action_controller/**/*.rb lib/action_dispatch/**/*.rb - ), - :exclude => 'lib/action_controller/vendor/*' + ) }, 'actionview' => { :include => %w( README.rdoc lib/action_view/**/*.rb - ) + ), + :exclude => 'lib/action_view/vendor/*' }, 'actionmailer' => { :include => %w( README.rdoc lib/action_mailer/**/*.rb - ), - :exclude => 'lib/action_mailer/vendor/*' + ) }, 'railties' => { diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb index 4a17803f1c..fbb83fa10e 100644 --- a/railties/lib/rails/app_rails_loader.rb +++ b/railties/lib/rails/app_rails_loader.rb @@ -2,7 +2,7 @@ require 'pathname' module Rails module AppRailsLoader - RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"] + RUBY = Gem.ruby EXECUTABLES = ['bin/rails', 'script/rails'] BUNDLER_WARNING = <<EOS Looks like your app's ./bin/rails is a stub that was generated by Bundler. |