Merge branch 'master' into pr/18316

Conflicts:
	activerecord/CHANGELOG.md

1 files changed, 54 insertions, 0 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 588cea8886..90aa831f74 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,57 @@
+*   Rename `--skip-test-unit` option to `--skip-test` in app generator
+
+    *Melanie Gilman*
+
+*   Add the `method_source` gem to the default Gemfile for apps
+
+    *Sean Griffin*
+
+*   Drop old test locations from `rake stats`
+    - test/functional
+    - test/unit
+
+    *Ravil Bayramgalin*
+
+*   Update `rake stats` to  correctly count declarative tests
+    as methods in `_test.rb` files.
+
+    *Ravil Bayramgalin*
+
+*   Remove deprecated `test:all` and `test:all:db` tasks.
+
+    *Rafael Mendonça França*
+
+*   Remove deprecated `Rails::Rack::LogTailer`.
+
+    *Rafael Mendonça França*
+
+*   Remove deprecated `RAILS_CACHE` constant.
+
+    *Rafael Mendonça França*
+
+*   Remove deprecated `serve_static_assets` configuration.
+
+    *Rafael Mendonça França*
+
+*   Use local variables in `_form.html.erb` partial generated by scaffold.
+
+    *Andrew Kozlov*
+
+*   Add `config/initializers/callback_terminator.rb`
+
+    Newly generated Rails apps have a new initializer called
+    `callback_terminator.rb` which sets the value of the configuration option
+    `config.active_support.halt_callback_chains_on_return_false` to `false`.
+
+    As a result, new Rails apps do not halt callback chains when a callback
+    returns `false`; only when they are explicitly halted with `throw(:abort)`.
+
+    The terminator is *not* added when running `rake rails:update`, so returning
+    `false` will still work on old apps ported to Rails 5, displaying a
+    deprecation warning to prompt users to update their code to the new syntax.
+
+    *claudiob*
+
 *   Generated fixtures won't use the id when generated with references attributes.
 
     *Pablo Olmos de Aguilera Corradini*