diff options
| author | Paul Mucur <mudge@mudge.name> | 2010-06-11 23:38:18 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-13 04:19:35 +0200 |
| commit | 58e21a4a0d4eefc395139e88c1f184b9eaf0b4c4 (patch) | |
| tree | b1af32b1a6f57366f6f916c4ffbf516f814483f5 /activesupport/CHANGELOG | |
| parent | a087bc85fd24e7261ce6a6f63ffa2dbd49db567d (diff) | |
| download | rails-58e21a4a0d4eefc395139e88c1f184b9eaf0b4c4.tar.gz rails-58e21a4a0d4eefc395139e88c1f184b9eaf0b4c4.tar.bz2 rails-58e21a4a0d4eefc395139e88c1f184b9eaf0b4c4.zip | |
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 <fxn@hashref.com>
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
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] |