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 #15379 from xuanxu/rational_precision

Fix AS::NumberHelper results with rationals
Conflicts:
	activesupport/CHANGELOG.md
Merge pull request #14195 from robin850/issue-14079

Avoid namespacing routes inside engines
Conflicts:
	railties/CHANGELOG.md

Closes #15376
Merge pull request #15493 from bf4/relax_mail_dep

Relax mail gem constraint from ~> 2.5.4 to ~> 2.5
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
	activerecord/test/cases/associations/eager_test.rb
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
Remove unused variable
For our build, stick with mail 2.5.x for now

2.6 currently has many warnings, which are failing the Travis build.

Conflicts:
	Gemfile
docs, update `includes` + `where` example in AR guide. [ci skip]

Closes #15541.

Conflicts:
	guides/source/active_record_querying.md
docs, fix type in foreign key. Example uses Post not Article. [ci skip]
`bin/rake db:migrate:status` works with legacy migration numbers.

The migration numbers were normalized different ways. This left
the task output in an inconsistent state.

Closes #15538.

Conflicts:
	activerecord/CHANGELOG.md
Skip individual tests upon Dalli::RingError

Unlike the outer `rescue`, this one is much more precise about what we
want to handle: a connection failure (`Dalli::RingError`) is not
relevant to what we're testing here. But other Dalli errors may well be
indicating an actual problem.
`ActiveRecord::SchemaMigration` has no primary key.

Before this patch, using `ActiveRecord::Base.primary_key_prefix_type`
with `:table_name_with_underscore` would change the `SchemaMigration` model
to have a primary key. This resulted in broken queries for PG because it tried
to return the inserted PK (which does not exist).

Closes #15051.
Closes #15419.
Merge pull request #15573 from bf4/mail_2_6_1_released

Mail 2.6.1 silences excessive warnings; remove Gemfile hack
Conflicts:
	Gemfile
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
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