From 58e21a4a0d4eefc395139e88c1f184b9eaf0b4c4 Mon Sep 17 00:00:00 2001 From: Paul Mucur Date: Fri, 11 Jun 2010 23:38:18 +0100 Subject: Support passing a block to ActiveSupport::OrderedHash's merge and merge! [#4838 state:committed] For better consistency with Ruby's own Hash implementation. Signed-off-by: Xavier Noria --- activesupport/CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activesupport/CHANGELOG') diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 3f61e9949d..54ac9d9588 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *Rails 3.0.0 [Release Candidate] (unreleased)* +* Ruby 1.9 compatibility: ActiveSupport::OrderedHash#merge and #merge! accept a block. #4838 [Paul Mucur] + * Date#since, #ago, #beginning_of_day, #end_of_day, and #xmlschema honor now the user time zone if set. [Geoff Buesing] -- cgit v1.2.3