From 7003b36ecfe6f04a87e913828ab0f8dde4e03ecb Mon Sep 17 00:00:00 2001
From: Dylan Smith <Dylan.Smith@shopify.com>
Date: Wed, 9 Jan 2013 15:26:12 -0500
Subject: Fix JSON params parsing regression for non-object JSON content.

Backports #8855.
---
 actionpack/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

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.
 
-- 
cgit v1.2.3