diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
| commit | fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3 (patch) | |
| tree | 347f771202054a443f9df23a8f65f91d49a52209 /railties/lib/rails/generators.rb | |
| parent | 27fa38cc3e162b2f8c4bb2d50130fbc17bad6039 (diff) | |
| parent | 16c0d1d3b6089bb4b0b0baf7c3eeb5949f31f02b (diff) | |
| download | rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.gz rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.bz2 rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/lib/rails/generators.rb')
| -rw-r--r-- | railties/lib/rails/generators.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 90b513fcb4..8c54014fcb 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -67,6 +67,7 @@ module Rails no_color! unless config.colorize_logging aliases.deep_merge! config.aliases options.deep_merge! config.options + fallbacks.merge! config.fallbacks end def self.aliases #:nodoc: |