no need to invoke to_s before applying intern

replace #merge with relation API calls in calculations_test.

Fix regression re: #new with an STI object & complex inheritance

change merge to merge! in AS on new hashes

Added missing assert

This reverts commit 7a9a7007.

Conflicts:
	railties/lib/rails/generators/app_base.rb

This reverts commit 6f3f0f86.

Updated the error message for find to stay consistent across Rails

so that it is consistent with the error thrown for +find+ without an
inverse_of association.

Related with ed8df3ff

Throwing a RecordNotFound exception when a record is scanned using the inverse_of option

inverse_of option. I've also refactored the code for raising a
RecordNotFound exception when searching for records with ids.

[ci skip]

Fixed typo on AP dispatch Mime::Type test

[ci skip]

Reverts changes to Rails.version made in #8501

deprecated

Fixes activerecord-deprecated_finders build.

https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703

Improve documentation around the cookie store auto-upgrade to encryption

Make references with index:true pass Hash options to add_index

Refactor Rails::Generator::TestCase into modules

fix detect column type of enum

Cookie-base session store auto-upgrade

typo recomend -> recommend

enum includes text or blob or ... hooked by wrong regex

This commit closes issue #9775.