update CHANGELOG
rephrase the overriding views part about the view path

See rails/rails#12608
fix typo introduced when searching in markdown document with vim
Fix typo: `has_many :pets`, not `pets :has_many`.
Merge pull request #12629 from Peeja/has_many-pets-typo

Fix typo: `has_many :pets`, not `pets :has_many`.
Merge pull request #12624 from timsly/master

update CHANGELOG
Improve the CHANGELOG entry [ci skip]
Merge pull request #12611 from antonio/slice_bang_honor_default_proc

Make slice! honor default hash value/proc
always check to see if methods exist after calling define_attribute_methods
Merge pull request #10471 from andyw8/button_to_params

Add params option for button_to

Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #12635 from mperham/4-0-stable

Allow any version of BCrypt
Add CHANGELOG entry for #12635 [ci skip]
Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methods

Always check to see if methods exist after calling define_attribute_methods
Merge pull request #8491 from igagnidz/master

Issue #8442
Improve the test code for #8422

* Remove unneeded comments.
* Use key? instead of keys.include?.
Avoid unnecessary catching of Exception instead of StandardError (converting Exceptions into StandardErrors)
Merge pull request #12636 from kongregate/dont_rescue_Exceptions

Avoid unnecessary catching of Exception instead of StandardError (conver...
Save association when primary key is manually set
Merge pull request #12621 from laurocaetano/fix_has_one_association_with_primary_key_set

Save association when primary key is manually set

Conflicts:
	activerecord/CHANGELOG.md
test to verify the `ActiveRecord::Store` behavior with PG's json type