Fix serialized field returning serialized data after update_column
Fixed a problem where `sum`, `size`, `average`, `minimum` and `maximum` used
with a grouping was not returning a Hash.
Fix polymorphic eager load with foreign_key as String.

The foreign_key could be `String` and just doing `owners_map[owner_key]`
could return `nil`.
To prevent this bug, we should `to_s` both keys if their types are
different.

Fixes #14734.
Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_key

Fix polymorphic eager load with foreign_key as String.
pg, extract money tests into separate file.

- Added assertions about the column. Specifically scale.
- Move record insertion from setup into test method.
push `extract_scale` to the `Type`.

  - `extract_precision`, `extract_limit`, and `extract_default` probably need to follow.
  - would be good to remove the delegation `Column#extract_scale`.

/cc @sgrif
build fix, use lambda syntax that ruby 1.9.3 understands.
Move PG OID types to their own files

As we promote these classes to first class concepts, these classes are
starting to gain enough behavior to warrant being moved into their own
files. Many of them will become quite large as we move additional
behavior to the type objects.
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]