diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-02 08:45:03 +0200 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-03 23:32:12 +1000 |
| commit | 44cb6dce62a75b259a9e00aed1ff0aa1eb369c9b (patch) | |
| tree | f756a6401ba88013e3726f19dcb0f43ab91ba0b3 /railties/lib/rails/generators.rb | |
| parent | a73d6e7913bdc2d4de8c63b7cc4095f0241d761e (diff) | |
| download | rails-44cb6dce62a75b259a9e00aed1ff0aa1eb369c9b.tar.gz rails-44cb6dce62a75b259a9e00aed1ff0aa1eb369c9b.tar.bz2 rails-44cb6dce62a75b259a9e00aed1ff0aa1eb369c9b.zip | |
Still copy application configuration to generator even if they are required earlier. Also tidy up the guide a little bit.
Diffstat (limited to 'railties/lib/rails/generators.rb')
| -rw-r--r-- | railties/lib/rails/generators.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index fe8a6c0b94..af92757053 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -68,6 +68,7 @@ module Rails options.deep_merge! config.options fallbacks.merge! config.fallbacks templates_path.concat config.templates + templates_path.uniq! end def self.templates_path @@ -328,10 +329,5 @@ module Rails paths.uniq! paths end - end -end - -# If the application was already defined, configure generators, -# otherwise you have to configure it by hand. -Rails::Generators.configure! if Rails.respond_to?(:application) && Rails.application +end
\ No newline at end of file |