Merge branch 'master' into set_binds

* master: (2794 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:
	activerecord/lib/active_record/associations/join_dependency/join_association.rb
	activerecord/lib/active_record/relation/query_methods.rb

1 files changed, 269 insertions, 0 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index d11b0b7e85..21887c32fe 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,268 @@
+*   `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:
+
+        Skips turbolinks adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }`
+        to the template.
+
+    *Lauro Caetano*
+
+*   Instrument an `load_config_initializer.railties` event on each load of configuration initializer
+    from `config/initializers`. Subscribers should be attached before `load_config_initializers`
+    initializer completed.
+
+    Registering subscriber examples:
+
+        # config/application.rb
+        module RailsApp
+          class Application < Rails::Application
+            ActiveSupport::Notifications.subscribe('load_config_initializer.railties') do |*args|
+              event = ActiveSupport::Notifications::Event.new(*args)
+              puts "Loaded initializer #{event.payload[:initializer]} (#{event.duration}ms)"
+            end
+          end
+        end
+
+        # my_engine/lib/my_engine/engine.rb
+        module MyEngine
+          class Engine < ::Rails::Engine
+            config.before_initialize do
+              ActiveSupport::Notifications.subscribe('load_config_initializer.railties') do |*args|
+                event = ActiveSupport::Notifications::Event.new(*args)
+                puts "Loaded initializer #{event.payload[:initializer]} (#{event.duration}ms)"
+              end
+            end
+          end
+        end
+
+    *Paul Nikitochkin*
+
+*   Support for Pathnames in eager load paths.
+
+    *Mike Pack*
+
+*   Fixed missing line and shadow on service pages(404, 422, 500).
+
+    *Dmitry Korotkov*
+
+*   `BACKTRACE` environment variable to show unfiltered backtraces for
+    test failures.
+
+    Example:
+
+        $ BACKTRACE=1 ruby -Itest ...
+        # or with rake
+        $ BACKTRACE=1 bin/rake
+
+    *Yves Senn*
+
+*   Removal of all javascript stuff (gems and files) when generating a new
+    application using the `--skip-javascript` option.
+
+    *Robin Dupret*
+
+*   Make the application name snake cased when it contains spaces
+
+    The application name is used to fill the `database.yml` and
+    `session_store.rb` files ; previously, if the provided name
+    contained whitespaces, it led to unexpected names in these files.
+
+    *Robin Dupret*
+
+*   Added `--model-name` option to `ScaffoldControllerGenerator`.
+
+    *yalab*
+
+*   Expose MiddlewareStack#unshift to environment configuration.
+
+    *Ben Pickles*
+
+*   `rails server` will only extend the logger to output to STDOUT
+     in development environment.
+
+    *Richard Schneeman*
+
+*   Don't require passing path to app before options in `rails new`
+    and `rails plugin new`
+
+    *Piotr Sarnacki*
+
+*   rake notes now searches *.less files
+
+    *Josh Crowder*
+
+*   Generate nested route for namespaced controller generated using
+    `rails g controller`.
+    Fixes #11532.
+
+    Example:
+
+        rails g controller admin/dashboard index
+
+        # Before:
+        get "dashboard/index"
+
+        # After:
+        namespace :admin do
+          get "dashboard/index"
+        end
+
+    *Prathamesh Sonpatki*
+
+*   Fix the event name of action_dispatch requests.
+
+    *Rafael Mendonça França*
+
+*   Make `config.log_level` work with custom loggers.
+
+    *Max Shytikov*
+
+*   Changed stylesheet load order in the stylesheet manifest generator.
+    Fixes #11639.
+
+    *Pawel Janiak*
+
+*   Added generated unit test for generator generator using new
+    `test:generators` rake task.
+
+    *Josef Šimánek*
+
+*   Removed `update:application_controller` rake task.
+
+    *Josef Šimánek*
+
+*   Fix `rake environment` to do not eager load modules
+
+    *Paul Nikitochkin*
+
+*   Fix `rake notes` to look into `*.sass` files
+
+    *Yuri Artemev*
+
+*   Removed deprecated `Rails.application.railties.engines`.
+
+    *Arun Agrawal*
+
+*   Removed deprecated threadsafe! from Rails Config.
+
+    *Paul Nikitochkin*
+
+*   Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in
+    favor of `ActiveRecord::Generators::ActiveModel#update`.
+
+    *Vipul A M*
+
+*   Remove deprecated `config.whiny_nils` option.
+
+    *Vipul A M*
+
+*   Rename `commands/plugin_new.rb` to `commands/plugin.rb` and fix references
+
+    *Richard Schneeman*
+
+*   Fix `rails plugin --help` command.
+
+    *Richard Schneeman*
+
+*   Omit turbolinks configuration completely on skip_javascript generator option.
+
+    *Nikita Fedyashev*
+
+*   Removed deprecated rake tasks for running tests: `rake test:uncommitted` and
+    `rake test:recent`.
+
+    *John Wang*
+
+*   Clearing autoloaded constants triggers routes reloading.
+    Fixes #10685.
+
+    *Xavier Noria*
+
 *   Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
     Fixes #9525.
 
@@ -9,4 +274,8 @@
 
     *John Wang*
 
+*   Changes repetitive th tags to use colspan attribute in `index.html.erb` template.
+
+    *Sıtkı Bağdat*
+
 Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes.