diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-11-10 11:07:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 11:07:23 -0500 |
| commit | cd9d6bed1bc6aeee6566eed5a5162baaeba769e6 (patch) | |
| tree | 6861dbb74063206990784fcc5314a3b7c2e717a8 /actionpack/CHANGELOG.md | |
| parent | d7b333469e347824a9b2302da674d557277014d1 (diff) | |
| parent | 6d7f35ecb1ab6d58bb81ecbf5ff18009fb002425 (diff) | |
| download | rails-cd9d6bed1bc6aeee6566eed5a5162baaeba769e6.tar.gz rails-cd9d6bed1bc6aeee6566eed5a5162baaeba769e6.tar.bz2 rails-cd9d6bed1bc6aeee6566eed5a5162baaeba769e6.zip | |
Merge pull request #26820 from y-yagi/add_bang_merge_to_parameters
add `ActionController::Parameters#merge!`
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index c9c347ea26..d4b8d9b456 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,7 @@ +* Add `ActionController::Parameters#merge!`, which behaves the same as `Hash#merge!`. + + *Yuji Yaginuma* + * Allow keys not found in RACK_KEY_TRANSLATION for setting the environment when rendering arbitrary templates. |