diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-04 17:07:17 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-04 17:07:17 -0700 |
| commit | ac5089d769d612a596c437085acd3c4ef257ab4e (patch) | |
| tree | fbe62a00a861fc9fcd1338b48df9df96da4e3c0e /activesupport/CHANGELOG.md | |
| parent | 7995c03dc0e8ff8448427de16c98f77aa8bb6a01 (diff) | |
| parent | edab820d9ee5c18780e11752d46d7df73c820ddb (diff) | |
| download | rails-ac5089d769d612a596c437085acd3c4ef257ab4e.tar.gz rails-ac5089d769d612a596c437085acd3c4ef257ab4e.tar.bz2 rails-ac5089d769d612a596c437085acd3c4ef257ab4e.zip | |
Merge pull request #7519 from leocassarani/merge-with-block
Add an optional block to HashWithIndifferentAccess#update and #merge
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 8dd88f9f62..761780fb8b 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 4.0.0 (unreleased) ## +* An optional block can be passed to `HashWithIndifferentAccess#update` and `#merge`. + The block will be invoked for each duplicated key, and used to resolve the conflict, + thus replicating the behaviour of the corresponding methods on the `Hash` class. + + *Leo Cassarani* + * Remove `j` alias for `ERB::Util#json_escape`. The `j` alias is already used for `ActionView::Helpers::JavaScriptHelper#escape_javascript` and both modules are included in the view context that would confuse the developers. |