diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-03-16 15:43:23 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-03-16 15:43:23 +1100 |
| commit | fc63fccaa3f2f8c9ab506685974bdbf5143a0329 (patch) | |
| tree | 073279b7a35b73d348c80683d70963a3e30ab6b6 | |
| parent | ea1889f87c300ac5c0de5d8c5c976fbb750c448d (diff) | |
This no longer requires iconv in Ruby 1.9
| -rw-r--r-- | config/initializers/alaveteli.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index f182a3722..15d53be4c 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -1,13 +1,6 @@ if RUBY_VERSION.to_f >= 1.9 # the default encoding for IO is utf-8, and we use utf-8 internally Encoding.default_external = Encoding.default_internal = Encoding::UTF_8 - # Suppress warning messages and require inflector to avoid iconv deprecation message - # "iconv will be deprecated in the future, use String#encode instead." when loading - # it as part of rails - original_verbose, $VERBOSE = $VERBOSE, nil - require 'active_support/inflector' - # Activate warning messages again. - $VERBOSE = original_verbose end # MySociety specific helper functions |