diff options
| author | Ryunosuke SATO <tricknotes.rs@gmail.com> | 2012-12-29 04:38:14 +0900 |
|---|---|---|
| committer | Ryunosuke SATO <tricknotes.rs@gmail.com> | 2013-02-11 00:09:02 +0900 |
| commit | c112721b44cc1b4446ee4e9e4080d2b630c0b09e (patch) | |
| tree | 87d1ced6c8776815a8157fe45138749e14e232e3 /activesupport | |
| parent | 90397de416bb4d9d852a1baa65f954c81bf9911a (diff) | |
| download | rails-c112721b44cc1b4446ee4e9e4080d2b630c0b09e.tar.gz rails-c112721b44cc1b4446ee4e9e4080d2b630c0b09e.tar.bz2 rails-c112721b44cc1b4446ee4e9e4080d2b630c0b09e.zip | |
Remove method redefined warning
In `i18n` gem, the method definition of `Hash#deep_merge!` is skipped
when it is already defined.
- warning: method redefined; discarding old deep_merge!
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index 188653bd9b..8d8bf02927 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,4 +1,5 @@ begin + require 'active_support/core_ext/hash/deep_merge' require 'i18n' require 'active_support/lazy_load_hooks' rescue LoadError => e |