aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/localized_templates_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-03-18 10:17:32 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-03-18 10:17:32 -0700
commit2392535f4085d88186097e3c23414e958fb1d16d (patch)
treeff6fa883b22554acc0c464395ffbd4ae3b4f6210 /actionpack/test/controller/localized_templates_test.rb
parent0053c21019494fc3f5d14a11062e633bdb23bd2f (diff)
parente115ace02a88290d2fc707b4979f23728c300950 (diff)
downloadrails-2392535f4085d88186097e3c23414e958fb1d16d.tar.gz
rails-2392535f4085d88186097e3c23414e958fb1d16d.tar.bz2
rails-2392535f4085d88186097e3c23414e958fb1d16d.zip
Merge branch 'master-sec'
* master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
Diffstat (limited to 'actionpack/test/controller/localized_templates_test.rb')
0 files changed, 0 insertions, 0 deletions