Fix run-on sentences and improve grammar [skip ci]
Merge pull request #14836 from jonatack/patch-5

Fix run-on sentences and improve grammar [skip ci]
extract record fetching to a method for belongs_to
use statement cache for belongs_to relations
Merge pull request #14801 from kuldeepaggarwal/fix-string-inflection

Fix inconsistent behavior from String#pluralize
Merge pull request #14573 from habermann24/has_many_through_fix

Properly handle scoping with has_many :through. Fixes #14537.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/associations/has_many_through_associations_test.rb
Merge pull request #14757 from estsauver/14752

Fix behavior of select! to be consistent with select #14752
Add CHANGELOG entry for #14757 [ci skip]
Fix syntax error
Perfer to define methods instead of calling test

This file is using this pattern already
Correct comment [ci skip]
Revert "Edge Rails applications doesn't need to use arel master"

This reverts commit 7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee.
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