diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-09 00:01:00 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-09 00:01:00 -0700 |
| commit | eb8c0a7b1a4ecad676e4d0733bbf91b88fb01e2a (patch) | |
| tree | 714871363eaaba2123ceebc12e94b307aea6148c /railties/lib/rails/engine.rb | |
| parent | af3f0b6204dd81b4df50dbc567276bf5c8264ebe (diff) | |
| parent | 331d58fb04821546b1e622290432a2dd13e52301 (diff) | |
| download | rails-eb8c0a7b1a4ecad676e4d0733bbf91b88fb01e2a.tar.gz rails-eb8c0a7b1a4ecad676e4d0733bbf91b88fb01e2a.tar.bz2 rails-eb8c0a7b1a4ecad676e4d0733bbf91b88fb01e2a.zip | |
Merge pull request #1356 from flippingbits/fix_engine_generator
Fix engine's generator
Diffstat (limited to 'railties/lib/rails/engine.rb')
| -rw-r--r-- | railties/lib/rails/engine.rb | 12 |
1 files changed, 12 insertions, 0 deletions
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 |