Merge pull request #8082 from nikitug/backport_serialized_attributes_before_type_cast

Backport #8078: Fix `attributes_before_type_cast` for serialised attributes
Revert "Respect children paths filter settings"

This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
Revert "Respect children paths filter settings"

This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
Lock sprockets to 2.2.x
Fix redirect example block

See #8160. [ci skip]
Merge pull request #8161 from guilleiguaran/downgrade-sprockets

Lock sprockets to 2.2.x

REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release.

In a next release we can relax the dependency again.

See #8099 for more information.
Merge pull request #8161 from guilleiguaran/downgrade-sprockets

Lock sprockets to 2.2.x

REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release.

In a next release we can relax the dependency again.

See #8099 for more information.
Bump up to 3.2.9.rc3
Merge branch '3-2-9' into 3-2-stable
Revert "Add test case to assets eager load"

This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
Revert "Add test case to assets eager load"

This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
Bump to 3.2.9
Merge branch '3-2-9' into 3-2-stable
Merge pull request #8154 from bogdan/has_one_association_performance

Remove unwanted transaction when has one association is built

Conflicts:
	activerecord/CHANGELOG.md
Add release date of Rails 3.2.9 to documentation
Merge pull request #8193 from claudiob/add_rails329_release_date

Add release date of Rails 3.2.9 to documentation [ci skip]
Lock mocha in ~> 0.12.x until we fix the Ruby 1.8.7 issues with 0.13.0
backport #8185, `#as_json` isolates options when encoding a hash.

Setting options in a custom `#as_json` method had side effects.
Modifications of the `options` hash leaked outside and influenced
the conversion of other objects contained in the hash.

Conflicts:

	activesupport/CHANGELOG.md
Copy 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*.

[1]
https://github.com/freerange/mocha/commit/f1ff6475ca2871f2977ab84cabbbfe2adadbbee6#diff-5
Use MiniTest in Ruby 1.8 if it is available.

ActiveSupport::TestCase was always inheriting from Test::Unit::TestCase.
This works fine in Ruby 1.9 where Test::Unit::TestCase is a thin wrapper
around MiniTest::Unit::TestCase, but does not work in Ruby 1.8 if the
MiniTest gem is used. What happens is that ActiveSupport inherits from
the Test::Unit::TestCase provided by the standard library, but then
since Minitest is defined, it then seems to proceed on the assumption
that ActiveSupport::TestCase has MiniTest::Unit::TestCase in its
ancestor chain. However, in this case it does not.

The fix is simply to choose which test library TestCase to inherit from
using the same logic used elsewhere to detect MiniTest.

I noticed this bug causing issues when using MiniTest and Mocha
in Ruby 1.8, but there may well be other issues.