diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-27 21:41:06 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-27 21:41:06 -0300 |
| commit | 99c042b3ccaca51bbe249fd2f2bfedf544629ef8 (patch) | |
| tree | c57ffd650c572caaa98e60ea305a233c08b1b5b0 /railties/lib | |
| parent | 7a9651cf1bf364ab7f0eaa660495d9b5e96e6a82 (diff) | |
| parent | f9640b090019d9cff899b28a8c8d4f638ad04acb (diff) | |
| download | rails-99c042b3ccaca51bbe249fd2f2bfedf544629ef8.tar.gz rails-99c042b3ccaca51bbe249fd2f2bfedf544629ef8.tar.bz2 rails-99c042b3ccaca51bbe249fd2f2bfedf544629ef8.zip | |
Merge pull request #19867 from radar/rename-app-rails-loader
Remove redundant 'Rails' from Rails::AppRailsLoader constant
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/app_loader.rb (renamed from railties/lib/rails/app_rails_loader.rb) | 4 | ||||
| -rw-r--r-- | railties/lib/rails/cli.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_loader.rb index 9a7c6c5f2d..a9fe21824e 100644 --- a/railties/lib/rails/app_rails_loader.rb +++ b/railties/lib/rails/app_loader.rb @@ -2,7 +2,7 @@ require 'pathname' require 'rails/version' module Rails - module AppRailsLoader + module AppLoader # :nodoc: extend self RUBY = Gem.ruby @@ -29,7 +29,7 @@ generate it and add it to source control: EOS - def exec_app_rails + def exec_app original_cwd = Dir.pwd loop do diff --git a/railties/lib/rails/cli.rb b/railties/lib/rails/cli.rb index dd70c272c6..11a3a20257 100644 --- a/railties/lib/rails/cli.rb +++ b/railties/lib/rails/cli.rb @@ -2,7 +2,7 @@ require 'rails/app_rails_loader' # If we are inside a Rails application this method performs an exec and thus # the rest of this script is not run. -Rails::AppRailsLoader.exec_app_rails +Rails::AppLoader.exec_app require 'rails/ruby_version_check' Signal.trap("INT") { puts; exit(1) } |