From 60281af200180d752b8300bdad3c0a869d56347f Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Thu, 26 May 2011 17:57:46 +0200
Subject: Move load_generators from Rails::Application to Rails::Engine

---
 railties/lib/rails/application.rb | 12 ------------
 railties/lib/rails/engine.rb      | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 953233d774..497d4b5ac3 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -105,14 +105,6 @@ module Rails
       self
     end
 
-    def load_generators(app=self)
-      initialize_generators
-      railties.all { |r| r.load_generators(app) }
-      Rails::Generators.configure!(app.config.generators)
-      super
-      self
-    end
-
     def load_console(app=self)
       initialize_console
       railties.all { |r| r.load_console(app) }
@@ -195,10 +187,6 @@ module Rails
       end
     end
 
-    def initialize_generators
-      require "rails/generators"
-    end
-
     def initialize_console
       require "pp"
       require "rails/console/app"
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 383be1802f..b358de89d0 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -330,6 +330,14 @@ module Rails
     autoload :Configuration, "rails/engine/configuration"
     autoload :Railties,      "rails/engine/railties"
 
+    def load_generators(app=self)
+      initialize_generators
+      railties.all { |r| r.load_generators(app) }
+      Rails::Generators.configure!(app.config.generators)
+      super
+      self
+    end
+
     class << self
       attr_accessor :called_from, :isolated
       alias :isolated? :isolated
@@ -567,6 +575,10 @@ module Rails
 
   protected
 
+    def initialize_generators
+      require "rails/generators"
+    end
+
     def routes?
       defined?(@routes)
     end
-- 
cgit v1.2.3