aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorDylan Smith <Dylan.Smith@shopify.com>2013-01-09 15:26:12 -0500
committerDylan Smith <Dylan.Smith@shopify.com>2013-01-11 00:14:49 -0500
commit7003b36ecfe6f04a87e913828ab0f8dde4e03ecb (patch)
treed100fa9b22d47dcf58212f56c4f98e5226d37005 /actionpack/CHANGELOG.md
parentd564ee06a8430df809397a64e2d5f9d797be7106 (diff)
downloadrails-7003b36ecfe6f04a87e913828ab0f8dde4e03ecb.tar.gz
rails-7003b36ecfe6f04a87e913828ab0f8dde4e03ecb.tar.bz2
rails-7003b36ecfe6f04a87e913828ab0f8dde4e03ecb.zip
Fix JSON params parsing regression for non-object JSON content.
Backports #8855.
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 9a53d6fcf9..f83bbcdced 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 3.2.12 (unreleased) ##
+* Fixed JSON params parsing regression for non-object JSON content.
+
+ *Dylan Smith*
+
* Prevent unnecessary asset compilation when using `javascript_include_tag` on
files with non-standard extensions.