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

16 files changed, 132 insertions, 121 deletions

diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb
index 1610751844..56f05b3844 100644
--- a/railties/lib/rails/app_rails_loader.rb
+++ b/railties/lib/rails/app_rails_loader.rb
@@ -55,7 +55,7 @@ EOS
     end
 
     def self.find_executable
-      EXECUTABLES.find { |exe| File.exist?(exe) }
+      EXECUTABLES.find { |exe| File.file?(exe) }
     end
   end
 end
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 05acd78d98..e37347b576 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,7 +205,8 @@ module Rails
           "action_dispatch.http_auth_salt" => config.action_dispatch.http_auth_salt,
           "action_dispatch.signed_cookie_salt" => config.action_dispatch.signed_cookie_salt,
           "action_dispatch.encrypted_cookie_salt" => config.action_dispatch.encrypted_cookie_salt,
-          "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt
+          "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt,
+          "action_dispatch.cookies_serializer" => config.action_dispatch.cookies_serializer
         })
       end
     end
@@ -307,7 +308,8 @@ module Rails
         yaml = config.paths["config/secrets"].first
         if File.exist?(yaml)
           require "erb"
-          env_secrets = YAML.load(ERB.new(IO.read(yaml)).result)[Rails.env]
+          all_secrets = YAML.load(ERB.new(IO.read(yaml)).result) || {}
+          env_secrets = all_secrets[Rails.env]
           secrets.merge!(env_secrets.symbolize_keys) if env_secrets
         end
 
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index e902205a13..20e3de32aa 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -109,6 +109,8 @@ module Rails
         raise "YAML syntax error occurred while parsing #{paths["config/database"].first}. " \
               "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
               "Error: #{e.message}"
+      rescue => e
+        raise e, "Cannot load `Rails.application.database_configuration`:\n#{e.message}", e.backtrace
       end
 
       def log_level
diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
new file mode 100644
index 0000000000..9c3332927f
--- /dev/null
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -0,0 +1,68 @@
+require 'thor/actions/create_file'
+
+module Rails
+  module Generators
+    module Actions
+      class CreateMigration < Thor::Actions::CreateFile
+
+        def migration_dir
+          File.dirname(@destination)
+        end
+
+        def migration_file_name
+          @base.migration_file_name
+        end
+
+        def identical?
+          exists? && File.binread(existing_migration) == render
+        end
+
+        def revoke!
+          say_destination = exists? ? relative_existing_migration : relative_destination
+          say_status :remove, :red, say_destination
+          return unless exists?
+          ::FileUtils.rm_rf(existing_migration) unless pretend?
+          existing_migration
+        end
+
+        def relative_existing_migration
+          base.relative_to_original_destination_root(existing_migration)
+        end
+
+        def existing_migration
+          @existing_migration ||= begin
+            @base.class.migration_exists?(migration_dir, migration_file_name) ||
+            File.exist?(@destination) && @destination
+          end
+        end
+        alias :exists? :existing_migration
+
+        protected
+
+        def on_conflict_behavior(&block)
+          options = base.options.merge(config)
+          if identical?
+            say_status :identical, :blue, relative_existing_migration
+          elsif options[:force]
+            say_status :remove, :green, relative_existing_migration
+            say_status :create, :green
+            unless pretend?
+              ::FileUtils.rm_rf(existing_migration)
+              block.call
+            end
+          elsif options[:skip]
+            say_status :skip, :yellow
+          else
+            say_status :conflict, :red
+            raise Error, "Another migration is already named #{migration_file_name}: " +
+                         "#{existing_migration}. Use --force to replace this migration file."
+          end
+        end
+
+        def say_status(status, color, message = relative_destination)
+          base.shell.say_status(status, message, color) if config[:verbose]
+        end
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 1b50569c9e..f1f79d8378 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -14,7 +14,6 @@ module Rails
       DATABASES.concat(JDBC_DATABASES)
 
       attr_accessor :rails_template
-      attr_accessor :app_template
       add_shebang_option!
 
       argument :app_path, type: :string
@@ -27,9 +26,6 @@ module Rails
         class_option :template,           type: :string, aliases: '-m',
                                           desc: "Path to some #{name} template (can be a filesystem path or URL)"
 
-        class_option :app_template,       type: :string, aliases: '-n',
-                                          desc: "Path to some #{name} template (can be a filesystem path or URL)"
-
         class_option :skip_gemfile,       type: :boolean, default: false,
                                           desc: "Don't create a Gemfile"
 
@@ -126,10 +122,6 @@ module Rails
         }.curry[@gem_filter]
       end
 
-      def remove_gem(name)
-        add_gem_entry_filter { |gem| gem.name != name }
-      end
-
       def builder
         @builder ||= begin
           builder_class = get_builder_class
@@ -149,92 +141,21 @@ module Rails
         FileUtils.cd(destination_root) unless options[:pretend]
       end
 
-      class TemplateRecorder < ::BasicObject # :nodoc:
-        attr_reader :gems
-
-        def initialize(target)
-          @target         = target
-          # unfortunately, instance eval has access to these ivars
-          @app_const      = target.send :app_const if target.respond_to?(:app_const, true)
-          @app_const_base = target.send :app_const_base if target.respond_to?(:app_const_base, true)
-          @app_name       = target.send :app_name if target.respond_to?(:app_name, true)
-          @commands       = []
-          @gems           = []
-        end
-
-        def gemfile_entry(*args)
-          @target.send :gemfile_entry, *args
-        end
-
-        def add_gem_entry_filter(*args, &block)
-          @target.send :add_gem_entry_filter, *args, &block
-        end
-
-        def remove_gem(*args, &block)
-          @target.send :remove_gem, *args, &block
-        end
-
-        def method_missing(name, *args, &block)
-          @commands << [name, args, block]
-        end
-
-        def respond_to_missing?(method, priv = false)
-          super || @target.respond_to?(method, priv)
-        end
-
-        def replay!
-          @commands.each do |name, args, block|
-            @target.send name, *args, &block
-          end
-        end
-      end
-
       def apply_rails_template
-        @recorder = TemplateRecorder.new self
-
-        apply(rails_template, target: self) if rails_template
-        apply(app_template, target: @recorder) if app_template
+        apply rails_template if rails_template
       rescue Thor::Error, LoadError, Errno::ENOENT => e
         raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
       end
 
-      def replay_template
-        @recorder.replay! if @recorder
-      end
-
-      def apply(path, config={})
-        verbose = config.fetch(:verbose, true)
-        target  = config.fetch(:target, self)
-        is_uri  = path =~ /^https?\:\/\//
-        path    = find_in_source_paths(path) unless is_uri
-
-        say_status :apply, path, verbose
-        shell.padding += 1 if verbose
-
-        if is_uri
-          contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
-        else
-          contents = open(path) {|io| io.read }
-        end
-
-        target.instance_eval(contents, path)
-        shell.padding -= 1 if verbose
-      end
-
       def set_default_accessors!
         self.destination_root = File.expand_path(app_path, destination_root)
-        self.rails_template = expand_template options[:template]
-        self.app_template = expand_template options[:app_template]
-      end
-
-      def expand_template(name)
-        case name
-        when /^https?:\/\//
-          name
-        when String
-          File.expand_path(name, Dir.pwd)
-        else
-          name
+        self.rails_template = case options[:template]
+          when /^https?:\/\//
+            options[:template]
+          when String
+            File.expand_path(options[:template], Dir.pwd)
+          else
+            options[:template]
         end
       end
 
@@ -389,7 +310,7 @@ module Rails
 
       def spring_gemfile_entry
         return [] unless spring_install?
-        comment = 'Spring speeds up development by keeping your application running in the background. Read more: https://github.com/jonleighton/spring'
+        comment = 'Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring'
         GemfileEntry.new('spring', nil, comment, group: :development)
       end
 
@@ -412,7 +333,8 @@ module Rails
 
         require 'bundler'
         Bundler.with_clean_env do
-          print `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
+          output = `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
+          print output unless options[:quiet]
         end
       end
 
diff --git a/railties/lib/rails/generators/erb/mailer/templates/view.html.erb b/railties/lib/rails/generators/erb/mailer/templates/view.html.erb
index 8bb7c2b768..b5045671b3 100644
--- a/railties/lib/rails/generators/erb/mailer/templates/view.html.erb
+++ b/railties/lib/rails/generators/erb/mailer/templates/view.html.erb
@@ -1,5 +1,5 @@
 <h1><%= class_name %>#<%= @action %></h1>
 
 <p>
-  <%%= @greeting %>, find me in app/views/<%= @path %>
+  <%%= @greeting %>, find me in <%= @path %>
 </p>
diff --git a/railties/lib/rails/generators/erb/mailer/templates/view.text.erb b/railties/lib/rails/generators/erb/mailer/templates/view.text.erb
index 6d597256a6..342285df19 100644
--- a/railties/lib/rails/generators/erb/mailer/templates/view.text.erb
+++ b/railties/lib/rails/generators/erb/mailer/templates/view.text.erb
@@ -1,3 +1,3 @@
 <%= class_name %>#<%= @action %>
 
-<%%= @greeting %>, find me in app/views/<%= @path %>
+<%%= @greeting %>, find me in <%= @path %>
diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb
index 3566f96f5e..cd388e590a 100644
--- a/railties/lib/rails/generators/migration.rb
+++ b/railties/lib/rails/generators/migration.rb
@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'rails/generators/actions/create_migration'
 
 module Rails
   module Generators
@@ -29,6 +30,19 @@ module Rails
         end
       end
 
+      def create_migration(destination, data, config = {}, &block)
+        action Rails::Generators::Actions::CreateMigration.new(self, destination, block || data.to_s, config)
+      end
+
+      def set_migration_assigns!(destination)
+        destination = File.expand_path(destination, self.destination_root)
+
+        migration_dir = File.dirname(destination)
+        @migration_number     = self.class.next_migration_number(migration_dir)
+        @migration_file_name  = File.basename(destination, '.rb')
+        @migration_class_name = @migration_file_name.camelize
+      end
+
       # Creates a migration template at the given destination. The difference
       # to the default template method is that the migration version is appended
       # to the destination file name.
@@ -37,26 +51,18 @@ module Rails
       # available as instance variables in the template to be rendered.
       #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"
-      def migration_template(source, destination=nil, config={})
-        destination = File.expand_path(destination || source, self.destination_root)
+      def migration_template(source, destination, config = {})
+        source  = File.expand_path(find_in_source_paths(source.to_s))
 
-        migration_dir = File.dirname(destination)
-        @migration_number     = self.class.next_migration_number(migration_dir)
-        @migration_file_name  = File.basename(destination).sub(/\.rb$/, '')
-        @migration_class_name = @migration_file_name.camelize
+        set_migration_assigns!(destination)
+        context = instance_eval('binding')
 
-        destination = self.class.migration_exists?(migration_dir, @migration_file_name)
+        dir, base = File.split(destination)
+        numbered_destination = File.join(dir, ["%migration_number%", base].join('_'))
 
-        if !(destination && options[:skip]) && behavior == :invoke
-          if destination && options.force?
-            remove_file(destination)
-          elsif destination
-            raise Error, "Another migration is already named #{@migration_file_name}: #{destination}. Use --force to remove the old migration file and replace it."
-          end
-          destination = File.join(migration_dir, "#{@migration_number}_#{@migration_file_name}.rb")
+        create_migration numbered_destination, nil, config do
+          ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
         end
-
-        template(source, destination, config)
       end
     end
   end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index d2eca5b2fb..83cb1dc0d5 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -166,7 +166,6 @@ module Rails
       end
 
       public_task :set_default_accessors!
-      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -236,8 +235,7 @@ module Rails
         build(:leftovers)
       end
 
-      public_task :run_bundle
-      public_task :replay_template
+      public_task :apply_rails_template, :run_bundle
       public_task :generate_spring_binstubs
 
     protected
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index cce4743a33..de12565a73 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -35,4 +35,7 @@ Rails.application.configure do
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
   <%- end -%>
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 3baa382bd6..d9cc60d656 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -5,7 +5,7 @@ Rails.application.configure do
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
+  # your application in memory, allowing both threaded web servers
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
@@ -81,4 +81,9 @@ Rails.application.configure do
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
+  <%- unless options.skip_active_record? -%>
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+  <%- end -%>
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index a90361725b..053f5b66d7 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -33,4 +33,7 @@ Rails.application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb
new file mode 100644
index 0000000000..7a06a89f0f
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :json
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index dbe1e37d8e..f6f529b80a 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -185,7 +185,6 @@ task default: :test
       end
 
       public_task :set_default_accessors!
-      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -242,6 +241,7 @@ task default: :test
         build(:leftovers)
       end
 
+      public_task :apply_rails_template, :run_bundle
 
       def name
         @name ||= begin
@@ -255,9 +255,6 @@ task default: :test
         end
       end
 
-      public_task :run_bundle
-      public_task :replay_template
-
     protected
 
       def app_templates_dir
diff --git a/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt b/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt
index c8de9f3e0f..c3314d7e68 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt
+++ b/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt
@@ -3,5 +3,9 @@
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine', __FILE__)
 
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
 require 'rails/all'
 require 'rails/engine/commands'
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index a01eb57651..7329ee9f48 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -15,12 +15,10 @@ module Rails
       # Set controller variables on initialization.
       def initialize(*args) #:nodoc:
         super
+        controller_name = name
         if options[:model_name]
-          controller_name = name
           self.name = options[:model_name]
           assign_names!(self.name)
-        else
-          controller_name = name
         end
 
         if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural]