Merge branch 'master' into laurocaetano-fix_send_file

* master: (536 commits)
  doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
  Restore DATABASE_URL even if it's nil in connection_handler test
  [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
  Ensure Active Record connection consistency
  Revert "ask the fixture set for the sql statements"
  Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
  Adding Hash#compact and Hash#compact! methods
  MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
  clear cache on body close so that cache remains during rendering
  add a more restricted codepath for templates fixes #13390
  refactor generator tests to use block form of Tempfile
  Fix typo [ci skip]
  Move finish_template as the last public method in the generator
  Minor typos fix [ci skip]
  make `change_column_null` reversible. Closes #13576.
  create/drop test and development databases only if RAILS_ENV is nil
  Revert "Speedup String#to"
  typo fix in test name. [ci skip].
  `core_ext/string/access.rb` test what we are documenting.
  Fix typo in image_tag documentation
  ...

Conflicts:
	actionpack/CHANGELOG.md

1 files changed, 87 insertions, 2 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 21ac596ab9..21887c32fe 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,88 @@
+*   `test_help.rb` now automatically checks/maintains your test datbase
+    schema. (Use `config.active_record.maintain_test_schema = false` to
+    disable.)
+
+    *Jon Leighton*
+
+*   Configure `secrets.yml` and `database.yml` to read configuration
+    from the system environment by default for production.
+
+    *José Valim*
+
+*   `config.assets.raise_runtime_errors` is set to true by default
+
+    This option has been introduced in
+    [sprockets-rails#100][https://github.com/rails/sprockets-rails/pull/100]
+    and defaults to true in new applications in development.
+
+    *Richard Schneeman*
+
+*   Generates `html` and `text` templates for mailers by default.
+
+    *Kassio Borges*
+
+*   Move `secret_key_base` from `config/initializers/secret_token.rb`
+    to `config/secrets.yml`.
+
+    `secret_key_base` is now saved in `Rails.application.secrets.secret_key_base`
+    and it fallbacks to the value of `config.secret_key_base` when it is not
+    present in `config/secrets.yml`.
+
+    `config/initializers/secret_token.rb` is not generated by default
+    in new applications.
+
+    *Guillermo Iguaran*
+
+*   Generate a new `secrets.yml` file in the `config` folder for new
+    applications. By default, this file contains the application's `secret_key_base`,
+    but it could also be used to store other secrets such as access keys for external
+    APIs.
+
+    The secrets added to this file will be accessible via `Rails.application.secrets`.
+    For example, with the following `secrets.yml`:
+
+        development:
+          secret_key_base: 3b7cd727ee24e8444053437c36cc66c3
+          some_api_key: SOMEKEY
+
+    `Rails.application.secrets.some_api_key` will return `SOMEKEY` in the development
+    environment.
+
+    *Guillermo Iguaran*
+
+*   Add `ENV['DATABASE_URL']` support in `rails dbconsole`. Fixes #13320.
+
+    *Huiming Teo*
+
+*   Add `Application#message_verifier` method to return a message verifier.
+
+    This verifier can be used to generate and verify signed messages in the application.
+
+        message = Rails.application.message_verifier(:sensitive_data).generate('my sensible data')
+        Rails.application.message_verifier(:sensitive_data).verify(message)
+        # => 'my sensible data'
+
+    It is recommended not to use the same verifier for different things, so you can get different
+    verifiers passing the name argument.
+
+        message = Rails.application.message_verifier(:cookies).generate('my sensible cookie data')
+
+    See the `ActiveSupport::MessageVerifier` documentation for more information.
+
+    *Rafael Mendonça França*
+
+*   The [Spring application
+    preloader](https://github.com/jonleighton/spring) is now installed
+    by default for new applications. It uses the development group of
+    the Gemfile, so will not be installed in production.
+
+    *Jon Leighton*
+
+*   Uses .railsrc while creating new plugin if it is available.
+    Fixes #10700.
+
+    *Prathamesh Sonpatki*
+
 *   Remove turbolinks when generating a new application based on a template that skips it.
 
     Example:
@@ -148,11 +233,11 @@
     *Paul Nikitochkin*
 
 *   Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in
-    favor of `ActiveRecord::Generators::ActiveModel#update`
+    favor of `ActiveRecord::Generators::ActiveModel#update`.
 
     *Vipul A M*
 
-*   Remove deprecated `config.whiny_nils` option
+*   Remove deprecated `config.whiny_nils` option.
 
     *Vipul A M*