diff options
| author | Ryunosuke SATO <tricknotes.rs@gmail.com> | 2013-02-11 02:21:59 +0900 |
|---|---|---|
| committer | Ryunosuke SATO <tricknotes.rs@gmail.com> | 2013-02-11 02:29:24 +0900 |
| commit | cfd85255d6dd714425010fc98cadf3f42f7ce367 (patch) | |
| tree | 3e30c064be13c46bb3c6f6317dd07ac6ec10b7dc /activesupport/lib/active_support | |
| parent | a429d9e6f9e1c618d28d472c08eb8eba8c40361e (diff) | |
| download | rails-cfd85255d6dd714425010fc98cadf3f42f7ce367.tar.gz rails-cfd85255d6dd714425010fc98cadf3f42f7ce367.tar.bz2 rails-cfd85255d6dd714425010fc98cadf3f42f7ce367.zip | |
Supress warning about method redifinition
In i18n gem, the following methods are defined.
- `Hash#except`
- `Hash#slice`
But if there are defined already, i18n skips these definitions.
So these definition by `active_support` are required before `require 'i18n'`.
Diffstat (limited to 'activesupport/lib/active_support')
| -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 |