Fix a few warnings of unused variables
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 8133a81 for more detail.
Merge pull request #8835 from sikachu/3-1-stable-fix-ars

Remove test for XML YAML parsing
Merge pull request #5896 from sferik/revert_5861

Revert #5861. Feature-detect which MultiJson API to use.
Conflicts:
	activesupport/activesupport.gemspec

This backports multi_json version depedency changes as applied.

Rationale: #5861

Patch by sferik
Merge pull request #8846 from AlexRiedler/revert_5861

Backport multi_json dependency revert of #5861 to 3-1-stable
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 #8889 from dylanahsmith/3-1-parse-non-object-json-params

3-1-stable: Fix JSON params parsing regression for non-object JSON content.
Remove unnecessary caching of ParameterFilter
Fix 3-1-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
Merge pull request #8871 from freerange/3-1-stable-with-mocha-fixes

Fix 3-1-stable to work with Mocha >= v0.13.0
Update mocha version to 0.13.0 and change requires

Conflicts:
	Gemfile
	railties/test/application/route_inspect_test.rb
	railties/test/generators_test.rb
remove the warning when testing whiny_nil
Fix build. It seems that the Mocha's behavior were changed.
active_record: Quote numeric values compared to string columns.
Merge pull request #9209 from dylanahsmith/3-1-mysql-quote-numeric

[3.1] active_record: Quote numeric values compared to string columns.
Fix test failure for ruby 1.8
Merge pull request #9226 from robertomiranda/fix-bigdecimal-test

[3.1] Fix test failure for ruby 1.8
Fix issue with attr_protected where malformed input could circumvent
protection

Fixes: CVE-2013-0276
bumping to 3.1.11