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

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