aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 4f2891577e..7583eb9de2 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Better error message for type conflicts when parsing params. Closes #7962 [spicycode, matt]
+
* Remove unused ActionController::Base.template_class. Closes #10787 [Pratik]
* Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik]