[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.
Bring SQLite3Adpter init API closer to others
Merge pull request #14788 from arthurnn/conn_adpt_api

Bring SQLite3Adpter init API closer to others
Merge pull request #14755 from timlinquist/to_io_http_upload

Use common to_io so users can access the underlying IO object
Implement to_io as an alias
Change the method description
Add CHANGELOG entry for #14755 [ci skip]
Merge pull request #14738 from tilsammans/pull/11407

Remove wrapping div with inline styles for hidden form fields.

Conflicts:
	actionview/CHANGELOG.md
Update Request forgery tests to remove input wrappign div

This was changed at cbb917455f306cf5818644b162f22be09f77d4b2
Remove wrapper div for inputs in button_to

Related with cbb917455f306cf5818644b162f22be09f77d4b2