additional note about routes in functional tests for engines [ci skip]
Remove wrapping div with inline styles for hidden form fields.

We are dropping HTML 4.01 and XHTML strict compliance since input
tags directly inside a form are valid HTML5, and the absense of
inline styles help in validating for Content Security Policy.
Provide interface for accessing underlying IO object

In some cases users may need to work with/manipulate more of the
Tempfile api than provided by Upload. Allow users to get at the
underlying io via the common to_io method of IO/IO-like objects
SQL Like escaping helper method. [Rob Gilson & Yves Senn]

Closes #14222.

This is a follow up to #6104

This does not have the backwards compatibility issues brought up in
implementation to break.
Changed the NullRelation so that when count is called with #group it will properly return an empty hash instead of zero. Fixes issue #14721

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #11836 from mcfiredrill/engines-testing-doc

additional note about routes in functional tests for engines [ci skip]
`sanitize_sql_like` escapes `escape_character` not only backslash.

* This is a follow up to: fe4b0eee05f59831e1468ed50f55fbad0ce11e1d
* The originating PR is #14222
* It should fix the build
Merge pull request #14773 from eric-chahin/null_relation_fix

Changed the NullRelation so that when count is called with #group it wil...
[skip ci] Reorder i18n guide

Currently, the section called "How to store your custom translations"
has several subheadings that make no sense, such as "Translations for
ActiveRecord models." These make more sense under the "Overview of the
I18n API Features" section. I moved the "How to store..." section down
to the more appropriate sub-headings "Using Different Backends" and
"Using Different Exception Handlers" and removed the "Customize your
i18n setup" header.
[ci skip] Added examples for color_field_tag method
Merge pull request #14771 from heironimus/i18n_guide_reorder

Reorder i18n guide
Merge pull request #14779 from zenati/master

[ci skip] Added examples for color_field_tag method
[ci skip] Added examples for search_field_tag method
Merge pull request #14780 from zenati/master

[ci skip] Added examples for search_field_tag method
[ci skip] Added examples for telephone_field_tag method
[ci skip] Added examples for url_field_tag method
Merge pull request #14781 from zenati/master

[ci skip] Added examples for telephone_field_tag and url_field_tag methods
Autoload ActiveModel::StrictValidationFailed

Currently, if environment doesn’t eager load code, invoking this
constant before calling #valid? on a model instance results in a
NameError.
Merge pull request #14783 from hakanensari/autoload-strict-validation-failed

Autoload ActiveModel::StrictValidationFailed
CSRF protection should rescue exception not extend

I think the changes to the default behaviour mean that rails will throw an exception when an invalid authenticity token is found.  The previous proposed code of calling super then sign_out meant that sign_out was never reached - the exception handler never returned.

I think the best approach now is to catch the exception, although I'm not 100% certain on that.