Correct comment [ci skip]
Merge pull request #14840 from akshay-vishnoi/doc_changes

Correct comment [ci skip]
Fixed an issue with migrating legacy json cookies.

Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming
cookies are marshal-encoded. This is not the case when `secret_token` is
used in conjunction with the `:json` or `:hybrid` serializer.

In those case, when upgrading to use `secret_key_base`, this would cause a
`TypeError: incompatible marshal file format` and a 500 error for the user.

Fixes #14774.

*Godfrey Chan*
Merge pull request #14850 from chancancode/fix_json_cookie_jar

Fixed an issue with migrating legacy json cookies.
`ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions.

Closes #14841.
Merge pull request #14842 from lucasmazza/lm-no-touching-callbacks

Move `NoTouching` down the inheritance chain on AR::Base
Precompile the image we're referencing, too.

You can't compile a file that references a non-compiled asset's path.

.. unless you turn off asset runtime errors.

Outside of a test case like this, `config.assets.precompile` would
normally retain its default entry, which precompiles all images (and
other non-JS/CSS files) that are in `app/assets`.
Improve readability of contributing to rails guide. [ci skip]
Merge pull request #14852 from matthewd/fix_build_for_assets

Fix railties asset tests: precompile the image we're referencing
Merge pull request #14843 from tgxworld/improve_readability_of_contributing_to_rails_guide

[ci skip] Improve readability of contributing to rails guide.
Fix a typo in the doc of forty_two AR FinderMethod
Merge pull request #14858 from ebouchut/patch-1

Fix a typo in the doc of forty_two AR FinderMethod [ci skip]
[ci skip] Improve formatting and yml
Merge pull request #14856 from Gaurav2728/gaurav-typo_fix

[ci skip] Improve formatting and yml
PostgreSQL Timestamps always map to `:datetime`.

The PG Adapter should use `:datetime` consistently instead of mapping
mispellings to `:timestamp`.

See #14513
Merge pull request #14859 from jefflai2/datetime_type

PostgreSQL Timestamps always map to `:datetime`.
reset `@arel` when modifying a Relation in place.

/cc @tenderlove
No need for trailing slash on migration path.

Causes a double // in Dir.glob that breaks Ruby 2.2-trunk.
Not really a bug, but not relevant to this test either.

Originally added in ed21f0c50270139ddb6993acfdaea4586ffd09a3
move AR length validation tests into separate test-case.

Conflicts:
	activerecord/test/cases/validations/association_validation_test.rb