Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables"

This reverts commit 2bad605873b5b720d77ae6388a995827ab7fe705.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This added a regression related with shoulda-matchers, since it
is expecting the instance variable @layouts

See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74

This will introduce back #7459 but this stable release will be backward compatible.
Related with #8068.
Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"

This reverts commit 7d17cd2cbfc086f5aa9dd636e1207eb130150428.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This added a regression since people were relying on this buggy behavior.
This will introduce back #3849 but we will be backward compatible in
stable release.

Fixes #8068.
Fix ActiveRecord#update_column return value
Merge pull request #8083 from saks/fix_update_column_return_value

Fix ActiveRecord#update_column return value
relaxes assertion

This method returns the status of the operation,
but as we generally do in the code base it does
not commit to any particular exact value. Hence,
we do not have to check for a singleton, because
if the implementation changes and returns some
other true value the test should pass.
Fix issue with collection associations and first(n)/last(n)

When calling first(n) or last(n) in a collection, Active Record was
improperly trying to set the inverse of instance in case that option
existed. This change was introduced by
fdf4eae506fa9895e831f569bed3c4aa6a999a22.

In such cases we don't need to do that "manually", since the way
collection will be loaded will already handle that, so we just skip
setting the inverse association when any argument is given to
first(n)/last(n).

The test included ensures that these scenarios will have the inverse of
instance set properly.

Fixes #8087, Closes #8094.
Ensure calling first/last with options correctly set inverse association

Also related to #8087. Thanks @al2o3cr.
Bump to 3.2.9.rc2
Revert "Merge pull request #7668 from Draiken/fix_issue_6497"

This reverts commit 61d5d2d8a97fd289b81991cd79dca3112e7ca135.

Conflicts:
	actionpack/CHANGELOG.md

REASON: This added a backward incompatible change.
Add test to avoid regression of 4a86362
Clear url helpers when reloading routes
Fix accepts_nested_attributes for child classes

Closes GH-8131
Merge pull request #8138 from sobrinho/3-2-stable

Fix accepts_nested_attributes for child classes
start could be a string

Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and
eb876c4d07130f15be2cac7be968cc393f959c62

Conflicts:

	activerecord/lib/active_record/relation/batches.rb
	activerecord/test/cases/batches_test.rb
Fix test_find_in_batches_should_use_any_column_as_primary_key
Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag

Support :multiple option on input tags that also have :index
Conflicts:
	actionpack/lib/action_view/helpers/tags/base.rb
	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
Fix the release in the CHANGELOG [ci skip]
Fix find_in_batches against string IDs when start option is not specified.

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/batches.rb
Use a more descriptive test name
Merge pull request #7987 from alexisbernard/3-2_find_in_batches_compatible_with_strings

Fix find_in_batches with customized primary_key on 3-2-stable