Aaron Patterson 93fb4c1e62 Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcampbell-rosetta_flash ... * 'rosetta_flash' of https://github.com/gcampbell/rails: Address CVE-2014-4671 (JSONP Flash exploit) Conflicts: actionpack/CHANGELOG.md		2014-07-10 10:20:16 -07:00
..
abstract	Partially revert deprecation of *_filter	2014-06-03 19:53:28 -03:00
assertions	Change all MiniTest to Minitest since, MiniTest namespace has been renamed to Minitest	2013-12-18 14:39:50 +05:30
controller	Address CVE-2014-4671 (JSONP Flash exploit)	2014-07-09 11:37:19 -07:00
dispatch	Merge pull request #13999 from jamox/update_rack	2014-07-08 11:46:56 -07:00
fixtures	Ensure LookupContext in Digestor selects correct variant	2014-03-09 08:47:17 +01:00
journey	Force encoding of US-ASCII to UTF-8 in unescape_uri.	2014-07-10 10:02:11 +01:00
lib/controller	Eliminate JSON.{parse,load,generate,dump} and def to_json	2013-11-05 22:26:45 -08:00
routing	Fix failing test missed for the past year :(	2013-07-17 08:56:34 +01:00
tmp
abstract_unit.rb	Merge pull request #15061 from tgxworld/remove_unnecessary_include	2014-05-29 21:33:12 +09:30