Rename rollback_changes to undo_changes

To avoid overload with database rollback
Add String support for min/max attributes on DatetimeField
Merge pull request #15214 from todd/date_field_docs

Added String support for min and max properties for date field helpers
Use if/else

Since we are using both branches of the code is preferable to use
if/else over the early return.
Add CHANGELOG entry for #15214

Closes #15214
push host / port / protocol extraction up

Then we only need to extract host once.
Add configuration to enable mail previews

Adds `config.action_mailer.preview_enabled`

This allows mail previewing to be enabled easily in non-development
environments such as staging. The default is set to true for development
so no changes should be required to existing Rails applications.

The mail preview path can still be configured using the existing
`config.action_mailer.preview_path` configuration option.

Adding this avoids devs from having to do stuff like:
https://gist.github.com/lengarvey/fa2c9bd6cdbeba96526a

Update actionmailer/CHANGELOG with new configuration.
Update configuring guide with new configuratation.
Add `config.action_mailer.preview_path` to configuring guide.
Fix doc unwanted dl Admin:: [ci skip]
Merge pull request #15997 from cirosantilli/typo

Fix doc unwanted dl Admin:: [ci skip]
Silence warning emitted in tests

The instance method `model_name` was being defined multiple times,
causing a redefinition warning.
[ci skip] Add missing prologue section of upgrading ruby on rails guide.
Merge pull request #16004 from JuanitoFatas/doc/patch-1

[ci skip] Add missing prologue section of upgrading ruby on rails guide.
Merge pull request #16000 from sgrif/sg-silence-warning

Silence warning emitted in tests
makes it sound less misleading
Merge pull request #15970 from lengarvey/add_configuration_option_for_mail_preview

Add configuration to enable mail previews
Rename preview_enabled option to show_previews
Merge pull request #16006 from ShunsukeAida/xml_http_request_comment_change

[ci skip] Fixed the documentation of xml_http_request? (aka xhr?)
flash doesn't pass objects #15522 [ci skip]
Add regression tests for keys on nested associations

This adds the regressions tests from issue #15893 to
master. It's checking that both strings and symbols are
accepted as keys for nested associations.
Merge pull request #15999 from eileencodes/add-regression-tests-for-keys-on-nested-associations

Add regression tests for keys on nested associations