Properly handle scoping with has_many :through. Fixes #14537.
Add a CHANGELOG entry for the has_many :through scoping fix (See #14537 for details).
Simplify the code in target_scope
Minor improvement: Use the merge method on the relation instead of instance_eval directly.
Fix inconsistent behavior from String#pluralize

Before:
  When calling String#pluralize with count=1 then it returned same
  string, but with count other than 1, returned new string.

After:
  String#pluralize always return a new string.

  => Prevent mutation of a string inadvertently.
replace class_eval by define_method in abstract_controller/callbacks
Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon.

Although the official IANA-registered MIME type for ICO files is image/vnd.microsoft.icon,
registered in 2003, it was submitted to IANA by a third party and is not recognized by Microsoft products.
The MIME type image/x-icon should be used since is the one recognized by the major browsers on the market.
Rearrange deck chairs on the titanic. Organize connection handling test cases.
select! renamed to avoid name collision Array#select!

Fixes #14752

Select mimics the block interface of arrays, but does not mock the
block interface for select!. This change moves the api to be a
private method, _select!.
Add test for using ActionView::Helpers::FormHelper.label with block and html
Merge pull request #14835 from zzak/test_form_helper_label_with_block_and_html

Add test for using ActionView::Helpers::FormHelper.label with block and html
Merge pull request #10764 from mokevnin/replace_class_eval_by_define_method

replace class_eval by define_method in abstract_controller/callbacks
Merge pull request #13335 from glorieux/favicon_link_tag_mimetype

Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon.
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]
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