diff options
| author | José Valim <jose.valim@gmail.com> | 2010-11-11 19:39:21 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-11 19:39:21 +0100 |
| commit | f912a359aaaffa04fedb2ffd5730284d629b481a (patch) | |
| tree | ee0163b662d378ba9dfe327cbbe17f3cde07790c /railties/lib/rails/engine/configuration.rb | |
| parent | de2933e1a062f0752512eb0ec60f7217f4890f8c (diff) | |
| parent | cc135e3b6df1785852de2470b4b93559c88c891e (diff) | |
| download | rails-f912a359aaaffa04fedb2ffd5730284d629b481a.tar.gz rails-f912a359aaaffa04fedb2ffd5730284d629b481a.tar.bz2 rails-f912a359aaaffa04fedb2ffd5730284d629b481a.zip | |
Merge remote branch 'drogus/plugin_new'
Conflicts:
railties/test/generators/app_generator_test.rb
Diffstat (limited to 'railties/lib/rails/engine/configuration.rb')
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 7a07dcad7d..4f458b0aee 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -10,6 +10,7 @@ module Rails def initialize(root=nil) super() @root = root + @generators = app_generators.dup end # Returns the middleware stack for the engine. |