test case to assert that associations do not overwrite after create, fixes #9310
Fix ActiveRecord::Store not tracking changes
Fix textile markup

Closes #11076

[ci skip]
Merge pull request #10971 from dtaniwaki/escape_link_to_unless

Always escape the result of link_to_unless method
Add CHANGELOG entry for #10971

[ci skip]
Fix shorthand routes where controller and action are in the scope

Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
shorthand syntax (i.e. endpoint is inferred from the the path).

Fixes #9856

Backport of 37b4276
Use old style hash syntax for 3-2-stable
Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader""

This reverts commit 5009b078875e596a2fba7827336f7548aa6e35ac.

Also updated the CHANGELOG and adjusted the test-case to match the one on master.
Merge pull request #10373 from janko-m/fix-store-accessor

Fix a bug in ActiveRecord::Store accessors
Move changelog entry to the top [ci skip]
Merge pull request #9893 from JonRowe/add_test_to_assert_association_doesnt_overwrite

Add a test to assert autosaving associations doesn't overwrite id accessor methods
Allow global override of default STI inheritance column

This change fixes a bug by which 3.2-STABLE users can't globally override the default STI inheritance column with `ActiveRecord::Base.inheritance_column = 'some_column'`. 3.2-STABLE users are forced to use a deprecated method or monkey patch it otherwise.

Test case written by tkhr <takehiro0740@gmail.com>.
build fix, fall back to old hash syntax
Merge pull request #11019 from tkhr/test_case_for_issue_10393

Add test case for issue #10393 and fix warning message