Fix the release task
Preparing for 4.0.6.rc1 release
Revert "Merge pull request #12778 from etehtsea/rake-default-fix"

This reverts commit a263d0b368fbd074bff3ee9058d13b457eaa3116.

Conflicts:
	railties/CHANGELOG.md
Upgrading Ruby on Rails guide is no longer WIP [ci skip]
Do not try to set the foreign_key again on has_many through

Integration tests are inside protected_attributes test suite.

Fixes #15496
Fixes rails/protected_attributes#35
Timestamp values should be present on callbacks

This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a
regression test.

Fixes #15418

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #15701 from zzak/issue_15496

Open extension point for defining options in build_through_record
Preparing for 4.0.6.rc2 release
4.0.6 ActionPack CHANGELOG grammar pass [ci skip]

'cos it looked like it could use a little more <3
Merge pull request #15776 from jonatack/patch-7

4.0.6 ActionPack CHANGELOG grammar pass [ci skip]
Fix a tiny typo in Action Pack's changelog [ci skip]
Merge pull request #15772 from nbudin/sti_through_bug

Don't include inheritance column in the through_scope_attributes

Conflicts:
	activerecord/test/cases/associations/has_many_through_associations_test.rb
Add missing model
Preparing for 4.0.6.rc3 release
inheritance_column need to be symbol to be removed from this hash

We put it with a symbol as name when building the default scope so we
have to use symbol to remove it.
Rails config for raise on missing translations

Add a config to setup whether raise exception for missing translation or
not.

Conflicts:
	actionview/CHANGELOG.md
Preparing for 4.0.6 release
Merge branch '4-0-6' into 4-0-stable

Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activesupport/CHANGELOG.md
Merge pull request #15915 from strzalek/backport-av-raise-missing-translations

Rails config for raise on missing translations
Merge pull request #16004 from JuanitoFatas/doc/patch-1

[ci skip] Add missing prologue section of upgrading ruby on rails guide.