aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract/views
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-01-08 11:37:48 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2013-01-08 11:37:48 -0800
commit48810a52dfba26cef127168af447a9620d4555c3 (patch)
tree5df95d8adbfcade0f7fedcc06e8e4fe1cdab6580 /actionpack/test/abstract/views
parentf64be7d0d825828098617e6b7c2645dda72d4c18 (diff)
parent746dbd89faf8197e6d6f35f6e428a024923116a2 (diff)
downloadrails-48810a52dfba26cef127168af447a9620d4555c3.tar.gz
rails-48810a52dfba26cef127168af447a9620d4555c3.tar.bz2
rails-48810a52dfba26cef127168af447a9620d4555c3.zip
Merge branch '3-2-sec' into 3-2-secmerge
* 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
Diffstat (limited to 'actionpack/test/abstract/views')
0 files changed, 0 insertions, 0 deletions