aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-01 11:30:44 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-01 11:32:36 -0300
commitb13d89ea9ee03467dc80a9ad29e3b10cece67b35 (patch)
tree76a61fec9e33858ab184945db3020e5eda9a7fee
parent8d4f63a1a593928c1718e73043c8ca525440fb6b (diff)
downloadrails-b13d89ea9ee03467dc80a9ad29e3b10cece67b35.tar.gz
rails-b13d89ea9ee03467dc80a9ad29e3b10cece67b35.tar.bz2
rails-b13d89ea9ee03467dc80a9ad29e3b10cece67b35.zip
Add release date of 3.2.5 on the CHANGELOG
-rw-r--r--actionmailer/CHANGELOG.md6
-rw-r--r--actionpack/CHANGELOG.md7
-rw-r--r--activerecord/CHANGELOG.md9
-rw-r--r--activeresource/CHANGELOG.md6
-rw-r--r--activesupport/CHANGELOG.md9
5 files changed, 34 insertions, 3 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 58dc6b8ab4..4fd8190ee5 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,7 +1,13 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+* No changes.
+
+
## Rails 3.2.4 (May 31, 2012) ##
* No changes.
+
## Rails 3.2.3 (March 30, 2012) ##
* Upgrade mail version to 2.4.3 *ML*
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index fdfa000c0d..5571513186 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -2,6 +2,12 @@
* Include mounted_helpers (helpers for accessing mounted engines) in ActionDispatch::IntegrationTest by default. *Piotr Sarnacki*
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+* No changes.
+
+
## Rails 3.2.4 (May 31, 2012) ##
* Deprecate old APIs for highlight, excerpt and word_wrap *Jeremy Walker*
@@ -28,6 +34,7 @@
* Strip [nil] from parameters hash. Thanks to Ben Murphy for
reporting this! CVE-2012-2660
+
## Rails 3.2.3 (March 30, 2012) ##
* Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki*
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6767fb74f5..0bd7685f9b 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,11 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+* Restore behavior of Active Record 3.2.3 scopes.
+ A series of commits relating to preloading and scopes caused a regression.
+
+ *Andrew White*
+
+
## Rails 3.2.4 (May 31, 2012) ##
* Perf fix: Don't load the records when doing assoc.delete_all.
@@ -16,6 +24,7 @@
* Predicate builder should not recurse for determining where columns.
Thanks to Ben Murphy for reporting this! CVE-2012-2661
+
## Rails 3.2.3 (March 30, 2012) ##
* Added find_or_create_by_{attribute}! dynamic method. *Andrew White*
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 5a626a262c..bf2a284284 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,7 +1,13 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+* No changes.
+
+
## Rails 3.2.4 (May 31, 2012) ##
* No changes.
+
## Rails 3.2.3 (March 30, 2012) ##
* No changes.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index b231bdd1ac..e1ed948ede 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,11 +1,14 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+* ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and #encode_json methods
+ for custom JSON string literals. *Erich Menge*
+
+
## Rails 3.2.4 (May 31, 2012) ##
* Added #beginning_of_hour and #end_of_hour to Time and DateTime core
extensions. *Mark J. Titorenko*
-* ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and #encode_json methods
- for custom JSON string literals. *Erich Menge*
-
## Rails 3.2.3 (March 30, 2012) ##