diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-12-23 11:52:05 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-12-23 11:52:05 -0800 |
| commit | 2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69 (patch) | |
| tree | e9b8178d3b0fb6236601526bcde3f6628ef74940 /activesupport | |
| parent | 885f59f6852cce670b48680fa0a1b6a4b0998291 (diff) | |
| parent | 325669f0795a9148fd31f7f496a40dc8e114ef52 (diff) | |
| download | rails-2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69.tar.gz rails-2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69.tar.bz2 rails-2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69.zip | |
Merge branch '3-2-sec' into 3-2-secmerge
* 3-2-sec:
CVE-2012-5664 options hashes should only be extracted if there are extra parameters
updating changelog
updating the changelogs
updating the changelog for the CVE
Add release date of Rails 3.2.9 to documentation
Conflicts:
actionmailer/CHANGELOG.md
actionpack/CHANGELOG.md
activemodel/CHANGELOG.md
activerecord/CHANGELOG.md
activeresource/CHANGELOG.md
activesupport/CHANGELOG.md
railties/CHANGELOG.md
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 88707d7edb..834dff60c9 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.10 (unreleased) +## Rails 3.2.11 (unreleased) * Remove surrogate unicode character encoding from ActiveSupport::JSON.encode The encoding scheme was broken for unicode characters outside the basic @@ -19,6 +19,8 @@ *Daniele Sluijters* +## Rails 3.2.10 ## + ## Rails 3.2.9 (Nov 12, 2012) ## * Add logger.push_tags and .pop_tags to complement logger.tagged: |