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

This reverts commit 38cf00e553bc709cd1f9c4b14992d9730554f757.

Conflicts:
	railties/CHANGELOG.md
Upgrading Ruby on Rails guide is no longer WIP [ci skip]
Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load

Fix regression on eager loading association based on SQL query rather than existing column.

Conflicts:
	activerecord/CHANGELOG.md
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
Merge pull request #15701 from zzak/issue_15496

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

Sprucing it up a bit for the release.
Merge pull request #15785 from jonatack/patch-7

4.1.2 ActionPack CHANGELOG grammar pass [ci skip]
4.1.2 ActionView CHANGELOG grammar pass [ci skip]
Merge pull request #15796 from jonatack/patch-7

 4.1.2 ActionView CHANGELOG pass [ci skip]
Fix has_and_belongs_to_many in a namespaced model pointing to a non namespaced model

Now the following case will work fine

    class Tag < ActiveRecord::Base
    end

    class Publisher::Article < ActiveRecord::Base
      has_and_belongs_to_many :tags
    end

Fixes #15761
Merge pull request #15772 from nbudin/sti_through_bug

Don't include inheritance column in the through_scope_attributes
Preparing for 4.1.2.rc3 release
Preparing for 4.1.2 release
Point to the newest version [ci skip]
Merge branch '4-1-2' into 4-1-stable

Conflicts:
	actionmailer/CHANGELOG.md
	actionpack/CHANGELOG.md
	actionview/CHANGELOG.md
	activerecord/CHANGELOG.md
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md