aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2011-11-10 06:47:35 +0900
committerAkira Matsuda <ronnie@dio.jp>2011-11-10 06:59:55 +0900
commita658fd2ffa2fd2019696ddd10b12aa5490b1668e (patch)
treea1334bae95b4791bd99eddc82ce81f102ff1eb98 /railties
parentf686d9429fc964ca7ef0c7a8246ac25fd861a05b (diff)
downloadrails-a658fd2ffa2fd2019696ddd10b12aa5490b1668e.tar.gz
rails-a658fd2ffa2fd2019696ddd10b12aa5490b1668e.tar.bz2
rails-a658fd2ffa2fd2019696ddd10b12aa5490b1668e.zip
Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application.rb2
-rw-r--r--railties/lib/rails/commands/console.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index e8b160448b..82fffe86bb 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,8 +205,6 @@ module Rails
require "pp"
require "rails/console/app"
require "rails/console/helpers"
-
- IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
end
end
end
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 32e361d421..7733a8f116 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -42,6 +42,8 @@ module Rails
else
puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
end
+
+ IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
IRB.start
end
end