diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-04 00:14:44 -0200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-03 18:22:05 -0800 |
| commit | d627c932bdc5c0e2911e39cfb38952c29dab7afc (patch) | |
| tree | 16a2a6723f6a365d98c655e2b23574744ab6f7a3 /railties/lib/rails/application.rb | |
| parent | e5211e3bd052ebc24905c65172d449f7b3bcc73f (diff) | |
| download | rails-d627c932bdc5c0e2911e39cfb38952c29dab7afc.tar.gz rails-d627c932bdc5c0e2911e39cfb38952c29dab7afc.tar.bz2 rails-d627c932bdc5c0e2911e39cfb38952c29dab7afc.zip | |
Pass config.generators options along when RAILS_GENERATORS is set and show --force-plural message just once.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index af73b08547..ce3ab9147c 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -416,7 +416,8 @@ module Rails # === # TODO: Does this need to be an initializer here? initializer :initialize_generators do - if defined?(Rails::Generators) + if defined?(RAILS_GENERATORS) && RAILS_GENERATORS + require 'rails/generators' Rails::Generators.no_color! unless config.generators.colorize_logging Rails::Generators.aliases.deep_merge! config.generators.aliases Rails::Generators.options.deep_merge! config.generators.options |