updating changelogs with security fixes

Backoo · Jun 11, 2012 · ceb8ec3 · ceb8ec3
1 parent 301974a
commit ceb8ec3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.6 (unreleased) ##
 
+*   nil is removed from array parameter values
+
 *   Deprecate `:confirm` in favor of `':data => { :confirm => "Text" }'` option for `button_to`, `button_tag`, `image_submit_tag`, `link_to` and `submit_tag` helpers.
 
     *Carlos Galdino*

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 3.2.6 (unreleased) ##
 
+*   protect against the nesting of hashes changing the
+    table context in the next call to build_from_hash. This fix
+    covers this case as well.
+
 *   Revert earlier 'perf fix' (see 3.2.4 changelog / GH #6289). This
     change introduced a regression (GH #6609). assoc.clear and
     assoc.delete_all have loaded the association before doing the delete