diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-29 01:35:49 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-29 01:35:49 -0700 |
| commit | 540bc3d9b16d33e5c95efa3bbe446264d9c36ff5 (patch) | |
| tree | 2605351e0d3483a99d621c701c58b7949907e5f6 /activesupport/CHANGELOG.md | |
| parent | b8120ab14d695d5ae7392193a6135b5e7cef9c80 (diff) | |
| parent | bf7fbe64f70aa15de00dce30ed90f3669540bab7 (diff) | |
| download | rails-540bc3d9b16d33e5c95efa3bbe446264d9c36ff5.tar.gz rails-540bc3d9b16d33e5c95efa3bbe446264d9c36ff5.tar.bz2 rails-540bc3d9b16d33e5c95efa3bbe446264d9c36ff5.zip | |
Merge pull request #16148 from rails/fix_json_autoload
Fix json autoload
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -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 02aea8d21f..2a53fa95c1 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,10 @@ +* Fixed a compatibility issue with the `Oj` gem when cherry-picking the file + `active_support/core_ext/object/json` without requiring `active_support/json`. + + Fixes #16131. + + *Godfrey Chan* + * Make `Hash#with_indifferent_access` copy the default proc too. *arthurnn*, *Xanders* |