diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-11 15:39:59 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-11 15:39:59 -0700 |
| commit | ceb8ec3eff84b430d3c5630bd1ff38d10c8aa209 (patch) | |
| tree | 12e820648fdd5758a29c9f7f923a9587dadda099 | |
| parent | 301974a44acb852a71a533e3e8fb9470314f5838 (diff) | |
| download | rails-ceb8ec3eff84b430d3c5630bd1ff38d10c8aa209.tar.gz rails-ceb8ec3eff84b430d3c5630bd1ff38d10c8aa209.tar.bz2 rails-ceb8ec3eff84b430d3c5630bd1ff38d10c8aa209.zip | |
updating changelogs with security fixes
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 75fb902196..81ad747684 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 3.2.6 (unreleased) ## +* nil is removed from array parameter values + * Deprecate `:confirm` in favor of `':data => { :confirm => "Text" }'` option for `button_to`, `button_tag`, `image_submit_tag`, `link_to` and `submit_tag` helpers. *Carlos Galdino* diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 71050efbc5..224f58463f 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 3.2.6 (unreleased) ## +* protect against the nesting of hashes changing the + table context in the next call to build_from_hash. This fix + covers this case as well. + * Revert earlier 'perf fix' (see 3.2.4 changelog / GH #6289). This change introduced a regression (GH #6609). assoc.clear and assoc.delete_all have loaded the association before doing the delete |