github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 5dd2cfc8b4 8381d398ce
commit 10cdbbc56b
20 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activemodel/lib/active_model/version.rb
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('.')