Merge pull request #92 from cristianbica/master

Require global_identification in serialisations
Merge pull request #15989 from nickpellant/master

Fix 10.3 invite_email.body assert_match documentation example.
Don't add a second method for attribute existence

We already had one in the public API that people can use more easily for
the transition
Merge pull request #15991 from sgrif/sg-has-attribute

Don't add a second method for attribute existence
Merge pull request #14861 from igor04/dirty-rollback

Added rollback method to ActiveModel::Dirty
Add CHANGELOG entry for #14861 and document private methods on the API
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.
Use a type object for type casting behavior on SQLite3

Note: I'm not sure we actually need to be logging when this happens.
This code would be a fair bit cleaner if we didn't need to log it.
[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