test case to assert that associations do not overwrite after create, fixes #9310
Fix ActiveRecord::Store not tracking changes
Merge pull request #10925 from senny/10917_test_to_prevent_regression

regression test + mysql2 adapter raises correct error if conn is closed.
Conflicts:

	activerecord/CHANGELOG.md
nokogiri >= 1.6 doesn't work with ruby 1.8
Compare host scheme using case-insensitive regexp

Before:

    image_tag("HTTP://google.com")
    # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />"
    image_tag("http://google.com")
    # => "<img alt=\"Google\" src=\"http://google.com\" />"

After:

    image_tag("HTTP://google.com")
    # => "<img alt=\"Google\" src=\"HTTP://google.com\" />"
    image_tag("http://google.com")
    # => "<img alt=\"Google\" src=\"http://google.com\" />"

Backport of #10969
indicate the default Rails cache store
memory_store is the default cache store implementation if you call
ActiveSupport::Cache.lookup_store without arguments.
Merge pull request #10883 from ifeelgoods/3-2-stable

The default cache store is :file_store in caching_with_rails.textile
Update the feedback instructions [ci skip]

Since docrails as moved from lifo/docrails to rails/docrails we have
to ask for commit rights or submit patches directly to the rails
repository
Merge pull request #11033 from robin850/patch-1

Update the feedback instructions
Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader

Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader"

This reverts commit 6675d713186c270de1c4684bc1e56742ea2e19e1, reversing
changes made to 919d1a19d5e7871d50c1531351fc3f736bad5d07.

I missed to check the target branch and wrongly merged it into 3-2-stable directly.
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]