diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-06-02 16:18:03 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-06-02 16:18:03 -0500 |
| commit | 942fe6514cc0db10c04fd2b46f8e1537beabef71 (patch) | |
| tree | 8b9d057a91861756260aea7990308975305ab475 /railties/lib/rails/generators.rb | |
| parent | 02512914ae547eb664a78c0f6084b121d5283a61 (diff) | |
| parent | ffe001f19dbbd9e697f6300650779f5e1391ce1e (diff) | |
| download | rails-942fe6514cc0db10c04fd2b46f8e1537beabef71.tar.gz rails-942fe6514cc0db10c04fd2b46f8e1537beabef71.tar.bz2 rails-942fe6514cc0db10c04fd2b46f8e1537beabef71.zip | |
Merge branch 'master' of github.com:rails/rails
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 |