diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-08-31 04:27:59 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-31 04:27:59 -0700 |
| commit | 47b8415bef7edb25bb750685d6f9331f044bbd80 (patch) | |
| tree | e408066b7c5df43b2e1b2fbc4f0ff5478f5efdab /railties/lib/rails.rb | |
| parent | 6d772c0953b418da774b2c3bf5cc297508669da7 (diff) | |
| parent | e746c4047cd34accd7f63aa5d09cbb35011c24e2 (diff) | |
| download | rails-47b8415bef7edb25bb750685d6f9331f044bbd80.tar.gz rails-47b8415bef7edb25bb750685d6f9331f044bbd80.tar.bz2 rails-47b8415bef7edb25bb750685d6f9331f044bbd80.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails.rb')
| -rw-r--r-- | railties/lib/rails.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index de412553aa..73bdd0b552 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -22,8 +22,10 @@ require 'action_dispatch/railtie' if RUBY_VERSION < '1.9' $KCODE='u' else - Encoding.default_external = Encoding::UTF_8 - Encoding.default_internal = Encoding::UTF_8 + silence_warnings do + Encoding.default_external = Encoding::UTF_8 + Encoding.default_internal = Encoding::UTF_8 + end end module Rails |