diff options
| -rw-r--r-- | RAILS_VERSION | 2 | ||||
| -rw-r--r-- | actionmailer/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 | ||||
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 2 | ||||
| -rw-r--r-- | activemodel/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 2 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 2 | ||||
| -rw-r--r-- | activeresource/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 9 | ||||
| -rw-r--r-- | activesupport/lib/active_support/version.rb | 2 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 | ||||
| -rw-r--r-- | version.rb | 2 |
16 files changed, 48 insertions, 9 deletions
diff --git a/RAILS_VERSION b/RAILS_VERSION index 66870d92b1..0698331f6a 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -3.2.21 +3.2.22 diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index d7ed55ef4c..76d8028dc6 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.22 (Jun 16, 2015) ## + +* No changes. + + ## Rails 3.2.19 (Jul 2, 2014) ## * No changes. diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index b1d18690eb..ef12355cd7 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 15fc0af20e..b4cd115cf4 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.22 (Jun 16, 2015) ## + +* No changes. + + ## Rails 3.2.19 (Jul 2, 2014) ## * Fix regression when using `ActionView::Helpers::TranslationHelper#translate` with diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index 6d37c72867..f608225e63 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -2,7 +2,7 @@ module ActionPack module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 4f2e4e1959..50a4852f63 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.22 (Jun 16, 2015) ## + +* No changes. + + ## Rails 3.2.19 (Jul 2, 2014) ## * No changes. diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 73ef6f9c6d..a44ecbdb41 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 = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 0334f4454e..34d14f1a80 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.22 (Jun 16, 2015) ## + +* No changes. + + ## Rails 3.2.19 (Jul 2, 2014) ## * Fix SQL Injection Vulnerability in 'bitstring' quoting. diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 2b18007bff..f964aef280 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index 64509399e8..e88d9982b9 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.19 (Jun 16, 2015) ## + +* No changes. + + ## Rails 3.2.19 (Jul 2, 2014) ## * No changes. diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 186c983c02..aa9c06cad2 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,7 +2,7 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 6123be4ab4..6b88ab8343 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,12 @@ +## Rails 3.2.22 (Jun 16, 2015) ## + +* Fix denial of service vulnerability in the XML processing. + + CVE-2015-3227. + + *Aaron Patterson* + + ## Rails 3.2.19 (Jul 2, 2014) ## * Make sure Active Support configurations are applied correctly. diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index c6ce40f0fd..4ff3b521a5 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -2,7 +2,7 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 0ff661cc9f..7b82fe5361 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.22 (Jun 16, 2015) ## + +* No changes. + + ## Rails 3.2.19 (Jul 2, 2014) ## * No changes. diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 6689169256..9a42f80024 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff --git a/version.rb b/version.rb index 6689169256..9a42f80024 100644 --- a/version.rb +++ b/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |