aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-06-12 14:02:40 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-06-12 14:02:40 -0700
commit8381d398cedf3e95fb073b8110d80f636cff449c (patch)
treee0243f81ece3c37dcb071f68cadd55fbdeee6e2a /activerecord/CHANGELOG.md
parentee4209a31eff868aff8d2c2f836e703256c4038e (diff)
downloadrails-8381d398cedf3e95fb073b8110d80f636cff449c.tar.gz
rails-8381d398cedf3e95fb073b8110d80f636cff449c.tar.bz2
rails-8381d398cedf3e95fb073b8110d80f636cff449c.zip
updating changelogs
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 224f58463f..aa6634517e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,9 +1,11 @@
-## Rails 3.2.6 (unreleased) ##
+## Rails 3.2.6 (Jun 12, 2012) ##
* 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.
+ CVE-2012-2695
+
* 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