diff options
author | José Valim <jose.valim@gmail.com> | 2011-11-09 14:04:04 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-11-09 14:04:04 -0800 |
commit | 4c59170bb3d0257dfedf1e2be76b2a0dcea4b8e7 (patch) | |
tree | a1334bae95b4791bd99eddc82ce81f102ff1eb98 | |
parent | f686d9429fc964ca7ef0c7a8246ac25fd861a05b (diff) | |
parent | a658fd2ffa2fd2019696ddd10b12aa5490b1668e (diff) | |
download | rails-4c59170bb3d0257dfedf1e2be76b2a0dcea4b8e7.tar.gz rails-4c59170bb3d0257dfedf1e2be76b2a0dcea4b8e7.tar.bz2 rails-4c59170bb3d0257dfedf1e2be76b2a0dcea4b8e7.zip |
Merge pull request #3589 from amatsuda/console_extend_command_bundle_fix
Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application
-rw-r--r-- | railties/lib/rails/application.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/commands/console.rb | 2 |
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 |