diff --git a/RAILS_VERSION b/RAILS_VERSION index 78dae579e82b251cc7776f081f3bf77716ae72f2..ee00187eb3410c984aa9a6cf7c8ebdc45241ee60 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -4.1.0.beta1 +4.1.0.beta2 diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 46eb763c26edec0dbae14474c3d84b79cbc46807..60732c593b1559cafcf0064c32c1221d57e77ee9 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,7 +1,7 @@ module ActionMailer # Returns the version of the currently loaded ActionMailer as a Gem::Version def self.version - Gem::Version.new "4.1.0.beta1" + Gem::Version.new "4.1.0.beta2" end module VERSION #:nodoc: diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index a51f6a434af71a7da2038767529137cf4ea71f48..8da3069c8bfc8f2af9d430f83d8c7b9d08fca3b2 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -1,7 +1,7 @@ module ActionPack # Returns the version of the currently loaded ActionPack as a Gem::Version def self.version - Gem::Version.new "4.1.0.beta1" + Gem::Version.new "4.1.0.beta2" end module VERSION #:nodoc: diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 0f38195514c57e41886c052420383b643420b4b7..c141a1fedd04cc34ff2aa619198e76ca5469f4e4 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,7 @@ +* Escape format, negative_format and units options of number helpers + + Fixes: CVE-2014-0081 + * A Cycle object should accept an array and cycle through it as it would with a set of comma-separated objects. diff --git a/actionview/lib/action_view/version.rb b/actionview/lib/action_view/version.rb index edb6d8f11693c8b6d32fa274ec0a8d8c832de58f..3d5d6c9be1e51321fe85041431b908c1eb60b232 100644 --- a/actionview/lib/action_view/version.rb +++ b/actionview/lib/action_view/version.rb @@ -1,7 +1,7 @@ module ActionView # Returns the version of the currently loaded ActionView as a Gem::Version def self.version - Gem::Version.new "4.1.0.beta1" + Gem::Version.new "4.1.0.beta2" end module VERSION #:nodoc: diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 58ba3ab9b20464ffaf0118a59d20d891e7d6d92e..f7c9534ffbce35765390fb6c98b0956ad1b0dd0b 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -1,7 +1,7 @@ module ActiveModel # Returns the version of the currently loaded ActiveModel as a Gem::Version def self.version - Gem::Version.new "4.1.0.beta1" + Gem::Version.new "4.1.0.beta2" end module VERSION #:nodoc: diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index c90ed03ac449e1dc1165a84a1a21766e58e9696b..41d209cf67edfdc0ac844fdaf88f1a7948a3e522 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Correctly escape PostgreSQL arrays. + + Fixes: CVE-2014-0080 + * `Relation` no longer has mutator methods like `#map!` and `#delete_if`. Convert to an `Array` by calling `#to_a` before using these methods. diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 863c3ebe4d165016c747e4207fd7d8a488935fa1..7795561e5163f5f9242f5b65aa44365d4098feff 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -1,7 +1,7 @@ module ActiveRecord # Returns the version of the currently loaded ActiveRecord as a Gem::Version def self.version - Gem::Version.new "4.1.0.beta1" + Gem::Version.new "4.1.0.beta2" end module VERSION #:nodoc: diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index b3f0e7198d10f5ac9e273335454f791c1172fb88..b9d6417b07cd6ad991cb48dd8e1f5525b5121ccb 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -1,7 +1,7 @@ module ActiveSupport # Returns the version of the currently loaded ActiveSupport as a Gem::Version def self.version - Gem::Version.new "4.1.0.beta1" + Gem::Version.new "4.1.0.beta2" end module VERSION #:nodoc: diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 923cab4e2a72a010b984ea8ac4373a743c483d28..e4fd798d18c4a27c495f4cc5739d27c25e16f343 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module VERSION MAJOR = 4 MINOR = 1 TINY = 0 - PRE = "beta1" + PRE = "beta2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/version.rb b/version.rb index 923cab4e2a72a010b984ea8ac4373a743c483d28..e4fd798d18c4a27c495f4cc5739d27c25e16f343 100644 --- a/version.rb +++ b/version.rb @@ -3,7 +3,7 @@ module VERSION MAJOR = 4 MINOR = 1 TINY = 0 - PRE = "beta1" + PRE = "beta2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end