diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-10 09:33:41 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-10 09:33:41 -0800 |
| commit | 3900a160b6ccdaa27a0237e235d87fff4b54c42f (patch) | |
| tree | 3e30c064be13c46bb3c6f6317dd07ac6ec10b7dc | |
| parent | a429d9e6f9e1c618d28d472c08eb8eba8c40361e (diff) | |
| parent | cfd85255d6dd714425010fc98cadf3f42f7ce367 (diff) | |
| download | rails-3900a160b6ccdaa27a0237e235d87fff4b54c42f.tar.gz rails-3900a160b6ccdaa27a0237e235d87fff4b54c42f.tar.bz2 rails-3900a160b6ccdaa27a0237e235d87fff4b54c42f.zip | |
Merge pull request #9240 from tricknotes/supress-warning
Supress warning about method redifinition
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index 8d8bf02927..22521a8e93 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,5 +1,7 @@ begin require 'active_support/core_ext/hash/deep_merge' + require 'active_support/core_ext/hash/except' + require 'active_support/core_ext/hash/slice' require 'i18n' require 'active_support/lazy_load_hooks' rescue LoadError => e |