diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-13 13:07:49 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-13 13:07:49 -0700 |
commit | 0247443debe3670b016495aa32602e82186bfce4 (patch) | |
tree | 7c93bc193b5606c061f19fed793ca9cd62055849 /activesupport/CHANGELOG.md | |
parent | 8692db59af8f0dc468b588963622e61ff982a925 (diff) | |
parent | 54575d87973b95cbd278fbe086b70761584d286d (diff) | |
download | rails-0247443debe3670b016495aa32602e82186bfce4.tar.gz rails-0247443debe3670b016495aa32602e82186bfce4.tar.bz2 rails-0247443debe3670b016495aa32602e82186bfce4.zip |
Merge pull request #7628 from Pranas/deep_merge_with_block
Allow passing block to deep_merge and deep_merge!
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. |