Cleaned up duplicated CHANGELOG entry [ci skip]
Change wording of explanation about precision & scale of decimal numbers [ci skip]
Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load

Fix regression on eager loading association based on SQL query rather than existing column.

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #15500 from prathamesh-sonpatki/change-wording-of-explanation-about-precision-and-scale-of-decimal-numbers

Change wording of explanation about precision & scale of decimal numbers [ci skip]
Use null column for association key types
Bring type casting behavior of hstore/json in line with serialized

`@raw_attributes` should not contain the type-cast, mutable version of
the value.
Collapse PG default extractoin of most types to single regex

For any type that is represented as a string and then type cast, we do
not need separate regular expressions for the various types. No function
will match this regex. User defined types *should* match this, so that
the type object can decide what to do with the value.
Merge pull request #15463 from geopet/refactor_xml_compute_type

Refactor XML serializer to not depend on `serialized_attributes`
Correct result, previously showing wrong result
Merge pull request #15505 from akshay-vishnoi/doc_changes

Correct result, previously showing wrong result
Merge pull request #15495 from maurogeorge/action-mailer-subject-guides

Add default_i18n_subject to the guides
Merge pull request #15504 from sgrif/sg-postgres-defaults

Collapse PG default extractoin of most types to single regex
For our build, stick with mail 2.5.x for now

2.6 currently has many warnings, which are failing the Travis build.
Merge branch 'master' of github.com:rails/rails

* 'master' of github.com:rails/rails:
  For our build, stick with mail 2.5.x for now
  Correct result, previously showing wrong result
  Collapse PG default extractoin of most types to single regex
  Change wording of explanation about precision & scale of decimal numbers [ci skip]
  Cleaned up duplicated CHANGELOG entry [ci skip]
  reuse available belongs_to? method
  Convert StrongParameters cache to a hash. This fixes an unbounded memory leak demonstrated on @tenderlove's latest blog post:
  Partially revert deprecation of *_filter
  Pluralize params
  Add default_i18n_subject to the guides
  Fix regression on eager loading association based on SQL query rather than existing column.
  Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4
  Keep column defaults in type cast form
  Return a null column when no column exists for an attribute
  Refactor XML serializer to not depend on `serialized_attributes`
  Test the serialized types of virtual columns in XML
  implement ActiveRecord::Base#pretty_print + changelog
  Remove duplicated HashWithIndifferentAccess#with_indifferent_access.
Merge pull request #15502 from sgrif/sg-use-null-column

Use null column for association key types
Revert "Correct Documentation for asset_tag_helpers"

This reverts commit c22a253d1a72602331db1eba3e91bc945eff2346.

Reason: Our documentation assumes the assets are in the proper place and
we are using the default Rails stack.

With the default Rails stack and the assets being in the correct place
the assets helpers uses the `/assets` prefix.
have an actual `NullColumn` object and update docs accordingly.

Follow up to #15438 and #15502.

/cc @sgrif
Emit suggested generator names when not found

When someone types in a generator command it currently outputs all generators. Instead we can attempt to find a subtle mis-spelling by running all generator names through a levenshtein_distance algorithm provided by rubygems. 

So now a failure looks like this:

```ruby
$ rails generate migratioooons
Could not find generator 'migratioooons'. Maybe you meant 'migration' or 'integration_test' or 'generator'
Run `rails generate --help` for more options.
```

If the suggestions are bad we leave the user with the hint to run `rails generate --help` to see all commands.
[ci skip] remove double "in your"
Merge pull request #15497 from schneems/schneems/levenshtein-generator-failure-messages

Emit suggested generator names when not found