Conflicts:
	activemodel/lib/active_model/errors.rb

Av prepare2

Extract collation tasks to database tasks.

Remove ActiveRelation#inspect

make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884]

Introduced in 1abe3167

The test was failing when running on isolation, because the extensions were
not being loaded, thus 1.year.from_now was failing. Just use mktime
instead, adding 1 year to Time.now.

Related with 5e7d6bba

Related with 5e7d6bba

Bug with FileUpdateChecker with wrong mtime

This reverts commit 6acebb38.

Usage of this feature did not reveal any improvement in existing apps.

Conflicts:

	actionpack/lib/action_dispatch/routing/mapper.rb
	guides/source/routing.textile
	railties/lib/rails/engine.rb
	railties/lib/rails/paths.rb
	railties/test/paths_test.rb

Since plugins were removed, we can clean up a few methods in engines.
We also use this opportunity to move `load_console`, `load_tasks` and
`load_runner` to Rails::Engine. This means that, if someone wants to
improve script/rails for engines to support console or runner commands,
part of the work is already done.

Added a changelog entry about fda24312.

remove AV.prepare and move all helper-related logic into the controller. this decouples the view since it no longer knows about routes internals.
this is a result of an ongoing discussion at https://github.com/rails/rails/pull/6826.

Remove mention of `convert_key` now that it's been taken out in 1eecd948

Instead of the standard Ruby logger

fix ActionMailer::Async docs and update to follow coding conventions

Require URI in ConnectionSpecification

Support collate for postgresql

fixing typo in active record from method

Since composed_of was removed in 05174744,
these tests were working "by mistake", due to the matching "address"
string in the error message, but with a different error message than the
expected multiparameter assignment error.

Since "address" is not an attribute from Customer anymore, the error was
"undefined method klass for nil", where nil was supposed to be the
column object.

All other multiparameter assignment tests are in the same file, so it
makes sense to have all of them here.