aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/translation.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-01 09:56:04 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-01 09:56:04 -0800
commit139963c99a955520db6373343662e55f4d16dcd1 (patch)
tree56220dd9b09dc2341c6431784aa0f13d96d72743 /actionpack/lib/abstract_controller/translation.rb
parentceb66b61264657898cd6608c7e9ed78072169664 (diff)
parent8ccaa34103f1c37f7549f7f6c47a21dba21624db (diff)
downloadrails-139963c99a955520db6373343662e55f4d16dcd1.tar.gz
rails-139963c99a955520db6373343662e55f4d16dcd1.tar.bz2
rails-139963c99a955520db6373343662e55f4d16dcd1.zip
Merge branch 'master-security'
* master-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options Conflicts: actionpack/lib/action_view/helpers/tags/base.rb
Diffstat (limited to 'actionpack/lib/abstract_controller/translation.rb')
0 files changed, 0 insertions, 0 deletions