aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md15
-rw-r--r--actionpack/lib/action_pack/version.rb2
2 files changed, 15 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 5bb5176083..6f737001de 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.4 (unreleased) ##
+## Rails 3.2.4 (May 31, 2012) ##
* Deprecate old APIs for highlight, excerpt and word_wrap *Jeremy Walker*
@@ -10,6 +10,19 @@
* Deprecate `button_to_function` and `link_to_function` helpers. *Rafael Mendonça França*
+* Don't break Haml with textarea newline fix. GH #393, #4000, #5190, #5191
+
+* Fix options handling on labels. GH #2492, #5614
+
+* Added config.action_view.embed_authenticity_token_in_remote_forms to deal
+ with regression from 16ee611fa
+
+* Set rendered_format when doing render :inline. GH #5632
+
+* Fix the redirect when it receive blocks with arity of 1. Closes #5677
+
+* Strip [nil] from parameters hash. Thanks to Ben Murphy for
+ reporting this! CVE-2012-2660
## Rails 3.2.3 (March 30, 2012) ##
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index d36411ab3a..093af1e542 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module ActionPack
MAJOR = 3
MINOR = 2
TINY = 4
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end