Fix typo in ActiveSupport CHANGELOG
Merge pull request #14381 from zzak/as_changelog_typo

Fix typo in ActiveSupport CHANGELOG
Use nested_scope? not shallow? to determine whether to copy options

The method `shallow?` returns false if the parent resource is a singleton so
we need to check if we're not inside a nested scope before copying the :path
and :as options to their shallow equivalents.

Fixes #14388.

(cherry picked from commit 924345abcff0101e3221f87d1d56d3d6517a79a4)

Conflicts:
	actionpack/CHANGELOG.md
Fix counter cache when association uses a class_name

The idea of this commits is from
bf28422cbda9068afb900020fa6911afd01963e1, which fixes this problem, but
only on AR 4.1+

[fixes #14369]
Merge pull request #14410 from arthurnn/fix_14369

Fix counter cache when association uses a class_name
only dump schema information if migration table exists. Closes #14217

Conflicts:

	activerecord/CHANGELOG.md
The digest option is no longer honoured since Rails 3.0 [ci skip]

Closes #8513
test for structure:dump without schema information table. refs eafec46

This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa
Swapped parameters of assert_equal in assert_select
Merge pull request #14468 from izoomi/date_select_helper

Fix date_select with_css_classes: true option overwriting other html classes
Conflicts:
	actionview/CHANGELOG.md
Merge pull request #14390 from huoxito/true-touch

Still touch associations when theres no timestamp
Use rails conventions
Merge pull request #14393 from chrisfinne/persisted_exception

AR .persisted? throws SystemStackError for an unsaved model with a
custom primary_key that didn't save due to validation error

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/movie.rb
Swap Timestamp/Callbacks inheritance in ActiveRecord::Base

Fixes a regression in the lookup chain for update_record &
create_record. Timestamp's methods were being executed before
Callback's.
Merge pull request #14469 from tiegz/timestamp_inheritance_fix

Swap Timestamp/Callbacks order in ActiveRecord::Base
Add CHANGELOG entry for #14469 [ci skip]
Merge pull request #12778 from etehtsea/rake-default-fix

Don't load test env by default.

Closes #13241

Conflicts:
	railties/CHANGELOG.md
Replace trivial regexp with string or index, twice as fast
Merge pull request #14520 from kreynolds/replace-regexp-with-index-or-string

Replace trivial regexp with string or index, twice as fast
Merge pull request #14518 from Peeja/hash-wia-update-respects-to-hash-4-1-stable

HashWithIndifferentAccess better respects #to_hash (4-1-stable backport)
Conflicts:
	activesupport/CHANGELOG.md