From 125dfdfcf7aa990d49817ef84202f6a374804882 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 23 Jul 2012 14:26:16 -0700 Subject: updating changelogs --- RAILS_VERSION | 2 +- actionmailer/CHANGELOG.md | 4 ++++ actionpack/CHANGELOG.md | 16 ++++++++++++++++ activemodel/CHANGELOG.md | 6 ++++++ activeresource/CHANGELOG.md | 4 ++++ activesupport/CHANGELOG.md | 8 ++++++++ railties/CHANGELOG.md | 5 +++++ 7 files changed, 44 insertions(+), 1 deletion(-) diff --git a/RAILS_VERSION b/RAILS_VERSION index 34cde5690e..742598a3ca 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -3.2.6 +3.2.7.rc1 diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index f19f281e71..89d5ebde01 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,7 @@ +## Rails 3.2.7 (unreleased) + +* No changes. + ## Rails 3.2.6 (Jun 12, 2012) * No changes. diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 4b483b200f..770576f826 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,19 @@ +## Rails 3.2.7 (unreleased) ## + +* Bump Journey requirements to 1.0.4 + +* Add support for optional root segments containing slashes + +* Fixed bug creating invalid HTML in select options + +* Show in log correct wrapped keys + +* Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations. + +* ActionController::Metal doesn't have logger method, check it and then delegate + +* ActionController::Caching depends on RackDelegation and AbstractController::Callbacks + ## Rails 3.2.6 (Jun 12, 2012) ## * nil is removed from array parameter values diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 1ea6784042..8d650500ef 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,9 @@ +## Rails 3.2.7 (unreleased) + +* `validates_inclusion_of` and `validates_exclusion_of` now accept `:within` option as alias of `:in` as documented. + +* Fix the the backport of the object dup with the ruby 1.9.3p194. + ## Rails 3.2.6 (Jun 12, 2012) * No changes. diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index 37dcece116..eb0a073018 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,3 +1,7 @@ +## Rails 3.2.7 (unreleased) + +* No changes. + ## Rails 3.2.6 (Jun 12, 2012) * No changes. diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index d20e011f0a..4c5eaecdea 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,11 @@ +## Rails 3.2.7 (unreleased) + +* Hash#fetch(fetch) is not the same as doing hash[key] +* adds a missing require [fixes #6896] +* make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884] +* Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require +* bump AS deprecation_horizon to 4.0 + ## Rails 3.2.6 (Jun 12, 2012) * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 1fbfd092e1..2205bb6334 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.7 (unreleased) + +* Since Rails 3.2, use layout false to render no layout +* Use strict_args_position! if available from Thor + ## Rails 3.2.6 (Jun 12, 2012) * No changes. -- cgit v1.2.3 From 753c546df4c8d639a8402552bdd5c9d077610f6c Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 23 Jul 2012 14:41:02 -0700 Subject: updating the version --- actionmailer/lib/action_mailer/version.rb | 4 ++-- actionpack/lib/action_pack/version.rb | 4 ++-- activemodel/lib/active_model/version.rb | 4 ++-- activerecord/lib/active_record/version.rb | 4 ++-- activeresource/lib/active_resource/version.rb | 4 ++-- activesupport/lib/active_support/version.rb | 4 ++-- railties/lib/rails/version.rb | 4 ++-- version.rb | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index ef132514b6..fcd9eae7fe 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -2,8 +2,8 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index 58ccf8ebc2..c24558b38a 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -2,8 +2,8 @@ module ActionPack module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 73d666262a..42da22e5f4 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -2,8 +2,8 @@ module ActiveModel module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 43fc292302..ca3c3c052f 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -2,8 +2,8 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 76117593a2..ede74a22e3 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,8 +2,8 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index a54ce0b6cb..639c7cd95d 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -2,8 +2,8 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 421c6e687a..1b30223f6a 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,8 +2,8 @@ module Rails module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/version.rb b/version.rb index 421c6e687a..1b30223f6a 100644 --- a/version.rb +++ b/version.rb @@ -2,8 +2,8 @@ module Rails module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 - PRE = nil + TINY = 7 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end -- cgit v1.2.3 From 27311fef5efa598f281649074255834546d2b4ec Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 26 Jul 2012 13:30:15 -0700 Subject: * Do not convert digest auth strings to symbols. CVE-2012-3424 --- actionpack/lib/action_controller/metal/http_authentication.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 9f2f5476fa..fe4ab65bba 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -227,9 +227,9 @@ module ActionController end def decode_credentials(header) - Hash[header.to_s.gsub(/^Digest\s+/,'').split(',').map do |pair| + HashWithIndifferentAccess[header.to_s.gsub(/^Digest\s+/,'').split(',').map do |pair| key, value = pair.split('=', 2) - [key.strip.to_sym, value.to_s.gsub(/^"|"$/,'').gsub(/'/, '')] + [key.strip, value.to_s.gsub(/^"|"$/,'').delete('\'')] end] end -- cgit v1.2.3 From fb89f6f076152a0b6a05e1ac16c0c06368803f2a Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 26 Jul 2012 13:30:25 -0700 Subject: updating the changelog --- actionpack/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 770576f826..1f17e9a08c 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 3.2.7 (unreleased) ## +* Do not convert digest auth strings to symbols. CVE-2012-3424 + * Bump Journey requirements to 1.0.4 * Add support for optional root segments containing slashes -- cgit v1.2.3 From 21bcac1998c4818bce203d9b1df3940172465f66 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 26 Jul 2012 14:26:23 -0700 Subject: bumping to 3.2.7 --- RAILS_VERSION | 2 +- actionmailer/lib/action_mailer/version.rb | 2 +- actionpack/lib/action_pack/version.rb | 2 +- activemodel/lib/active_model/version.rb | 2 +- activerecord/lib/active_record/version.rb | 2 +- activeresource/lib/active_resource/version.rb | 2 +- activesupport/lib/active_support/version.rb | 2 +- railties/lib/rails/version.rb | 2 +- version.rb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RAILS_VERSION b/RAILS_VERSION index 742598a3ca..406ebcbd95 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -3.2.7.rc1 +3.2.7 diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index fcd9eae7fe..edef330732 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -3,7 +3,7 @@ module ActionMailer MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index c24558b38a..eccfd415fb 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -3,7 +3,7 @@ module ActionPack MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 42da22e5f4..5df84984f4 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -3,7 +3,7 @@ module ActiveModel MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index ca3c3c052f..a0ac059536 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -3,7 +3,7 @@ module ActiveRecord MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index ede74a22e3..051fba8d5d 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -3,7 +3,7 @@ module ActiveResource MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index 639c7cd95d..02c09a3ff2 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -3,7 +3,7 @@ module ActiveSupport MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 1b30223f6a..0594737b29 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/version.rb b/version.rb index 1b30223f6a..0594737b29 100644 --- a/version.rb +++ b/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 3 MINOR = 2 TINY = 7 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end -- cgit v1.2.3 From d1b9cf2d48b4e58da2da563107dd2783e326e287 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 26 Jul 2012 14:34:31 -0700 Subject: updating release date --- actionmailer/CHANGELOG.md | 2 +- actionpack/CHANGELOG.md | 2 +- activemodel/CHANGELOG.md | 2 +- activerecord/CHANGELOG.md | 2 +- activeresource/CHANGELOG.md | 2 +- activesupport/CHANGELOG.md | 2 +- railties/CHANGELOG.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 89d5ebde01..9f008e6947 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) +## Rails 3.2.7 (Jul 26, 2012) * No changes. diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 1f17e9a08c..0aaaaf92ea 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) ## +## Rails 3.2.7 (Jul 26, 2012) ## * Do not convert digest auth strings to symbols. CVE-2012-3424 diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 8d650500ef..475149e852 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) +## Rails 3.2.7 (Jul 26, 2012) * `validates_inclusion_of` and `validates_exclusion_of` now accept `:within` option as alias of `:in` as documented. diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 5cfdc9af14..129b3109d6 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) ## +## Rails 3.2.7 (Jul 26, 2012) ## * `:finder_sql` and `:counter_sql` options on collection associations are deprecated. Please transition to using scopes. diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index eb0a073018..984d3f3099 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) +## Rails 3.2.7 (Jul 26, 2012) * No changes. diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 4c5eaecdea..8f53a57423 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) +## Rails 3.2.7 (Jul 26, 2012) * Hash#fetch(fetch) is not the same as doing hash[key] * adds a missing require [fixes #6896] diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 2205bb6334..d79237c205 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) +## Rails 3.2.7 (Jul 26, 2012) * Since Rails 3.2, use layout false to render no layout * Use strict_args_position! if available from Thor -- cgit v1.2.3