Merge branch 'master' into adequaterecord

* master: (311 commits)
  Add a missing changelog entry for #13981 and #14035
  Revert "Fixed plugin_generator test"
  implements new option :month_format_string for date select helpers [Closes #13618]
  add factory methods for empty alias trackers
  guarantee a list in the alias tracker so we can remove a conditional
  stop exposing table_joins
  make most parameters to the AliasTracker required
  make a singleton for AssociationScope
  pass the association and connection to the scope method
  pass the tracker down the stack and construct it in the scope method
  clean up add_constraints signature
  remove the reflection delegate
  remove klass delegator
  remove railties changes. fixes #14054
  remove chain delegate
  remove scope_chain delegate
  Add verb to sanitization note
  fix path shown in mailer's templates
  updated Travis build status image url
  fix guide active_support_core_extensions. add Note to String#indent [ci skip]
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency.rb
	activerecord/test/cases/associations/association_scope_test.rb
Merge pull request #14087 from 10io/patch-1

Fix coffeescript sample [ci skip]
Merge branch 'master' into adequaterecord

* master:
  Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"
  No need to use symbols
  Don't skip tests if they are not broken. Just don't define they
  Fix typo [ci skip]
  Resolve encoding issues with arrays of hstore (bug 11135).
  Fix coffeescript sample [ci skip]
add AST cache to the find_by method
Merge pull request #14000 from Fortisque/kevin/stream_error_management

streaming should change status of response when exception is caught
time helpers honor the application time zone when passed a date

Rails applications are expected to be always aware of the application
time zone.

To be consistent with that contract, we have to assume that a bare
date passed to time helpers is a date in the application time zone,
not in the system time zone. The system time zone is irrelevant, we
should totally ignore it.

For example,

    travel_to user.birth_date + 40.years

should make that user be 40th years old regardless of the system
time zone. Without this patch that may not be true.
adds a missing travel back
travel_to travels back and re-raises if the block raises
Updated doc for default scope [ci skip]
Tell default_scope are prepended [ci skip]
Fix parameter naming in RemoteIp middleware constructor method

Was custom_proxies in inline docs, but should be and defined in
constructor as custom_proxies
Aesthetic [ci skip]
Doc: assets:precompile:all was removed on 4 [skip ci]
Added Object#present_in to simplify value whitelisting
Merge pull request #14096 from arthurnn/precompile_all

Upgrade Doc: assets:precompile:all was removed on 4
Use assert_nil instead as its clearer about what the return is expected to be
Minor grammar/punctuation fixes [ci skip]
Move changelog entry to the top, fix examples indent [ci skip]
Merge pull request #14094 from kalabiyau/fix_parameters_naming

Fix parameter naming in RemoteIp middleware constructor method [ci skip]
Document the default scopes change on the release notes, CHANGELOG
and upgrating guides

[ci skip]