aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-25 01:16:32 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-25 01:16:50 +0200
commit594b749f3c81102a1f89480d0f8f10b464b895a7 (patch)
tree64be4f3726e5510e18c7f2632452bfb600d3597f /railties/lib/rails/application.rb
parentd1d34ce4990f6e9f1110d71ec5a9fd59dc5a6538 (diff)
downloadrails-594b749f3c81102a1f89480d0f8f10b464b895a7.tar.gz
rails-594b749f3c81102a1f89480d0f8f10b464b895a7.tar.bz2
rails-594b749f3c81102a1f89480d0f8f10b464b895a7.zip
Streamline generators initialization flow.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 4a79e68c76..21e6f69b92 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -106,13 +106,13 @@ module Rails
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(sandbox=false)
- initialize_console(sandbox)
+ initialize_console
railties.all { |r| r.load_console(sandbox) }
super()
self
@@ -197,7 +197,7 @@ module Rails
require "rails/generators"
end
- def initialize_console(sandbox=false)
+ def initialize_console
require "pp"
require "rails/console/app"
require "rails/console/helpers"