Fix serialized field returning serialized data after update_column
fix formatting and text for ActionController::Redirecting doc
Merge pull request #15221 from laurelfan/doc-fix-redirecting

fix formatting and text for ActionController::Redirecting doc
Add missing nodocs to MySQL adapter
Revert "Merge pull request #14544 from jefflai2/named_scope_sti"

This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing
changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/comment.rb

This change break integration with activerecord-deprecated_finders so
I'm reverting until we find a way to make it work with this gem.
Merge pull request #14613 from Sirupsen/fix-serialize-update-column

Fix serialized field returning serialized data after update_column

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #15219 from sgrif/sg-missing-nodoc

Add missing nodoc
Rename `oid_type` to `cast_type` to make PG columns consistent
Merge pull request #15227 from sgrif/sg-rename-oid-type

Rename `oid_type` to `cast_type` to make PG columns consistent with abstract columns
fixes in active record query for reorder
Merge pull request #15229 from peeyushsingla/master

fixes in active record query for reorder in rails guides
Fix typo guides/source/active_support_instrumentation.md
Merge pull request #15231 from khusnetdinov/fix_typo_guides_active_support_instrumentation

Fix typo guides/source/active_support_instrumentation.md [ci-skip]