aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRyan Bigg <git@ryanbigg.com>2015-04-23 13:05:30 +1000
committerRyan Bigg <git@ryanbigg.com>2015-05-21 16:50:41 +1000
commitf9640b090019d9cff899b28a8c8d4f638ad04acb (patch)
treebb4ab3b856154bed774537f09a2cb2fdfb288cf2 /railties/lib/rails
parent40ff5087ec3c932d2b8f79425d8b741f7ed3f362 (diff)
downloadrails-f9640b090019d9cff899b28a8c8d4f638ad04acb.tar.gz
rails-f9640b090019d9cff899b28a8c8d4f638ad04acb.tar.bz2
rails-f9640b090019d9cff899b28a8c8d4f638ad04acb.zip
Remove redundant 'Rails' from Rails::AppRailsLoader constant
Diffstat (limited to 'railties/lib/rails')
-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.rb2
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) }