aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-03-10 18:09:09 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-03-10 18:10:11 -0500
commitc76190ed76d030452eeee9934f22b2f8bb21405b (patch)
tree9e1962b2de90688a9a450cfa451bc190482710a3 /actionpack/CHANGELOG.md
parentc56c4e4121635ec1221d1a83dd53cedf92ffa283 (diff)
parent4d7986283653ff4fbd5a82dd273ed9795a0c6a65 (diff)
downloadrails-c76190ed76d030452eeee9934f22b2f8bb21405b.tar.gz
rails-c76190ed76d030452eeee9934f22b2f8bb21405b.tar.bz2
rails-c76190ed76d030452eeee9934f22b2f8bb21405b.zip
Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparameters
Added `reverse_merge`/`reverse_merge!` to AC::Parameters: [Rafael Mendonça França + Mitsutaka Mimura]
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 38132371cc..4b45e95124 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Added `#reverse_merge` and `#reverse_merge!` methods to `ActionController::Parameters`
+
+ *Edouard Chin*
+
* Fix malformed URLS when using `ApplicationController.renderer`
The Rack environment variable `rack.url_scheme` was not being set so `scheme` was