* Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu

Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md

Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/predicate_builder.rb
CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
bumping version
Remove test for XML YAML parsing

The support for YAML parsing in XML has been removed from Active Support
since it introduced an security risk. See a494824 for more detail.
Merge pull request #8836 from sikachu/3-0-stable-fix-ars

Remove test for XML YAML parsing
Methods that return nil should not be considered YAML

This is a direct port of @jaw6's pull request
https://github.com/rails/rails/pull/492. His cleanly applied to Rails
v3.1 and v3.2, and this cleanly applies to v3.0.

With yesterday's security patches
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
there is now an issue with Rails v3.0 serving XML to any of the latest
versions of ActiveResource.

Without this, Rails v3.0 can serve XML to ActiveResource consumers that
will see `Hash::DisallowedType: Disallowed type attribute: "yaml"`
Merge pull request #8853 from zmoazeni/3-0-xml-serialization-fix

Methods that return nil should not be considered YAML
Update changelogs with release dates and minor improvements [ci skip]
Fix JSON params parsing regression for non-object JSON content.

Backports #8855.
Merge pull request #8890 from dylanahsmith/3-0-parse-non-object-json-params

3-0-stable: Fix JSON params parsing regression for non-object JSON content.
Remove unnecessary caching of ParameterFilter
Fix 3-0-stable to work with Mocha >= v0.13.0

A) Update code in ActiveSupport which monkey-patches Test::Unit to
include Mocha bug fix.

A bug was fixed [1] in Mocha's integration with Test::Unit, but this
monkey-patching code was copied before the fix. We need to copy the
fixed version.

The bug meant that an unexpected invocation against a mock within the
teardown method caused a test *error* and not a test *failure*.

B) Fix for Test::Unit/Mocha compatibility.

Mocha is now using a single AssertionCounter which needs a reference to
the testcase as opposed to the result.

This change is an unfortunate consequence of the copying of a chunk of
Mocha's internal code in order to monkey-patch Test::Unit.

C) Avoid a Mocha deprecation warning.

[1]
https://github.com/freerange/mocha/commit/f1ff6475ca2871f2977ab84cabbbfe2adadbbee6#diff-5
commit 0591f6d1e0b4768877559f85394947f94565fabf 1 parent 8b3109a441
Merge pull request #8872 from freerange/3-0-stable-with-mocha-fixes

Fix 3-0-stable to work with Mocha >= v0.13.0
Update mocha version to 0.13.0 and change requires
Remove not used variable warning
Fix indentation to remove warning
remove the warning when testing whiny_nil
Fix build. It seems that the Mocha's behavior were changed.
Update failing tests overriding destroy method instead of using mocha expectation

Mocha by default does not allow adding expectation to frozen objects,
just applying a workaround to ensure the method is never called, making
the tests pass without enabling this again in mocha.
Remove obsolete rake/rdoctask require

Requiring this now raises a RuntimeError, failing the test.
It also seems that the require is unnecessary to pass the test.