Permalink
Browse files

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

* 3-2-rel:
  updating release date
  bumping to 3.2.7
  updating the changelog
  * Do not convert digest auth strings to symbols. CVE-2012-3424
  updating the version
  updating changelogs
  • Loading branch information...
tenderlove committed Jul 26, 2012
2 parents 3dae440 + d1b9cf2 commit 133754ef172706c10d6d1f9393d4fb1a1b19e2d7
View
@@ -1 +1 @@
-3.2.6
+3.2.7
@@ -1,3 +1,7 @@
+## Rails 3.2.7 (Jul 26, 2012)
+
+* No changes.
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
@@ -1,3 +1,21 @@
+## Rails 3.2.7 (Jul 26, 2012) ##
+
+* 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
+
+* 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
@@ -227,9 +227,9 @@ def decode_credentials_header(request)
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
@@ -2,7 +2,7 @@ module ActionPack
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
@@ -1,3 +1,9 @@
+## Rails 3.2.7 (Jul 26, 2012)
+
+* `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.
@@ -2,7 +2,7 @@ module ActiveModel
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -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.
@@ -2,7 +2,7 @@ module ActiveRecord
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -1,3 +1,7 @@
+## Rails 3.2.7 (Jul 26, 2012)
+
+* No changes.
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
@@ -2,7 +2,7 @@ module ActiveResource
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -1,3 +1,11 @@
+## Rails 3.2.7 (Jul 26, 2012)
+
+* 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.
@@ -2,7 +2,7 @@ module ActiveSupport
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
@@ -1,3 +1,8 @@
+## 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
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 7
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

0 comments on commit 133754e

Please sign in to comment.