From 6341c1c698e69fdaba4fd212d16ab3e8979e9c6e Mon Sep 17 00:00:00 2001 From: Andrew White Date: Wed, 2 Nov 2016 13:38:36 +0000 Subject: 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. --- activesupport/lib/active_support/i18n.rb | 4 ++++ 1 file changed, 4 insertions(+) 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' -- cgit v1.2.3