diff options
| author | Pranas Kiziela <pranas.kiziela@gmail.com> | 2012-09-13 21:49:49 +0300 |
|---|---|---|
| committer | Pranas Kiziela <pranas.kiziela@gmail.com> | 2012-09-13 23:01:18 +0300 |
| commit | 54575d87973b95cbd278fbe086b70761584d286d (patch) | |
| tree | 7c93bc193b5606c061f19fed793ca9cd62055849 /activesupport/CHANGELOG.md | |
| parent | 8692db59af8f0dc468b588963622e61ff982a925 (diff) | |
| download | rails-54575d87973b95cbd278fbe086b70761584d286d.tar.gz rails-54575d87973b95cbd278fbe086b70761584d286d.tar.bz2 rails-54575d87973b95cbd278fbe086b70761584d286d.zip | |
Allow passing block to deep_merge and deep_merge!
Hash#merge accepts block that you can use to customize how hash values
are merged. This change makes merge and deep_merge compatible.
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 0b09f73383..c36df796a8 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,8 @@ ## Rails 4.0.0 (unreleased) ## +* An optional block can be passed to `Hash#deep_merge`. The block will be invoked for each duplicated key + and used to resolve the conflict. *Pranas Kiziela* + * ActiveSupport::Deprecation is now a class. It is possible to create an instance of deprecator. Backwards compatibility has been preserved. |