Dont encourage people to run without autoflush in production
Merge pull request #16485 from seuros/activejob

Integrate ActiveJob / DeliverLater / GlobalID with Rails
Merge branch 'master' of github.com:rails/rails
Add CHANGELOG entry for #deliver_later
Merge pull request #16525 from kaspth/partial-release-prep

Prepare for partial release.
Merge pull request #16294 from bf4/code_tools

Update, unify, encapsulate, and fix various code tools in Rails
Merge pull request #16481 from sgrif/sg-change-default-timestamps

Change the default `null` value for timestamps
Use the release gems and point application gemfile to right loofah
Deprecate NamedRouteCollection#helpers.

This method was removed at 210b338db20b1cdd0684f40bd78b52ed16148b99 but it is
used by third party gems to check if a named route was defined. To help on the
upgrade path on 4.2.0 we bring it back and emit a deprecation warning.
Merge branch 'master' into loofah

Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #16533 from lucasmazza/lm-named-routes-helper

Deprecate NamedRouteCollection#helpers.
Use released arel
Merge branch 'loofah'

Conflicts:
	Gemfile
Merge pull request #16062 from sgrif/sg-required-generators

Add a `required` option to the model generator
Merge pull request #15889 from carnesmedia/model-name

Use #model_name on instances instead of classes
No need to check model_name anymore
Fix ActiveJob isolation tests.
Merge pull request #16534 from lucasmazza/lm-fix-rescue-test

Fix ActiveJob isolation tests.
Expectations first
Expectations first