aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionmailer/CHANGELOG.md2
-rw-r--r--actionpack/CHANGELOG.md4
-rw-r--r--activemodel/CHANGELOG.md2
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activeresource/CHANGELOG.md2
-rw-r--r--activesupport/CHANGELOG.md2
-rw-r--r--railties/CHANGELOG.md2
7 files changed, 11 insertions, 7 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 62ba658516..f19f281e71 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.6 (unreleased)
+## Rails 3.2.6 (Jun 12, 2012)
* No changes.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 81ad747684..4b483b200f 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,7 +1,9 @@
-## Rails 3.2.6 (unreleased) ##
+## Rails 3.2.6 (Jun 12, 2012) ##
* nil is removed from array parameter values
+ CVE-2012-2694
+
* 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/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 9ff96f1f6d..1ea6784042 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.6 (unreleased)
+## Rails 3.2.6 (Jun 12, 2012)
* No changes.
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
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 6efa8e8801..37dcece116 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.6 (unreleased)
+## Rails 3.2.6 (Jun 12, 2012)
* No changes.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index c71ffabbd8..d20e011f0a 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.6 (unreleased)
+## Rails 3.2.6 (Jun 12, 2012)
* No changes.
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index b7a6c4f3b1..1fbfd092e1 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.6 (unreleased)
+## Rails 3.2.6 (Jun 12, 2012)
* No changes.