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

1 files changed, 24 insertions, 1 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index da7a4ce59a..bade9ef543 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,26 @@
+*   Do not crash when `config/secrets.yml` is empty.
+
+    *Yves Senn*
+
+*   Set `dump_schema_after_migration` config values in production.
+
+    Set `config.active_record.dump_schema_after_migration` as false
+    in the generated `config/environments/production.rb` file.
+
+    *Emil Soman*
+
+*   Added Thor-action for creation of migrations.
+
+    Fixes #13588, #12674.
+
+    *Gert Goet*
+
+*   Ensure that `bin/rails` is a file before trying to execute it.
+
+    Fixes #13825.
+
+    *bronzle*
+
 *   Use single quotes in generated files.
 
     *Cristian Mircea Messel*, *Chulki Lee*
@@ -87,7 +110,7 @@
     *Rafael Mendonça França*
 
 *   The [Spring application
-    preloader](https://github.com/jonleighton/spring) is now installed
+    preloader](https://github.com/rails/spring) is now installed
     by default for new applications. It uses the development group of
     the Gemfile, so will not be installed in production.