diff options
| author | Andrew White <andrew.white@unboxed.co> | 2016-11-02 13:38:36 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2016-11-02 16:15:00 +0000 |
| commit | 6341c1c698e69fdaba4fd212d16ab3e8979e9c6e (patch) | |
| tree | 3dae763dc83f27360d3eefe965ec9ce2d1106e00 | |
| parent | 03e3aed60264ae0d12dfdf7a0c57044da49af148 (diff) | |
| download | rails-6341c1c698e69fdaba4fd212d16ab3e8979e9c6e.tar.gz rails-6341c1c698e69fdaba4fd212d16ab3e8979e9c6e.tar.bz2 rails-6341c1c698e69fdaba4fd212d16ab3e8979e9c6e.zip | |
Fix method redefinition warnings in i18n gem
The i18n gem adds its own copies of deep_merge, except and slice if
they haven't been defined so require them early to prevent any
method redefinition warnings from appearing.
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index f9c5e5e2f8..978e87beda 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,3 +1,7 @@ +require 'active_support/core_ext/hash/deep_merge' +require 'active_support/core_ext/hash/except' +require 'active_support/core_ext/hash/slice' + begin require 'i18n' require 'active_support/lazy_load_hooks' |