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 /actionpack | |
| 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 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index a681a2dc79..6917d0e06c 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.10 (unreleased) ## +## Rails 3.2.11 (unreleased) ## * Clear url helper methods when routes are reloaded by removing the methods explicitly rather than just clearing the module because it didn't work @@ -72,6 +72,8 @@ *Daniel Fox, Grant Hutchins & Trace Wax* +## Rails 3.2.10 ## + ## Rails 3.2.9 (Nov 12, 2012) ## * Clear url helpers when reloading routes. |