Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade

Cookie-base session store auto-upgrade
Merge pull request #10025 from masarakki/fix_detect_enum_column_on_mysql

fix detect column type of enum
Merge pull request #10021 from pabloh/refactor_rails_generator_test_case

Refactor Rails::Generator::TestCase into modules
Move the class methods to above the protected section
Improve documentation around the cookie store auto-upgrade to encryption
Merge pull request #129 from rafBM/master

Remove “Sweepers” from Caching TOC and mention Page/Action caching removal
Proofreading tweaks to the Mailer guide
Make references with index:true pass Hash options to add_index.
Merge pull request #10010 from pwnall/fix_ref_index_true

Make references with index:true pass Hash options to add_index
Merge pull request #10031 from trevorturk/cookie-store-auto-upgrade-docs

Improve documentation around the cookie store auto-upgrade to encryption
:uniq is still a valid relation option since it was only silently
deprecated

Fixes activerecord-deprecated_finders build.

https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703
Fixed typo on AP dispatch Mime::Type test
Merge pull request #10002 from charliesome/revert-version-method-on-rails

Reverts changes to Rails.version made in #8501
Remove CHANGELOG entry for #10002

[ci skip]
Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_test

Fixed typo on AP dispatch Mime::Type test
:scissors:

[ci skip]
Throwing a RecordNotFound exception when a record is scanned using the
inverse_of option. I've also refactored the code for raising a
RecordNotFound exception when searching for records with ids.
Merge pull request #10022 from wangjohn/find_on_nonexistent_id_raises_error

Throwing a RecordNotFound exception when a record is scanned using the inverse_of option
Revert more Rails.version changes

Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184a