Merge branch 'master' of github.com:lifo/docrails

55 files changed, 602 insertions, 436 deletions

diff --git a/railties/lib/rails/api/task.rb b/railties/lib/rails/api/task.rb
index 1f9568fb5f..3e32576040 100644
--- a/railties/lib/rails/api/task.rb
+++ b/railties/lib/rails/api/task.rb
@@ -16,8 +16,7 @@ module Rails
           :include => %w(
             README.rdoc
             lib/active_record/**/*.rb
-          ),
-          :exclude => 'lib/active_record/vendor/*'
+          )
         },
 
         'activemodel' => {
@@ -33,23 +32,22 @@ module Rails
             lib/abstract_controller/**/*.rb
             lib/action_controller/**/*.rb
             lib/action_dispatch/**/*.rb
-          ),
-          :exclude => 'lib/action_controller/vendor/*'
+          )
         },
 
         'actionview' => {
           :include => %w(
             README.rdoc
             lib/action_view/**/*.rb
-          )
+          ),
+          :exclude => 'lib/action_view/vendor/*'
         },
 
         'actionmailer' => {
           :include => %w(
             README.rdoc
             lib/action_mailer/**/*.rb
-          ),
-          :exclude => 'lib/action_mailer/vendor/*'
+          )
         },
 
         'railties' => {
diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb
index 4a17803f1c..1610751844 100644
--- a/railties/lib/rails/app_rails_loader.rb
+++ b/railties/lib/rails/app_rails_loader.rb
@@ -2,7 +2,7 @@ require 'pathname'
 
 module Rails
   module AppRailsLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
+    RUBY = Gem.ruby
     EXECUTABLES = ['bin/rails', 'script/rails']
     BUNDLER_WARNING = <<EOS
 Looks like your app's ./bin/rails is a stub that was generated by Bundler.
@@ -49,13 +49,13 @@ EOS
         # call to generate a new application, so restore the original cwd.
         Dir.chdir(original_cwd) and return if Pathname.new(Dir.pwd).root?
 
-        # Otherwise keep moving upwards in search of a executable.
+        # Otherwise keep moving upwards in search of an executable.
         Dir.chdir('..')
       end
     end
 
     def self.find_executable
-      EXECUTABLES.find { |exe| File.exists?(exe) }
+      EXECUTABLES.find { |exe| File.exist?(exe) }
     end
   end
 end
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 4faaf5ef1e..d1e88cfafd 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -223,7 +223,7 @@ module Rails
     # you need to load files in lib/ during the application configuration as well.
     def add_lib_to_load_path! #:nodoc:
       path = File.join config.root, 'lib'
-      if File.exists?(path) && !$LOAD_PATH.include?(path)
+      if File.exist?(path) && !$LOAD_PATH.include?(path)
         $LOAD_PATH.unshift(path)
       end
     end
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7332444ab9..dd0b9c6d70 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -90,7 +90,7 @@ module Rails
       # Loads and returns the configuration of the database.
       def database_configuration
         yaml = paths["config/database"].first
-        if File.exists?(yaml)
+        if File.exist?(yaml)
           require "erb"
           YAML.load ERB.new(IO.read(yaml)).result
         elsif ENV['DATABASE_URL']
diff --git a/railties/lib/rails/cli.rb b/railties/lib/rails/cli.rb
index 20313a2608..dd70c272c6 100644
--- a/railties/lib/rails/cli.rb
+++ b/railties/lib/rails/cli.rb
@@ -1,4 +1,3 @@
-require 'rbconfig'
 require 'rails/app_rails_loader'
 
 # If we are inside a Rails application this method performs an exec and thus
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 678697f09b..c998e6b6a8 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -13,5 +13,5 @@ module Rails
   end
 end
 
-Rails::Generators::AppPreparer.new(ARGV).prepare!
-Rails::Generators::AppGenerator.start
+args = Rails::Generators::ARGVScrubber.new(ARGV).prepare!
+Rails::Generators::AppGenerator.start args
diff --git a/railties/lib/rails/commands/commands_tasks.rb b/railties/lib/rails/commands/commands_tasks.rb
index 11524c4ef5..de60423784 100644
--- a/railties/lib/rails/commands/commands_tasks.rb
+++ b/railties/lib/rails/commands/commands_tasks.rb
@@ -51,6 +51,10 @@ EOT
       generate_or_destroy(:generate)
     end
 
+    def destroy
+      generate_or_destroy(:destroy)
+    end
+
     def console
       require_command!("console")
       options = Rails::Console.parse_arguments(argv)
@@ -135,7 +139,7 @@ EOT
       # This allows us to run `rails server` from other directories, but still get
       # the main config.ru and properly set the tmp directory.
       def set_application_directory!
-        Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))
+        Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exist?(File.expand_path("config.ru"))
       end
 
       def require_application_and_environment!
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 2b77d5d387..dd2ee5639e 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -50,5 +50,5 @@ elsif File.exist?(code_or_file)
   $0 = code_or_file
   Kernel.load code_or_file
 else
-  eval(code_or_file)
+  eval(code_or_file, binding, __FILE__, __LINE__)
 end
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 87d6505ed5..fec4962fb5 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'optparse'
 require 'action_dispatch'
+require 'rails'
 
 module Rails
   class Server < ::Rack::Server
@@ -21,7 +22,7 @@ module Rails
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
-          opts.on("-P","--pid=pid",String,
+          opts.on("-P", "--pid=pid", String,
                   "Specifies the PID file.",
                   "Default: tmp/pids/server.pid") { |v| options[:pid] = v }
 
@@ -32,7 +33,8 @@ module Rails
 
         opt_parser.parse! args
 
-        options[:server] = args.shift
+        options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
+        options[:server]     = args.shift
         options
       end
     end
@@ -59,30 +61,10 @@ module Rails
     end
 
     def start
-      url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
-      puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
-      puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
-      puts "=> Run `rails server -h` for more startup options"
-      if options[:Host].to_s.match(/0\.0\.0\.0/)
-        puts "=> Notice: server is listening on all interfaces (#{options[:Host]}). Consider using 127.0.0.1 (--binding option)"
-      end
+      print_boot_information
       trap(:INT) { exit }
-      puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
-
-      #Create required tmp directories if not found
-      %w(cache pids sessions sockets).each do |dir_to_make|
-        FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
-      end
-
-      unless options[:daemonize]
-        wrapped_app # touch the app so the logger is set up
-
-        console = ActiveSupport::Logger.new($stdout)
-        console.formatter = Rails.logger.formatter
-        console.level = Rails.logger.level
-
-        Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
-      end
+      create_tmp_directories
+      log_to_stdout if options[:log_stdout]
 
       super
     ensure
@@ -93,7 +75,7 @@ module Rails
 
     def middleware
       middlewares = []
-      middlewares << [Rails::Rack::Debugger]  if options[:debugger]
+      middlewares << [Rails::Rack::Debugger] if options[:debugger]
       middlewares << [::Rack::ContentLength]
 
       # FIXME: add Rack::Lock in the case people are using webrick.
@@ -113,14 +95,45 @@ module Rails
 
     def default_options
       super.merge({
-        Port:         3000,
-        DoNotReverseLookup:  true,
-        environment:  (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
-        daemonize:    false,
-        debugger:     false,
-        pid:          File.expand_path("tmp/pids/server.pid"),
-        config:       File.expand_path("config.ru")
+        Port:               3000,
+        DoNotReverseLookup: true,
+        environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
+        daemonize:          false,
+        debugger:           false,
+        pid:                File.expand_path("tmp/pids/server.pid"),
+        config:             File.expand_path("config.ru")
       })
     end
+
+    private
+
+      def print_boot_information
+        url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
+        puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
+        puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
+        puts "=> Run `rails server -h` for more startup options"
+
+        if options[:Host].to_s.match(/0\.0\.0\.0/)
+          puts "=> Notice: server is listening on all interfaces (#{options[:Host]}). Consider using 127.0.0.1 (--binding option)"
+        end
+
+        puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
+      end
+
+      def create_tmp_directories
+        %w(cache pids sessions sockets).each do |dir_to_make|
+          FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
+        end
+      end
+
+      def log_to_stdout
+        wrapped_app # touch the app so the logger is set up
+
+        console = ActiveSupport::Logger.new($stdout)
+        console.formatter = Rails.logger.formatter
+        console.level = Rails.logger.level
+
+        Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
+      end
   end
 end
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index c694513960..f5d7dede66 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -59,6 +59,10 @@ module Rails
         @operations << [__method__, args, block]
       end
 
+      def unshift(*args, &block)
+        @operations << [__method__, args, block]
+      end
+
       def merge_into(other) #:nodoc:
         @operations.each do |operation, args, block|
           other.send(operation, *args, &block)
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index f25f629aa5..54a0f1c002 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -260,7 +260,7 @@ module Rails
   #
   #   class FooController < ApplicationController
   #     def index
-  #       my_engine.root_url #=> /my_engine/
+  #       my_engine.root_url # => /my_engine/
   #     end
   #   end
   #
@@ -269,7 +269,7 @@ module Rails
   #   module MyEngine
   #     class BarController
   #       def index
-  #         main_app.foo_path #=> /foo
+  #         main_app.foo_path # => /foo
   #       end
   #     end
   #   end
@@ -351,8 +351,13 @@ module Rails
           Rails::Railtie::Configuration.eager_load_namespaces << base
 
           base.called_from = begin
-            # Remove the line number from backtraces making sure we don't leave anything behind
-            call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }
+            call_stack = if Kernel.respond_to?(:caller_locations)
+              caller_locations.map(&:path)
+            else
+              # Remove the line number from backtraces making sure we don't leave anything behind
+              caller.map { |p| p.sub(/:\d+.*/, '') }
+            end
+
             File.dirname(call_stack.detect { |p| p !~ %r[railties[\w.-]*/lib/rails|rack[\w.-]*/lib/rack] })
           end
         end
@@ -460,7 +465,7 @@ module Rails
     # files inside eager_load paths.
     def eager_load!
       config.eager_load_paths.each do |load_path|
-        matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
+        matcher = /\A#{Regexp.escape(load_path.to_s)}\/(.*)\.rb\Z/
         Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
           require_dependency file.sub(matcher, '\1')
         end
@@ -606,7 +611,7 @@ module Rails
 
     initializer :load_config_initializers do
       config.paths["config/initializers"].existent.sort.each do |initializer|
-        load(initializer)
+        load_config_initializer(initializer)
       end
     end
 
@@ -640,6 +645,12 @@ module Rails
 
     protected
 
+    def load_config_initializer(initializer)
+      ActiveSupport::Notifications.instrument('load_config_initializer.railties', initializer: initializer) do
+        load(initializer)
+      end
+    end
+
     def run_tasks_blocks(*) #:nodoc:
       super
       paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
diff --git a/railties/lib/rails/engine/railties.rb b/railties/lib/rails/engine/railties.rb
index 595256f36a..9969a1475d 100644
--- a/railties/lib/rails/engine/railties.rb
+++ b/railties/lib/rails/engine/railties.rb
@@ -16,8 +16,6 @@ module Rails
       def -(others)
         _all - others
       end
-
-      delegate :engines, to: "self.class"
     end
   end
 end
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 6b34db3e3f..dce734b54e 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -1,6 +1,8 @@
 activesupport_path = File.expand_path('../../../../activesupport/lib', __FILE__)
 $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 
+require 'thor/group'
+
 require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/kernel/singleton_class'
@@ -9,12 +11,11 @@ require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 
-require 'rails/generators/base'
-
 module Rails
   module Generators
     autoload :Actions,         'rails/generators/actions'
     autoload :ActiveModel,     'rails/generators/active_model'
+    autoload :Base,            'rails/generators/base'
     autoload :Migration,       'rails/generators/migration'
     autoload :NamedBase,       'rails/generators/named_base'
     autoload :ResourceHelpers, 'rails/generators/resource_helpers'
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index fb495c918c..2022b4ed3d 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -1,10 +1,10 @@
 require 'digest/md5'
-require 'securerandom'
 require 'active_support/core_ext/string/strip'
 require 'rails/version' unless defined?(Rails::VERSION)
-require 'rbconfig'
 require 'open-uri'
 require 'uri'
+require 'rails/generators'
+require 'active_support/core_ext/array/extract_options'
 
 module Rails
   module Generators
@@ -18,6 +18,10 @@ module Rails
 
       argument :app_path, type: :string
 
+      def self.strict_args_position
+        false
+      end
+
       def self.add_shared_options_for(name)
         class_option :template,           type: :string, aliases: '-m',
                                           desc: "Path to some #{name} template (can be a filesystem path or URL)"
@@ -72,13 +76,48 @@ module Rails
       end
 
       def initialize(*args)
-        @original_wd = Dir.pwd
+        @original_wd   = Dir.pwd
+        @gem_filter    = lambda { |gem| true }
+        @extra_entries = []
         super
         convert_database_option_for_jruby
       end
 
     protected
 
+      def gemfile_entry(name, *args)
+        options = args.extract_options!
+        version = args.first
+        github = options[:github]
+        path   = options[:path]
+
+        if github
+          @extra_entries << GemfileEntry.github(name, github)
+        elsif path
+          @extra_entries << GemfileEntry.path(name, path)
+        else
+          @extra_entries << GemfileEntry.version(name, version)
+        end
+        self
+      end
+
+      def gemfile_entries
+        [ rails_gemfile_entry,
+          database_gemfile_entry,
+          assets_gemfile_entry,
+          javascript_gemfile_entry,
+          jbuilder_gemfile_entry,
+          sdoc_gemfile_entry,
+          platform_dependent_gemfile_entry,
+          @extra_entries].flatten.find_all(&@gem_filter)
+      end
+
+      def add_gem_entry_filter
+        @gem_filter = lambda { |next_filter, entry|
+          yield(entry) && next_filter.call(entry)
+        }.curry[@gem_filter]
+      end
+
       def builder
         @builder ||= begin
           builder_class = get_builder_class
@@ -92,21 +131,81 @@ module Rails
       end
 
       def create_root
-        self.destination_root = File.expand_path(app_path, destination_root)
         valid_const?
 
         empty_directory '.'
-        set_default_accessors!
         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 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
-        apply rails_template if rails_template
+        @recorder = TemplateRecorder.new self
+
+        apply(rails_template, target: @recorder) 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 = case options[:template]
           when /^https?:\/\//
             options[:template]
@@ -118,11 +217,9 @@ module Rails
       end
 
       def database_gemfile_entry
-        options[:skip_active_record] ? "" :
-          <<-GEMFILE.strip_heredoc
-            # Use #{options[:database]} as the database for Active Record
-            gem '#{gem_for_database}'
-          GEMFILE
+        return [] if options[:skip_active_record]
+        GemfileEntry.version gem_for_database, nil,
+                            "Use #{options[:database]} as the database for Active Record"
       end
 
       def include_all_railties?
@@ -133,22 +230,39 @@ module Rails
         options[value] ? '# ' : ''
       end
 
+      class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
+        def initialize(name, version, comment, options = {}, commented_out = false)
+          super
+        end
+
+        def self.github(name, github, comment = nil)
+          new(name, nil, comment, github: github)
+        end
+
+        def self.version(name, version, comment = nil)
+          new(name, version, comment)
+        end
+
+        def self.path(name, path, comment = nil)
+          new(name, nil, comment, path: path)
+        end
+
+        def padding(max_width)
+          ' ' * (max_width - name.length + 2)
+        end
+      end
+
       def rails_gemfile_entry
         if options.dev?
-          <<-GEMFILE.strip_heredoc
-            gem 'rails',     path: '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'arel',      github: 'rails/arel'
-          GEMFILE
+          [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
+           GemfileEntry.github('arel', 'rails/arel')]
         elsif options.edge?
-          <<-GEMFILE.strip_heredoc
-            gem 'rails',     github: 'rails/rails'
-            gem 'arel',      github: 'rails/arel'
-          GEMFILE
+          [GemfileEntry.github('rails', 'rails/rails'),
+           GemfileEntry.github('arel', 'rails/arel')]
         else
-          <<-GEMFILE.strip_heredoc
-            # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-            gem 'rails', '#{Rails::VERSION::STRING}'
-          GEMFILE
+          [GemfileEntry.version('rails',
+                            Rails::VERSION::STRING,
+                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'")]
         end
       end
 
@@ -180,77 +294,75 @@ module Rails
       end
 
       def assets_gemfile_entry
-        return if options[:skip_sprockets]
-
-        gemfile = if options.dev? || options.edge?
-          <<-GEMFILE.strip_heredoc
-            # Use edge version of sprockets-rails
-            gem 'sprockets-rails', github: 'rails/sprockets-rails'
+        return [] if options[:skip_sprockets]
 
-            # Use SCSS for stylesheets
-            gem 'sass-rails', github: 'rails/sass-rails'
-          GEMFILE
+        gems = []
+        if options.dev? || options.edge?
+          gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails',
+                                    'Use edge version of sprockets-rails')
+          gems << GemfileEntry.github('sass-rails', 'rails/sass-rails',
+                                    'Use SCSS for stylesheets')
         else
-          <<-GEMFILE.strip_heredoc
-            # Use SCSS for stylesheets
-            gem 'sass-rails', '~> 4.0.0.rc1'
-          GEMFILE
+          gems << GemfileEntry.version('sass-rails',
+                                     '~> 4.0.0.rc1',
+                                     'Use SCSS for stylesheets')
         end
 
-        gemfile += <<-GEMFILE.strip_heredoc
+        gems << GemfileEntry.version('uglifier',
+                                   '>= 1.3.0',
+                                   'Use Uglifier as compressor for JavaScript assets')
 
-          # Use Uglifier as compressor for JavaScript assets
-          gem 'uglifier', '>= 1.3.0'
-        GEMFILE
+        gems
+      end
 
-        if options[:skip_javascript]
-          gemfile += <<-GEMFILE
-            #{coffee_gemfile_entry}
-            #{javascript_runtime_gemfile_entry}
-          GEMFILE
+      def platform_dependent_gemfile_entry
+        gems = []
+        if RUBY_ENGINE == 'rbx'
+          gems << GemfileEntry.version('rubysl', nil)
         end
+        gems
+      end
+
+      def jbuilder_gemfile_entry
+        comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
+        GemfileEntry.version('jbuilder', '~> 1.2', comment)
+      end
 
-        gemfile.gsub(/^[ \t]+/, '')
+      def sdoc_gemfile_entry
+        comment = 'bundle exec rake doc:rails generates the API under doc/api.'
+        GemfileEntry.new('sdoc', nil, comment, { group: :doc, require: false })
       end
 
       def coffee_gemfile_entry
+        comment = 'Use CoffeeScript for .js.coffee assets and views'
         if options.dev? || options.edge?
-          <<-GEMFILE
-            # Use CoffeeScript for .js.coffee assets and views
-            gem 'coffee-rails', github: 'rails/coffee-rails'
-          GEMFILE
+          GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment
         else
-          <<-GEMFILE
-            # Use CoffeeScript for .js.coffee assets and views
-            gem 'coffee-rails', '~> 4.0.0'
-          GEMFILE
+          GemfileEntry.version 'coffee-rails', '~> 4.0.0', comment
         end
       end
 
       def javascript_gemfile_entry
-        unless options[:skip_javascript]
-          <<-GEMFILE.gsub(/^[ \t]+/, '')
-            #{coffee_gemfile_entry}
-            #{javascript_runtime_gemfile_entry}
-            # Use #{options[:javascript]} as the JavaScript library
-            gem '#{options[:javascript]}-rails'
-
-            # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-            gem 'turbolinks'
-          GEMFILE
+        if options[:skip_javascript]
+          []
+        else
+          gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
+          gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
+                                 "Use #{options[:javascript]} as the JavaScript library")
+
+          gems << GemfileEntry.version("turbolinks", nil,
+            "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
+          gems
         end
       end
 
       def javascript_runtime_gemfile_entry
-        runtime = if defined?(JRUBY_VERSION)
-          "gem 'therubyrhino'"
+        comment = 'See https://github.com/sstephenson/execjs#readme for more supported runtimes'
+        if defined?(JRUBY_VERSION)
+          GemfileEntry.version 'therubyrhino', nil, comment
         else
-          "# gem 'therubyracer', platforms: :ruby"
+          GemfileEntry.new 'therubyracer', nil, comment, { platforms: :ruby }, true
         end
-        <<-GEMFILE
-          # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-          #{runtime}
-        GEMFILE
       end
 
       def bundle_command(command)
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 8aec8bc8f9..67bab96a22 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -7,8 +7,6 @@ rescue LoadError
   exit
 end
 
-require 'rails/generators/actions'
-
 module Rails
   module Generators
     class Error < Thor::Error # :nodoc:
@@ -211,7 +209,7 @@ module Rails
         return unless base_name && generator_name
         return unless default_generator_root
         path = File.join(default_generator_root, 'templates')
-        path if File.exists?(path)
+        path if File.exist?(path)
       end
 
       # Returns the base root for a common set of generators. This is used to dynamically
@@ -298,7 +296,7 @@ module Rails
           end
         end
 
-        # Return the default value for the option name given doing a lookup in
+        # Returns the default value for the option name given doing a lookup in
         # Rails::Generators.options.
         def self.default_value_for_option(name, options)
           default_for_option(Rails::Generators.options, name, options, options[:default])
@@ -368,12 +366,12 @@ module Rails
             source_root && File.expand_path("../USAGE", source_root),
             default_generator_root && File.join(default_generator_root, "USAGE")
           ]
-          paths.compact.detect { |path| File.exists? path }
+          paths.compact.detect { |path| File.exist? path }
         end
 
         def self.default_generator_root
           path = File.expand_path(File.join(base_name, generator_name), base_root)
-          path if File.exists?(path)
+          path if File.exist?(path)
         end
 
     end
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index e712c747b0..5a92ab3e95 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -90,7 +90,7 @@ module Rails
         end
 
         def namespaced_path
-          @namespaced_path ||= namespace.name.split("::").map {|m| m.underscore }[0]
+          @namespaced_path ||= namespace.name.split("::").first.underscore
         end
 
         def class_name
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 041bfcb733..a2023886cd 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -129,7 +129,9 @@ module Rails
     end
 
     def vendor_javascripts
-      empty_directory_with_keep_file 'vendor/assets/javascripts'
+      unless options[:skip_javascript]
+        empty_directory_with_keep_file 'vendor/assets/javascripts'
+      end
     end
 
     def vendor_stylesheets
@@ -151,23 +153,19 @@ module Rails
                              desc: "Show Rails version number and quit"
 
       def initialize(*args)
-        if args[0].blank?
-          if args[1].blank?
-            # rails new
-            raise Error, "Application name should be provided in arguments. For details run: rails --help"
-          else
-            # rails new --skip-bundle my_new_application
-            raise Error, "Options should be given after the application name. For details run: rails --help"
-          end
-        end
-
         super
 
+        unless app_path
+          raise Error, "Application name should be provided in arguments. For details run: rails --help"
+        end
+
         if !options[:skip_active_record] && !DATABASES.include?(options[:database])
           raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
         end
       end
 
+      public_task :set_default_accessors!
+      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -231,7 +229,14 @@ module Rails
         build(:leftovers)
       end
 
-      public_task :apply_rails_template, :run_bundle
+      def delete_js_folder_skipping_javascript
+        if options[:skip_javascript]
+          remove_dir 'app/assets/javascripts'
+        end
+      end
+
+      public_task :run_bundle
+      public_task :replay_template
 
     protected
 
@@ -245,7 +250,7 @@ module Rails
       end
 
       def app_name
-        @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr(".", "_")
+        @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr('\\', '').tr(". ", "_")
       end
 
       def defined_app_name
@@ -308,58 +313,67 @@ module Rails
     #
     # This class should be called before the AppGenerator is required and started
     # since it configures and mutates ARGV correctly.
-    class AppPreparer # :nodoc
-      attr_reader :argv
-
+    class ARGVScrubber # :nodoc
       def initialize(argv = ARGV)
         @argv = argv
       end
 
       def prepare!
-        handle_version_request!(argv.first)
-        unless handle_invalid_command!(argv.first)
-          argv.shift
-          handle_rails_rc!
+        handle_version_request!(@argv.first)
+        handle_invalid_command!(@argv.first, @argv) do
+          handle_rails_rc!(@argv.drop(1))
         end
       end
 
+      def self.default_rc_file
+        File.expand_path('~/.railsrc')
+      end
+
       private
 
         def handle_version_request!(argument)
-          if ['--version', '-v'].include?(argv.first)
+          if ['--version', '-v'].include?(argument)
             require 'rails/version'
             puts "Rails #{Rails::VERSION::STRING}"
             exit(0)
           end
         end
 
-        def handle_invalid_command!(argument)
-          if argument != "new"
-            argv[0] = "--help"
+        def handle_invalid_command!(argument, argv)
+          if argument == "new"
+            yield
+          else
+            ['--help'] + argv.drop(1)
           end
         end
 
-        def handle_rails_rc!
-          unless argv.delete("--no-rc")
-            insert_railsrc(railsrc)
+        def handle_rails_rc!(argv)
+          if argv.find { |arg| arg == '--no-rc' }
+            argv.reject { |arg| arg == '--no-rc' }
+          else
+            railsrc(argv) { |rc_argv, rc| insert_railsrc_into_argv!(rc_argv, rc) }
           end
         end
 
-        def railsrc
+        def railsrc(argv)
           if (customrc = argv.index{ |x| x.include?("--rc=") })
-            File.expand_path(argv.delete_at(customrc).gsub(/--rc=/, ""))
+            fname = File.expand_path(argv[customrc].gsub(/--rc=/, ""))
+            yield(argv.take(customrc) + argv.drop(customrc + 1), fname)
           else
-            File.join(File.expand_path("~"), '.railsrc')
+            yield argv, self.class.default_rc_file
           end
         end
 
-        def insert_railsrc(railsrc)
-          if File.exist?(railsrc)
-            extra_args_string = File.read(railsrc)
-            extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
-            puts "Using #{extra_args.join(" ")} from #{railsrc}"
-            argv.insert(1, *extra_args)
-          end
+        def read_rc_file(railsrc)
+          extra_args = File.readlines(railsrc).flat_map(&:split)
+          puts "Using #{extra_args.join(" ")} from #{railsrc}"
+          extra_args
+        end
+
+        def insert_railsrc_into_argv!(argv, railsrc)
+          return argv unless File.exist?(railsrc)
+          extra_args = read_rc_file railsrc
+          argv.take(1) + extra_args + argv.drop(1)
         end
     end
   end
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index adc83353b4..68bd62d4b1 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -1,30 +1,35 @@
 source 'https://rubygems.org'
 
-<%= rails_gemfile_entry -%>
+<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
+<% gemfile_entries.each do |gem| -%>
+<% if gem.comment -%>
 
-<%= database_gemfile_entry -%>
-
-<%= assets_gemfile_entry %>
-<%= javascript_gemfile_entry -%>
-
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
-
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
-end
+# <%= gem.comment %>
+<% end -%>
+<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<% if gem.version -%>
+, '<%= gem.version %>'
+<% elsif gem.options.any? -%>
+,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
+  "#{k}: #{v.inspect}" }.join(', ') %>
+<% else %>
+<% end -%>
+<% end -%>
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.1.0'
+# gem 'bcrypt-ruby', '~> 3.1.2'
 
 # Use unicorn as the app server
 # gem 'unicorn'
 
 # Use Capistrano for deployment
-# gem 'capistrano', group: :development
+# gem 'capistrano-rails', group: :development
 
 <% unless defined?(JRUBY_VERSION) -%>
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 <% end -%>
+
+<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%>
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin]
+<% end -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
index 8b91313e51..07ea09cdbd 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
@@ -13,6 +13,8 @@
 <% unless options[:skip_javascript] -%>
 //= require <%= options[:javascript] %>
 //= require <%= options[:javascript] %>_ujs
+<% if gemfile_entries.any? { |m| m.name == "turbolinks" } -%>
 //= require turbolinks
 <% end -%>
+<% end -%>
 //= require_tree .
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index c3d1578818..fe71f7122c 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -4,10 +4,14 @@
   <title><%= camelized %></title>
   <%- if options[:skip_javascript] -%>
   <%%= stylesheet_link_tag    "application", media: "all" %>
-  <%%= javascript_include_tag "application" %>
   <%- else -%>
+    <%- if gemfile_entries.any? { |m| m.name == "turbolinks" } -%>
   <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
   <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+    <%- else -%>
+  <%%= stylesheet_link_tag    "application", media: "all" %>
+  <%%= javascript_include_tag "application" %>
+    <%- end -%>
   <%- end -%>
   <%%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
index 3596736667..5e5f0c1fac 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,4 +1,4 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
index 4807986333..c6dfd50d40 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
@@ -6,26 +6,23 @@
 # Configure Using Gemfile
 # gem 'ruby-frontbase'
 #
-development:
+default: &default
   adapter: frontbase
   host: localhost
-  database: <%= app_name %>_development
   username: <%= app_name %>
   password: ''
 
+development:
+  <<: *default
+  database: <%= app_name %>_development
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: frontbase
-  host: localhost
+  <<: *default
   database: <%= app_name %>_test
-  username: <%= app_name %>
-  password: ''
 
 production:
-  adapter: frontbase
-  host: localhost
+  <<: *default
   database: <%= app_name %>_production
-  username: <%= app_name %>
-  password: ''
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
index 3d689a110a..fe53cd0ea2 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
@@ -33,12 +33,11 @@
 #
 # For more details on the installation and the connection parameters below,
 # please refer to the latest documents at http://rubyforge.org/docman/?group_id=2361
-
-development:
+#
+default: &default
   adapter: ibm_db
   username: db2inst1
   password:
-  database: <%= app_name[0,4] %>_dev
   #schema: db2inst1
   #host: localhost
   #port: 50000
@@ -51,36 +50,17 @@ development:
   #authentication: SERVER
   #parameterized: false
 
+development:
+  <<: *default
+  database: <%= app_name[0,4] %>_dev
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
-  adapter: ibm_db
-  username: db2inst1
-  password:
+  <<: *default
   database: <%= app_name[0,4] %>_tst
-  #schema: db2inst1
-  #host: localhost
-  #port: 50000
-  #account: my_account
-  #app_user: my_app_user
-  #application: my_application
-  #workstation: my_workstation
-  #security: SSL
-  #timeout: 10
-  #authentication: SERVER
-  #parameterized: false
 
 production:
-  adapter: ibm_db
-  username: db2inst1
-  password:
+  <<: *default
   database: <%= app_name[0,8] %>
-  #schema: db2inst1
-  #host: localhost
-  #port: 50000
-  #account: my_account
-  #app_user: my_app_user
-  #application: my_application
-  #workstation: my_workstation
-  #security: SSL
-  #timeout: 10
-  #authentication: SERVER
-  #parameterized: false
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
index 1d2bf08b91..be1dae332f 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
@@ -5,58 +5,54 @@
 # Configure using Gemfile:
 #   gem 'activerecord-jdbcmssql-adapter'
 #
-#development:
-#  adapter: mssql
-#  username: <%= app_name %>
-#  password:
-#  host: localhost
-#  database: <%= app_name %>_development
+# development:
+#   adapter: mssql
+#   username: <%= app_name %>
+#   password:
+#   host: localhost
+#   database: <%= app_name %>_development
 #
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 #
-#test:
-#  adapter: mssql
-#  username: <%= app_name %>
-#  password:
-#  host: localhost
-#  database: <%= app_name %>_test
+# test:
+#   adapter: mssql
+#   username: <%= app_name %>
+#   password:
+#   host: localhost
+#   database: <%= app_name %>_test
 #
-#production:
-#  adapter: mssql
-#  username: <%= app_name %>
-#  password:
-#  host: localhost
-#  database: <%= app_name %>_production
+# production:
+#   adapter: mssql
+#   username: <%= app_name %>
+#   password:
+#   host: localhost
+#   database: <%= app_name %>_production
 
 # If you are using oracle, db2, sybase, informix or prefer to use the plain
 # JDBC adapter, configure your database setting as the example below (requires
 # you to download and manually install the database vendor's JDBC driver .jar
-# file). See your driver documentation for the apropriate driver class and
+# file). See your driver documentation for the appropriate driver class and
 # connection string:
 
-development:
+default: &default
   adapter: jdbc
   username: <%= app_name %>
   password:
   driver:
+
+development:
+  <<: *default
   url: jdbc:db://localhost/<%= app_name %>_development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-
 test:
-  adapter: jdbc
-  username: <%= app_name %>
-  password:
-  driver:
+  <<: *default
   url: jdbc:db://localhost/<%= app_name %>_test
 
 production:
-  adapter: jdbc
-  username: <%= app_name %>
-  password:
-  driver:
+  <<: *default
   url: jdbc:db://localhost/<%= app_name %>_production
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
index 5a594ac1f3..26e2a5976c 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
@@ -8,26 +8,24 @@
 #
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
+#
+default: &default
   adapter: mysql
-  database: <%= app_name %>_development
   username: root
   password:
   host: localhost
 
+development:
+  <<: *default
+  database: <%= app_name %>_development
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
+  <<: *default
   database: <%= app_name %>_test
-  username: root
-  password:
-  host: localhost
 
 production:
-  adapter: mysql
+  <<: *default
   database: <%= app_name %>_production
-  username: root
-  password:
-  host: localhost
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
index e1a00d076f..ccd44cf54b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
@@ -2,14 +2,17 @@
 #
 # Configure Using Gemfile
 # gem 'activerecord-jdbcpostgresql-adapter'
-
-development:
+#
+default: &default
   adapter: postgresql
   encoding: unicode
-  database: <%= app_name %>_development
   username: <%= app_name %>
   password:
 
+development:
+  <<: *default
+  database: <%= app_name %>_development
+
   # Connect on a TCP socket. Omitted by default since the client uses a
   # domain socket that doesn't need configuration. Windows does not have
   # domain sockets, so uncomment these lines.
@@ -29,15 +32,9 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: postgresql
-  encoding: unicode
+  <<: *default
   database: <%= app_name %>_test
-  username: <%= app_name %>
-  password:
 
 production:
-  adapter: postgresql
-  encoding: unicode
+  <<: *default
   database: <%= app_name %>_production
-  username: <%= app_name %>
-  password:
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
index 175f3eb3db..28c36eb82f 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
@@ -4,17 +4,20 @@
 # Configure Using Gemfile
 # gem 'activerecord-jdbcsqlite3-adapter'
 #
-development:
+default: &default
   adapter: sqlite3
+
+development:
+  <<: *default
   database: db/development.sqlite3
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
+  <<: *default
   database: db/test.sqlite3
 
 production:
-  adapter: sqlite3
+  <<: *default
   database: db/production.sqlite3
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
index c3349912aa..3fc7ce28a1 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
@@ -8,10 +8,10 @@
 #
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
+#
+default: &default
   adapter: mysql2
   encoding: utf8
-  database: <%= app_name %>_development
   pool: 5
   username: root
   password:
@@ -21,31 +21,17 @@ development:
   host: localhost
 <% end -%>
 
+development:
+  <<: *default
+  database: <%= app_name %>_development
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql2
-  encoding: utf8
+  <<: *default
   database: <%= app_name %>_test
-  pool: 5
-  username: root
-  password:
-<% if mysql_socket -%>
-  socket: <%= mysql_socket %>
-<% else -%>
-  host: localhost
-<% end -%>
 
 production:
-  adapter: mysql2
-  encoding: utf8
+  <<: *default
   database: <%= app_name %>_production
-  pool: 5
-  username: root
-  password:
-<% if mysql_socket -%>
-  socket: <%= mysql_socket %>
-<% else -%>
-  host: localhost
-<% end -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
index b661a60389..d5b52c969b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
@@ -16,24 +16,22 @@
 #  prefetch_rows: 100
 #  cursor_sharing: similar
 #
-
-development:
+default: &default
   adapter: oracle
-  database: <%= app_name %>_development
   username: <%= app_name %>
   password:
 
+development:
+  <<: *default
+  database: <%= app_name %>_development
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: oracle
+  <<: *default
   database: <%= app_name %>_test
-  username: <%= app_name %>
-  password:
 
 production:
-  adapter: oracle
+  <<: *default
   database: <%= app_name %>_production
-  username: <%= app_name %>
-  password:
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
index eb569b7dab..eaeb82bddd 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -14,14 +14,19 @@
 # Configure Using Gemfile
 # gem 'pg'
 #
-development:
+default: &default
   adapter: postgresql
   encoding: unicode
-  database: <%= app_name %>_development
+  # For details on connection pooling, see rails configration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: 5
   username: <%= app_name %>
   password:
 
+development:
+  <<: *default
+  database: <%= app_name %>_development
+
   # Connect on a TCP socket. Omitted by default since the client uses a
   # domain socket that doesn't need configuration. Windows does not have
   # domain sockets, so uncomment these lines.
@@ -44,17 +49,9 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: postgresql
-  encoding: unicode
+  <<: *default
   database: <%= app_name %>_test
-  pool: 5
-  username: <%= app_name %>
-  password:
 
 production:
-  adapter: postgresql
-  encoding: unicode
+  <<: *default
   database: <%= app_name %>_production
-  pool: 5
-  username: <%= app_name %>
-  password:
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
index 51a4dd459d..1c1a37ca8d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
@@ -3,23 +3,23 @@
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
-development:
+#
+default: &default
   adapter: sqlite3
-  database: db/development.sqlite3
   pool: 5
   timeout: 5000
 
+development:
+  <<: *default
+  database: db/development.sqlite3
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
+  <<: *default
   database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
 
 production:
-  adapter: sqlite3
+  <<: *default
   database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
index 7ef89d6608..4855f66c0d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
@@ -21,37 +21,27 @@
 # If you can connect with "tsql -S servername", your basic FreeTDS installation is working.
 # 'man tsql' for more info
 # Set timeout to a larger number if valid queries against a live db fail
-
-development:
+#
+default: &default
   adapter: sqlserver
   encoding: utf8
   reconnect: false
-  database: <%= app_name %>_development
   username: <%= app_name %>
   password:
   timeout: 25
   dataserver: from_freetds.conf
 
+development:
+  <<: *default
+  database: <%= app_name %>_development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlserver
-  encoding: utf8
-  reconnect: false
+  <<: *default
   database: <%= app_name %>_test
-  username: <%= app_name %>
-  password:
-  timeout: 25
-  dataserver: from_freetds.conf
 
 production:
-  adapter: sqlserver
-  encoding: utf8
-  reconnect: false
+  <<: *default
   database: <%= app_name %>_production
-  username: <%= app_name %>
-  password:
-  timeout: 25
-  dataserver: from_freetds.conf
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 cff570a631..b724d468a2 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
@@ -22,8 +22,8 @@ Rails.application.configure do
   <%- unless options.skip_active_record? -%>
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
-  <%- end -%>
 
+  <%- end -%>
   <%- unless options.skip_sprockets? -%>
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
diff --git a/railties/lib/rails/generators/rails/app/templates/public/404.html b/railties/lib/rails/generators/rails/app/templates/public/404.html
index a0daa0c156..b612547fc2 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/404.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/404.html
@@ -2,17 +2,23 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
     font-family: arial, sans-serif;
+    margin: 0;
   }
 
   div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -21,7 +27,8 @@
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
-    padding: 7px 4em 0 4em;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
   h1 {
@@ -30,19 +37,19 @@
     line-height: 1.5em;
   }
 
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
     background-color: #F7F7F7;
     border: 1px solid #CCC;
     border-right-color: #999;
+    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>
 </head>
@@ -50,9 +57,11 @@
 <body>
   <!-- This file lives in public/404.html -->
   <div class="dialog">
-    <h1>The page you were looking for doesn't exist.</h1>
-    <p>You may have mistyped the address or the page may have moved.</p>
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
-  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>
diff --git a/railties/lib/rails/generators/rails/app/templates/public/422.html b/railties/lib/rails/generators/rails/app/templates/public/422.html
index fbb4b84d72..a21f82b3bd 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/422.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/422.html
@@ -2,17 +2,23 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
     font-family: arial, sans-serif;
+    margin: 0;
   }
 
   div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -21,7 +27,8 @@
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
-    padding: 7px 4em 0 4em;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
   h1 {
@@ -30,19 +37,19 @@
     line-height: 1.5em;
   }
 
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
     background-color: #F7F7F7;
     border: 1px solid #CCC;
     border-right-color: #999;
+    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>
 </head>
@@ -50,9 +57,11 @@
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>The change you wanted was rejected.</h1>
-    <p>Maybe you tried to change something you didn't have access to.</p>
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
-  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>
diff --git a/railties/lib/rails/generators/rails/app/templates/public/500.html b/railties/lib/rails/generators/rails/app/templates/public/500.html
index e9052d35bf..061abc587d 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/500.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/500.html
@@ -2,17 +2,23 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
     font-family: arial, sans-serif;
+    margin: 0;
   }
 
   div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -21,7 +27,8 @@
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
-    padding: 7px 4em 0 4em;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
   h1 {
@@ -30,19 +37,19 @@
     line-height: 1.5em;
   }
 
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
     background-color: #F7F7F7;
     border: 1px solid #CCC;
     border-right-color: #999;
+    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>
 </head>
@@ -50,8 +57,10 @@
 <body>
   <!-- This file lives in public/500.html -->
   <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
-  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 822f35fb42..ef84447df9 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -32,18 +32,18 @@ module Rails
           # namespace :foo do
           #   namespace :bar do
           namespace_ladder = class_path.each_with_index.map do |ns, i|
-            %{#{" " * i * 2}namespace :#{ns} do\n  }
+            indent("namespace :#{ns} do\n", i * 2)
           end.join
 
           # Create route
           #     get "baz/index"
-          route = %{#{" " * depth * 2}get "#{file_name}/#{action}"\n}
+          route = indent(%{get "#{file_name}/#{action}"\n}, depth * 2)
 
           # Create `end` ladder
           #   end
           # end
           end_ladder = (1..depth).reverse_each.map do |i|
-            "#{" " * i * 2}end\n"
+            indent("end\n", i * 2)
           end.join
 
           # Combine the 3 parts to generate complete route entry
diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE
index 145d9ee6e0..833b7beb7f 100644
--- a/railties/lib/rails/generators/rails/model/USAGE
+++ b/railties/lib/rails/generators/rails/model/USAGE
@@ -60,7 +60,7 @@ Available field types:
     For decimal, two integers separated by a comma in curly braces will be used
     for precision and scale:
 
-        `rails generate model product price:decimal{10,2}`
+        `rails generate model product 'price:decimal{10,2}'`
 
     You can add a `:uniq` or `:index` suffix for unique or standard indexes
     respectively:
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 13f5472ede..dbe1e37d8e 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -176,12 +176,16 @@ task default: :test
                                                  "skip adding entry to Gemfile"
 
       def initialize(*args)
-        raise Error, "Options should be given after the plugin name. For details run: rails plugin new --help" if args[0].blank?
-
         @dummy_path = nil
         super
+
+        unless plugin_path
+          raise Error, "Plugin name should be provided in arguments. For details run: rails plugin new --help"
+        end
       end
 
+      public_task :set_default_accessors!
+      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -238,7 +242,6 @@ task default: :test
         build(:leftovers)
       end
 
-      public_task :apply_rails_template, :run_bundle
 
       def name
         @name ||= begin
@@ -252,6 +255,9 @@ task default: :test
         end
       end
 
+      public_task :run_bundle
+      public_task :replay_template
+
     protected
 
       def app_templates_dir
@@ -317,7 +323,7 @@ task default: :test
         @application_definition ||= begin
 
           dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-          unless options[:pretend] || !File.exists?(dummy_application_path)
+          unless options[:pretend] || !File.exist?(dummy_application_path)
             contents = File.read(dummy_application_path)
             contents[(contents.index(/module ([\w]+)\n(.*)class Application/m))..-1]
           end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/Gemfile b/railties/lib/rails/generators/rails/plugin/templates/Gemfile
index 3f2b78f2fd..d576784415 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin/templates/Gemfile
@@ -23,7 +23,20 @@ end
 <% if options.dev? || options.edge? -%>
 # Your gem is dependent on dev or edge Rails. Once you can lock this
 # dependency down to a specific version, move it to your gemspec.
-<%= rails_gemfile_entry -%>
+<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
+<% gemfile_entries.each do |gem| -%>
+<% if gem.comment -%>
+
+# <%= gem.comment %>
+<% end -%>
+<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<% if gem.version -%>
+, '<%= gem.version %>'
+<% elsif gem.options.any? -%>
+,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
+  "#{k}: #{v.inspect}" }.join(', ') %>
+<% else %>
+<% end -%>
+<% end -%>
 
 <% end -%>
 # To use debugger
diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb
index ef360470a3..6266cfc509 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb
+++ b/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb
@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 4f36b612ae..6bf0a33a5f 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -13,7 +13,7 @@ module Rails
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_controller_files
-        template "controller.rb", File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template "controller.rb", File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
       end
 
       hook_for :template_engine, :test_framework, as: :scaffold
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index 7fd5c00768..a01eb57651 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -9,11 +9,19 @@ module Rails
 
       def self.included(base) #:nodoc:
         base.class_option :force_plural, type: :boolean, desc: "Forces the use of a plural ModelName"
+        base.class_option :model_name, type: :string, desc: "ModelName to be used"
       end
 
       # Set controller variables on initialization.
       def initialize(*args) #:nodoc:
         super
+        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]
           unless ResourceHelpers.skip_warn
@@ -24,19 +32,26 @@ module Rails
           assign_names!(name)
         end
 
-        @controller_name = name.pluralize
+        assign_controller_names!(controller_name.pluralize)
       end
 
       protected
 
-        attr_reader :controller_name
+        attr_reader :controller_name, :controller_file_name
 
         def controller_class_path
-          class_path
+          if options[:model_name]
+            @controller_class_path
+          else
+            class_path
+          end
         end
 
-        def controller_file_name
-          @controller_file_name ||= file_name.pluralize
+        def assign_controller_names!(name)
+          @controller_name = name
+          @controller_class_path = name.include?('/') ? name.split('/') : name.split('::')
+          @controller_class_path.map! { |m| m.underscore }
+          @controller_file_name = @controller_class_path.pop
         end
 
         def controller_file_path
diff --git a/railties/lib/rails/generators/testing/assertions.rb b/railties/lib/rails/generators/testing/assertions.rb
index 6267b2f2ee..2e877f8762 100644
--- a/railties/lib/rails/generators/testing/assertions.rb
+++ b/railties/lib/rails/generators/testing/assertions.rb
@@ -21,8 +21,8 @@ module Rails
         #     end
         #   end
         def assert_file(relative, *contents)
-          absolute = File.expand_path(relative, destination_root)
-          assert File.exists?(absolute), "Expected file #{relative.inspect} to exist, but does not"
+          absolute = File.expand_path(relative, destination_root).shellescape
+          assert File.exist?(absolute), "Expected file #{relative.inspect} to exist, but does not"
 
           read = File.read(absolute) if block_given? || !contents.empty?
           yield read if block_given?
@@ -44,7 +44,7 @@ module Rails
         #   assert_no_file "config/random.rb"
         def assert_no_file(relative)
           absolute = File.expand_path(relative, destination_root)
-          assert !File.exists?(absolute), "Expected file #{relative.inspect} to not exist, but does"
+          assert !File.exist?(absolute), "Expected file #{relative.inspect} to not exist, but does"
         end
         alias :assert_no_directory :assert_no_file
 
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index fa5668a5b5..85ea11b4e7 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -13,10 +13,12 @@ class Rails::InfoController < ActionController::Base # :nodoc:
 
   def properties
     @info = Rails::Info.to_html
+    @page_title = 'Properties'
   end
 
   def routes
     @routes_inspector = ActionDispatch::Routing::RoutesInspector.new(_routes.routes)
+    @page_title = 'Routes'
   end
 
   protected
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index de6795eda2..f512aefb23 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -81,34 +81,28 @@ module Rails
       end
 
       def autoload_once
-        filter_by(:autoload_once?)
+        filter_by { |p| p.autoload_once? }
       end
 
       def eager_load
-        filter_by(:eager_load?)
+        filter_by { |p| p.eager_load? }
       end
 
       def autoload_paths
-        filter_by(:autoload?)
+        filter_by { |p| p.autoload? }
       end
 
       def load_paths
-        filter_by(:load_path?)
+        filter_by { |p| p.load_path? }
       end
 
-    protected
+    private
 
-      def filter_by(constraint)
-        all = []
-        all_paths.each do |path|
-          if path.send(constraint)
-            paths  = path.existent
-            paths -= path.children.map { |p| p.send(constraint) ? [] : p.existent }.flatten
-            all.concat(paths)
-          end
-        end
-        all.uniq!
-        all
+      def filter_by(&block)
+        all_paths.find_all(&block).flat_map { |path|
+          paths = path.existent
+          paths - path.children.map { |p| yield(p) ? [] : p.existent }.flatten
+        }.uniq
       end
     end
 
@@ -130,8 +124,9 @@ module Rails
       end
 
       def children
-        keys = @root.keys.select { |k| k.include?(@current) }
-        keys.delete(@current)
+        keys = @root.keys.find_all { |k|
+          k.start_with?(@current) && k != @current
+        }
         @root.values_at(*keys.sort)
       end
 
@@ -203,7 +198,7 @@ module Rails
 
       # Returns all expanded paths but only if they exist in the filesystem.
       def existent
-        expanded.select { |f| File.exists?(f) }
+        expanded.select { |f| File.exist?(f) }
       end
 
       def existent_directories
diff --git a/railties/lib/rails/rack/log_tailer.rb b/railties/lib/rails/rack/log_tailer.rb
index 18f22e8089..50d0eb96fc 100644
--- a/railties/lib/rails/rack/log_tailer.rb
+++ b/railties/lib/rails/rack/log_tailer.rb
@@ -7,7 +7,7 @@ module Rails
         path = Pathname.new(log || "#{::File.expand_path(Rails.root)}/log/#{Rails.env}.log").cleanpath
 
         @cursor = @file = nil
-        if ::File.exists?(path)
+        if ::File.exist?(path)
           @cursor = ::File.size(path)
           @file = ::File.open(path, 'r')
         end
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index ef4cdcb080..3b35798679 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -11,7 +11,6 @@ module Rails
       def initialize(app, taggers = nil)
         @app          = app
         @taggers      = taggers || []
-        @instrumenter = ActiveSupport::Notifications.instrumenter
       end
 
       def call(env)
@@ -33,7 +32,8 @@ module Rails
           logger.debug ''
         end
 
-        @instrumenter.start 'request.action_dispatch', request: request
+        instrumenter = ActiveSupport::Notifications.instrumenter
+        instrumenter.start 'request.action_dispatch', request: request
         logger.info started_request_message(request)
         resp = @app.call(env)
         resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
@@ -70,7 +70,8 @@ module Rails
       private
 
       def finish(request)
-        @instrumenter.finish 'request.action_dispatch', request: request
+        instrumenter = ActiveSupport::Notifications.instrumenter
+        instrumenter.finish 'request.action_dispatch', request: request
       end
 
       def development?
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index 0cbbf04da2..eb3b2d8ef4 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -80,7 +80,7 @@ module Rails
         to_prepare_blocks << blk if blk
       end
 
-      def respond_to?(name)
+      def respond_to?(name, include_private = false)
         super || @@options.key?(name.to_sym)
       end
 
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index b806b922b7..3cf6a005ea 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -67,7 +67,7 @@ class SourceAnnotationExtractor
   # Returns a hash that maps filenames under +dir+ (recursively) to arrays
   # with their annotations. Only files with annotations are included. Files
   # with extension +.builder+, +.rb+, +.erb+, +.haml+, +.slim+, +.css+,
-  # +.scss+, +.js+, +.coffee+, and +.rake+
+  # +.scss+, +.js+, +.coffee+, +.rake+, +.sass+ and +.less+
   # are taken into account.
   def find_in(dir)
     results = {}
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index bd4e7c33e0..e669315934 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -46,7 +46,7 @@ namespace :rails do
         require 'rails/generators/rails/app/app_generator'
         gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
                                                              destination_root: Rails.root
-        File.exists?(Rails.root.join("config", "application.rb")) ?
+        File.exist?(Rails.root.join("config", "application.rb")) ?
           gen.send(:app_const) : gen.send(:valid_const?)
         gen
       end
diff --git a/railties/lib/rails/tasks/log.rake b/railties/lib/rails/tasks/log.rake
index 6c3f02eb0c..877f175ef3 100644
--- a/railties/lib/rails/tasks/log.rake
+++ b/railties/lib/rails/tasks/log.rake
@@ -10,7 +10,7 @@ namespace :log do
     if ENV['LOGS']
       ENV['LOGS'].split(',')
                   .map    { |file| "log/#{file.strip}.log" }
-                  .select { |file| File.exists?(file) }
+                  .select { |file| File.exist?(file) }
     else
       FileList["log/*.log"]
     end
diff --git a/railties/lib/rails/templates/layouts/application.html.erb b/railties/lib/rails/templates/layouts/application.html.erb
index 7352d48e7b..50a4755e45 100644
--- a/railties/lib/rails/templates/layouts/application.html.erb
+++ b/railties/lib/rails/templates/layouts/application.html.erb
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8" />
-  <title>Routes</title>
+  <title><%= @page_title %></title>
   <style>
     body { background-color: #fff; color: #333; }
 
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 46f7466551..be801befc2 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -10,7 +10,9 @@ require 'rails/generators/test_case'
 
 # Config Rails backtrace in tests.
 require 'rails/backtrace_cleaner'
-MiniTest.backtrace_filter = Rails.backtrace_cleaner
+if ENV["BACKTRACE"].nil?
+  MiniTest.backtrace_filter = Rails.backtrace_cleaner
+end
 
 if defined?(ActiveRecord::Base)
   class ActiveSupport::TestCase
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 547846c833..38107e77b2 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -4,7 +4,7 @@ require 'rails/test_unit/sub_test_task'
 
 task default: :test
 
-desc 'Runs test:units, test:functionals, test:integration together'
+desc 'Runs test:units, test:functionals, test:generators, test:integration together'
 task :test do
   Rails::TestTask.test_creator(Rake.application.top_level_tasks).invoke_rake_task
 end