Merge pull request #15399 from tgxworld/remove_todo_router_test

Remove TODO.
Merge branch 'master' of github.com:zackperdue/rails into zackperdue-master
Add @senny's changed from #14741, including code font for `resources`
options, and wrapped to 80 chars. [ci skip]
Add missing `:param` option from the docs for Mapper#match [ci skip]
Option discovered by @zackperdue in #14741, implemented in #5581.
[ci skip] Make last note show up in postgresql guide.
Merge pull request #15403 from JuanitoFatas/doc/pg-guide-note

[ci skip] Make last note show up in postgresql guide.
Merge pull request #15397 from sgrif/sg-column-class

Ensure we always use instances of the adapter specific column class
Merge pull request #15061 from tgxworld/remove_unnecessary_include

Remove unnecessary include for integration tests.
implement ActiveRecord::Base#pretty_print + changelog
Result sets never override a model's column type

MySQL and PostgreSQL provide a column type override in order to properly
type cast computed columns included in a result set. This should never
override the known types of full fledged columns. In addition to messing
up computed properties, this would have led to inconsistent behavior
between a record created with `new`, and a record created with `last` on
the mysql adapter in the following cases:

- `tinyint(1)` with `emulate_booleans` set to `false`
- `text`, `string`, `binary`, and `decimal` columns
Merge pull request #15406 from sgrif/sg-column-type-override

Result sets never override a model's column type
Name#model_name doesn't return a String object
Merge pull request #15407 from ShunsukeAida/correct_model_name_example

fixed ActiveModel documentation [ci skip]
Update url to rake docs [ci skip]
"controllers" should be a valid path name
Merge branch 'master' into mapper

* master:
  Update url to rake docs [ci skip]
  Name#model_name doesn't return a String object
  Result sets never override a model's column type
  [ci skip] Make last note show up in postgresql guide.
  Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581.
  Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip]
  Use github url for homepage of log4r [ci skip]
  Remove TODO.
  Ensure we always use instances of the adapter specific column class
  Fix indentation from 1b4b26f [ci skip]
  [ci skip] Improve form_helpers.md guide.
  Clear inflections after test.
  Remove unnecessary include for integration tests.
  Added documentation for the :param option for resourceful routing
Refactor serialized types to be partially defined as custom properties

Many of the methods defined in `AttributeMethods::Serialization` can be
refactored onto this type as well, but this is a reasonable small step.
Removes the `Type` class, and the need for `decorate_columns` to handle
serialized types.
[ci skip] add created_at and updated_at to example
document generators hidden_namespaces
Merge pull request #15398 from sgrif/sg-serialized-types

Refactor serialized types to be partially defined as custom properties