Merge branch '3-2-stable-rel' into 3-2-stable

* 3-2-stable-rel:
  updating changelogs
  bumping version numbers
  updating changelogs with security fixes
  updating changelogs
  Array parameters should not contain nil values.
  Additional fix for CVE-2012-2661
This commit is contained in:
Aaron Patterson
2012-06-12 14:25:27 -07:00
20 changed files with 58 additions and 16 deletions

View File

@@ -1,3 +1,7 @@
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
## Rails 3.2.4 (May 31, 2012) ##
* No changes.

View File

@@ -2,7 +2,7 @@ module ActiveModel
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
TINY = 5
TINY = 6
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')