diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index d15c341b9f..d7cbaa6093 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,12 @@ ## Rails 3.2.10 (unreleased) +* Fix mocha v0.13.0 compatibility. *James Mead* + +* `ActiveSupport::TestCase` now inherits from `Minitest::Unit::TestCase` in Ruby 1.8 + if available, otherwise it inherits from the default `Test::Unit::TestCase`. + + *James Mead* + * `#as_json` isolates options when encoding a hash. [Backport #8185] Fix #8182 |