Fix #9360 regression in content_for
fix db_runtime attribute  value after raising ActionView::MissingTemplate exception
Merge pull request #9218 from Fivell/master

Fix calculation of db_runtime property in
ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime.

Previously, after raising ActionView::MissingTemplate, db_runtime was
not populated.

Closes #9218, Fixes #9215.

Conflicts:
	activerecord/CHANGELOG.md
There's no need to access Railties through self.class

Closes #9386
Improve docs for AbsC::Rendering
Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric"

This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing
changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97.
`format: true` does not override existing format constraints.

Closes #9466.

Passing `format: true` used to override the constraints: { format: /json/ }
with `/.+/`. This patch only sets the format if there is no constraint present.
Enforce i18n version >= v0.6.4

Keep in sync with 3-2-stable.
Merge pull request #9469 from senny/9466_format_enforcing_routes

`format: true` does not override existing format constraints.
Remove redundant method
update docs, change_table does not use TableDefinition.
Minor changelog improvement [ci skip]
Support PostgreSQL specific column types when using `change_table`.

Closes #9480.

We use `TableDefinition` for `#create_table` and `Table` for `#change_table`.
The PostgreSQL sepcifc types were only defined on `TableDefinition` so I
also added them to `Table`.
Merge pull request #9484 from senny/9480_change_table_and_hstore

Support PostgreSQL specific column types when using `change_table`.

We use `TableDefinition` for `#create_table` and `Table` for `#change_table`.
The PostgreSQL sepcific types were only defined on `TableDefinition` so they needed to be added to `Table` as well.
Wrong exception is occured when raising no translatable exception
Ensure plugins generated with plugin new can boot the dummy application
Document introduction of the ActionController::UnknownFormat exception
Document extraction of actionpack-xml_parser
Improve docs for UpgradeSignatureToEncryptionCookieStore
Document the switch from memcache-client to dalli