actionpack/test/controller/render_json_test.rb · v4.1.10.rc4 · Rails relative code / rails-deleted-2

Jul 10, 2014
695af7d3
Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcampbell-rosetta_flash · 695af7d3
Aaron Patterson authored Jul 10, 2014
```
* 'rosetta_flash' of https://github.com/gcampbell/rails:
  Address CVE-2014-4671 (JSONP Flash exploit)

Conflicts:
	actionpack/CHANGELOG.md
```
695af7d3
Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcampbell-rosetta_flash
Aaron Patterson authored Jul 10, 2014
```
* 'rosetta_flash' of https://github.com/gcampbell/rails:
  Address CVE-2014-4671 (JSONP Flash exploit)

Conflicts:
	actionpack/CHANGELOG.md
```