diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-30 14:19:34 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-30 14:19:34 -0700 |
| commit | e83989b5a79c264966ce07e5f4a1e160399505f6 (patch) | |
| tree | 8d63b6b65628271bfb3acafb7f0847bf60c79e70 /activesupport/CHANGELOG.md | |
| parent | 1d75efed8400cb28a7c56e6625be7df31e926c5a (diff) | |
| parent | 8c36eade647357de0acfa1371c4c2e28334ed81d (diff) | |
| download | rails-e83989b5a79c264966ce07e5f4a1e160399505f6.tar.gz rails-e83989b5a79c264966ce07e5f4a1e160399505f6.tar.bz2 rails-e83989b5a79c264966ce07e5f4a1e160399505f6.zip | |
Merge branch 'master' of github.com:rails/rails
* 'master' of github.com:rails/rails:
Fix release instructions
Raise an error when AS::JSON.decode is called with options
Moved all JSON core extensions into core_ext/object/json
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 25667af101..2d934f8bc4 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,7 @@ +* Calling ActiveSupport::JSON.decode with unsupported options now raises an error. + + *Godfrey Chan* + * Support :unless_exist in FileStore *Michael Grosser* |