diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 02:26:01 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 02:26:01 -0800 |
| commit | 3e53fe635c6e7b82609219422458574e2f74b551 (patch) | |
| tree | 8cb4f4c7cb47541dcbe683c5e986dd0c0fdbdc08 /activesupport/CHANGELOG.md | |
| parent | 618923280048928aff50eed4fe9a9b08f9ebad72 (diff) | |
| parent | be79632b96d6fe6b844c99561ce96f540e98cae0 (diff) | |
| download | rails-3e53fe635c6e7b82609219422458574e2f74b551.tar.gz rails-3e53fe635c6e7b82609219422458574e2f74b551.tar.bz2 rails-3e53fe635c6e7b82609219422458574e2f74b551.zip | |
Merge pull request #8199 from senny/backport_8182
backport #8185, `#as_json` isolates options when encoding a hash.
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 749441e343..d15c341b9f 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 3.2.10 (unreleased) +* `#as_json` isolates options when encoding a hash. [Backport #8185] + Fix #8182 + + *Yves Senn* + * Handle the possible Permission Denied errors atomic.rb might trigger due to its chown and chmod calls. [Backport #8027] |