diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
| commit | 3de59e916d6a3d4eab202cf0c99b1f88905a3b43 (patch) | |
| tree | def6d6a808ebe187be1f37f8a739fd786cc11f02 /railties/lib/initializer.rb | |
| parent | c1cbf02e3170f1004daf4a146cbc41176c2458d3 (diff) | |
| parent | 62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff) | |
| download | rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.gz rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.bz2 rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index f0fb78c8f4..336bff9534 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -244,7 +244,6 @@ module Rails if RUBY_VERSION < '1.9' $KCODE='u' else - Encoding.default_internal = Encoding::UTF_8 Encoding.default_external = Encoding::UTF_8 end end @@ -568,4 +567,13 @@ Run `rake gems:install` to install the missing gems. ActiveSupport::Dependencies.unhook! end end + + # Configure generators if they were already loaded + Initializer.default.add :initialize_generators do + if defined?(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 + end + end end |