diff options
| author | Sam Stephenson <sam@37signals.com> | 2006-01-21 23:52:40 +0000 |
|---|---|---|
| committer | Sam Stephenson <sam@37signals.com> | 2006-01-21 23:52:40 +0000 |
| commit | 039a90f535f8d80d02cabe79a297275977939b10 (patch) | |
| tree | 755d6ba5fcd42a1374ee956071aebd1b71c5c019 /activesupport/CHANGELOG | |
| parent | 5436ffa840f26116b14631d5efcd5d17f27f947b (diff) | |
| download | rails-039a90f535f8d80d02cabe79a297275977939b10.tar.gz rails-039a90f535f8d80d02cabe79a297275977939b10.tar.bz2 rails-039a90f535f8d80d02cabe79a297275977939b10.zip | |
Fix the requires in option_merger_test to unbreak AS tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 ef5ecc10d1..2f22573f28 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix the requires in option_merger_test to unbreak AS tests. [Sam Stephenson] + * Make HashWithIndifferentAccess#update behave like Hash#update by returning the hash. #3419, #3425 [asnem@student.ethz.ch, JanPrill@blauton.de, Marcel Molina Jr.] * Add ActiveSupport::JSON and Object#to_json for converting Ruby objects to JSON strings. [Sam Stephenson] |