aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-06-12 14:25:27 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-06-12 14:25:27 -0700
commit10cdbbc56bf31da3a2e030dfe9d399507348f54e (patch)
treec1e1b4371a1dd2a10460fcc503980ffb86d46f14 /activemodel/lib
parent5dd2cfc8b4a89ec6321ebbb0e81cd50d58785b6f (diff)
parent8381d398cedf3e95fb073b8110d80f636cff449c (diff)
downloadrails-10cdbbc56bf31da3a2e030dfe9d399507348f54e.tar.gz
rails-10cdbbc56bf31da3a2e030dfe9d399507348f54e.tar.bz2
rails-10cdbbc56bf31da3a2e030dfe9d399507348f54e.zip
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
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index 474db6b867..73d666262a 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -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('.')