use 'based on' instead of 'based off' [ci skip]
Nobody sucks so nobody should call this awful method name
Merge pull request #16476 from akshay-vishnoi/doc-changes

[ci skip] use "based on" or "based off of"
:bomb:
Merge branch 'master' into loofah

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/controller/integration_test.rb
	actionview/CHANGELOG.md
Add config option for cookies digest

You can now configure custom digest for cookies in the same way as `serializer`:

  config.action_dispatch.cookies_digest = 'SHA256'
Change the default `null` value for timestamps

As per discussion, this changes the model generators to specify
`null: false` for timestamp columns. A warning is now emitted if
`timestamps` is called without a `null` option specified, so we can
safely change the behavior when no option is specified in Rails 5.
add I18n support for `:placeholder` HTML option is passed to form fields
Small grammar fix in pluck description
[ci skip] Updated where scope to conform to new style
`index_exists?` with `:name` checks specified columns.

[Yves Senn & Matthew Draper]

The column check was embodied in the defaul index name.
If the :name option was used, the specified columns were not verified at all.

Given:

```
assert connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_yo_momma)
```

That index could have been defined on any field, not necessarily on `:foo_id`.
Merge pull request #16489 from tomkadwill/updating_options_to_new_style

[ci skip] Updated where scope documentation to conform to new style
[ci skip] fix spelling of override
Added ActionMailer::DeliverLater
AM, AP, AV, and AMo tests are already order_independent!
Duplicated method in the test helper
Reset ActiveSupport::Dependencies.mechanism to make tests order independent
AS tests are now order_independent!
Fix Railties tests that were order dependent
Railties tests are order_independent! Hopefully.