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
Fix performance regression on preloading HABTM associations

We'd spend a lot of time calling `hash` and `eql?` on the join model,
which has no primary key. Calling `id` with no primary key is a really
slow way to get back `nil`, so we can improve the performance there.
However, even with the escape clause, we *still* weren't getting high
enough performance, as we were checking the primary key too much. `hash`
will always return `nil.hash` for records with no id, and `==` will
always return `false`. We can optimize those cases in the HABTM join
model.
Merge pull request #15675 from sgrif/sg-4-1-id-perf

Fix performance regression on preloading HABTM associations
Merge pull request #15683 from larrylv/fix-token-with-empty-value

Fix parsed token value with header `Authorization token=`.

Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #15579 from sgrif/sg-through-associations

Through associations should set both parent ids on join models
Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #15692 from sromano/falseClass

ActionController::Parameters#require now accepts FalseClass values
Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_of

prevent bad automatic inverse_of association
User defined types should not raise an error

Fixes #15697 on 4-1-stable.
Merge pull request #15699 from sgrif/sg-4-1-custom-types

User defined types should not raise an error
Merge pull request #15701 from zzak/issue_15496

Open extension point for defining options in build_through_record
Merge pull request #15660 from larrylv/fix-mount-at-root-path

Fix request's path_info when a rack app mounted at '/'.
Conflicts:
	actionpack/lib/action_dispatch/journey/router.rb
Merge pull request #15701 from zzak/issue_15496

Open extension point for defining options in build_through_record
Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6

Fixes #15705.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb
Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format

ActiveRecord::Migration.maintain_test_schema! doesn't work with structure.sql

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md