From fb9eb7019e5e880807b903bc1c7b3f4f819302eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 7 Jul 2014 22:05:30 -0300
Subject: Stop using mocha on app_rails_loader_test

---
 railties/lib/rails/app_rails_loader.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb
index 56f05b3844..39d8007333 100644
--- a/railties/lib/rails/app_rails_loader.rb
+++ b/railties/lib/rails/app_rails_loader.rb
@@ -2,6 +2,8 @@ require 'pathname'
 
 module Rails
   module AppRailsLoader
+    extend self
+
     RUBY = Gem.ruby
     EXECUTABLES = ['bin/rails', 'script/rails']
     BUNDLER_WARNING = <<EOS
@@ -26,7 +28,7 @@ generate it and add it to source control:
 
 EOS
 
-    def self.exec_app_rails
+    def exec_app_rails
       original_cwd = Dir.pwd
 
       loop do
@@ -54,7 +56,7 @@ EOS
       end
     end
 
-    def self.find_executable
+    def find_executable
       EXECUTABLES.find { |exe| File.file?(exe) }
     end
   end
-- 
cgit v1.2.3


From b3a34cd3747840a8bd92612d02d947da01bcd00e Mon Sep 17 00:00:00 2001
From: Andrey Chernih <andrey.chernih@gmail.com>
Date: Fri, 11 Jul 2014 23:26:33 +0400
Subject: Add ability to extend `rails server` command options parser

With this change it will be possible to add additional options to the `option_parser` like this:

    require 'rails/commands/server'
    module Rails
      class Server < ::Rack::Server
        class Options
          def option_parser_with_open(options)
            parser = option_parser_without_open options
            parser.on('-o', '--open', 'Open in default browser') { options[:open] = true }
            parser
          end
          alias_method_chain :option_parser, :open
        end

        def start_with_open
          start_without_open do
            `open http://localhost:3000` if options[:open]
          end
        end
        alias_method_chain :start, :open
      end
    end
---
 railties/lib/rails/commands/server.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 6146b6c1db..c3b7bb6f84 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -9,7 +9,17 @@ module Rails
       def parse!(args)
         args, options = args.dup, {}
 
-        opt_parser = OptionParser.new do |opts|
+        option_parser(options).parse! args
+
+        options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
+        options[:server]     = args.shift
+        options
+      end
+
+      private
+
+      def option_parser(options)
+        OptionParser.new do |opts|
           opts.banner = "Usage: rails server [mongrel, thin, etc] [options]"
           opts.on("-p", "--port=port", Integer,
                   "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
@@ -37,12 +47,6 @@ module Rails
 
           opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
         end
-
-        opt_parser.parse! args
-
-        options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
-        options[:server]     = args.shift
-        options
       end
     end
 
-- 
cgit v1.2.3


From 9629dea4fb15a948ab4394590fdd946bd9dd4f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 10 Jul 2014 16:40:07 -0300
Subject: Add Rails::Application#config_for

This is a convenience for loading configuration for the current Rails
environment.
---
 railties/lib/rails/application.rb | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 362713eb75..c5fd08e743 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -187,6 +187,38 @@ module Rails
       end
     end
 
+    # Convenience for loading config/foo.yml for the current Rails env.
+    #
+    # Example:
+    #
+    #     # config/exception_notification.yml:
+    #     production:
+    #       url: http://127.0.0.1:8080
+    #       namespace: my_app_production
+    #     development:
+    #       url: http://localhost:3001
+    #       namespace: my_app_development
+    #
+    #     # config/production.rb
+    #     MyApp::Application.configure do
+    #       config.middleware.use ExceptionNotifier, config_for(:exception_notification)
+    #     end
+    def config_for(name)
+      yaml = Pathname.new("#{paths["config"].existent.first}/#{name}.yml")
+
+      if yaml.exist?
+        require "yaml"
+        require "erb"
+        (YAML.load(ERB.new(yaml.read).result) || {})[Rails.env] || {}
+      else
+        raise "Could not load configuration. No such file - #{yaml}"
+      end
+    rescue Psych::SyntaxError => e
+      raise "YAML syntax error occurred while parsing #{yaml}. " \
+        "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+        "Error: #{e.message}"
+    end
+
     # Stores some of the Rails initial environment parameters which
     # will be used by middlewares and engines to configure themselves.
     def env_config
-- 
cgit v1.2.3


From 3121412cf181388f8dac71f2d707be2cbb764524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 15 Jul 2014 17:56:27 -0300
Subject: Keep quietly and capture undeprecated on your suite

---
 railties/lib/rails/generators/testing/behaviour.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/testing/behaviour.rb b/railties/lib/rails/generators/testing/behaviour.rb
index 7576eba6e0..e0600d0b59 100644
--- a/railties/lib/rails/generators/testing/behaviour.rb
+++ b/railties/lib/rails/generators/testing/behaviour.rb
@@ -100,6 +100,23 @@ module Rails
             dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, '')
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
+
+          def capture(stream)
+            stream = stream.to_s
+            captured_stream = Tempfile.new(stream)
+            stream_io = eval("$#{stream}")
+            origin_stream = stream_io.dup
+            stream_io.reopen(captured_stream)
+
+            yield
+
+            stream_io.rewind
+            return captured_stream.read
+          ensure
+            captured_stream.close
+            captured_stream.unlink
+            stream_io.reopen(origin_stream)
+          end
       end
     end
   end
-- 
cgit v1.2.3


From af3cf61aa7e139b8e8b446b65494f14cfcc538ce Mon Sep 17 00:00:00 2001
From: Jim Jones <jjones@aantix.com>
Date: Thu, 17 Jul 2014 21:19:07 -0700
Subject: Added additional help messaging when there's scaffolding being
 generated and a migration already exists for the resource.

The user is now alerted that they are able to skip the conflicted migration file via the --skip option.
---
 railties/lib/rails/generators/actions/create_migration.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index cf3b7acfff..b4701b9591 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -55,7 +55,8 @@ module Rails
           else
             say_status :conflict, :red
             raise Error, "Another migration is already named #{migration_file_name}: " +
-                         "#{existing_migration}. Use --force to replace this migration file."
+                         "#{existing_migration}. Use --force to replace this migration" +
+                         " or --skip to ignore conflicted file."
           end
         end
 
-- 
cgit v1.2.3


From ee35b79d4cff24b960be54c3f5c4f46627c069fe Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 18 Jul 2014 14:27:08 +0800
Subject: Prefer to pass block when logging.

The Logger by default includes a guard which checks for the
logging level. By removing the custom logging guards, we can decouple
the logging guard from the logging action to be done.

This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
---
 railties/lib/rails/rack/logger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 3b35798679..9962e6d943 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -34,7 +34,7 @@ module Rails
 
         instrumenter = ActiveSupport::Notifications.instrumenter
         instrumenter.start 'request.action_dispatch', request: request
-        logger.info started_request_message(request)
+        logger.info { started_request_message(request) }
         resp = @app.call(env)
         resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
         resp
-- 
cgit v1.2.3


From cc1ad787af462e03be5ff1805c3d176569cc1e2f Mon Sep 17 00:00:00 2001
From: Jim Jones <jjones@aantix.com>
Date: Fri, 18 Jul 2014 08:51:36 -0700
Subject: Modified migration conflict message to remove the string
 concatenation.

---
 railties/lib/rails/generators/actions/create_migration.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index b4701b9591..71779b0a9c 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -54,9 +54,9 @@ module Rails
             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" +
-                         " or --skip to ignore conflicted file."
+            raise Error, "Another migration is already named #{migration_file_name}: " \
+              "#{existing_migration}. Use --force to replace this migration " \
+              "or --skip to ignore conflicted file."
           end
         end
 
-- 
cgit v1.2.3


From 558f8aa2ee80ee8cb859f0da9714dc93294c856b Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Wed, 23 Jul 2014 19:24:16 +0200
Subject: Set Psych as the YAML engine for Rubinius

Since the rubysl-yaml gem doesn't ship with Psych by default because of
its dependency on libyaml, on Rubinius, the default engine is Syck.

However, if we want to be able to run the application safely on
different rubies, we need to make people using Rubinius rely on Psych.

See http://git.io/uuLVag for further information.
---
 railties/lib/rails/generators/app_base.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 20e512a7ff..c93ed10d6a 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -114,6 +114,7 @@ module Rails
          jbuilder_gemfile_entry,
          sdoc_gemfile_entry,
          spring_gemfile_entry,
+         psych_gemfile_entry,
          @extra_entries].flatten.find_all(&@gem_filter)
       end
 
@@ -313,6 +314,14 @@ module Rails
         GemfileEntry.new('spring', nil, comment, group: :development)
       end
 
+      def psych_gemfile_entry
+        return [] unless defined?(Rubinius)
+
+        comment = 'Use Psych as the YAML engine, instead of Syck, so serialized ' \
+                  'data can be read safely from different rubies (see http://git.io/uuLVag)'
+        GemfileEntry.new('psych', '~> 2.0', comment, platforms: :rbx)
+      end
+
       def bundle_command(command)
         say_status :run, "bundle #{command}"
 
-- 
cgit v1.2.3


From ecef1776a0451c32784892d13ba56286c9933b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 23 Jul 2014 18:05:18 -0300
Subject: Dev and edge application and plugins need to include i18n master

---
 railties/lib/rails/generators/app_base.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index c93ed10d6a..998d3deb07 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -206,10 +206,11 @@ module Rails
           [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
            GemfileEntry.github('arel', 'rails/arel'),
            GemfileEntry.github('rack', 'rack/rack')]
+           GemfileEntry.github('i18n', 'svenfuchs/i18n')]
         elsif options.edge?
           [GemfileEntry.github('rails', 'rails/rails'),
            GemfileEntry.github('arel', 'rails/arel'),
-           GemfileEntry.github('rack', 'rack/rack')]
+           GemfileEntry.github('i18n', 'svenfuchs/i18n')]
         else
           [GemfileEntry.version('rails',
                             Rails::VERSION::STRING,
-- 
cgit v1.2.3


From 23cb26cfac0725ab979d026f52bf8f03d2a01309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 23 Jul 2014 18:30:27 -0300
Subject: Fix syntax error

---
 railties/lib/rails/generators/app_base.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 998d3deb07..7f5a916c5d 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -205,11 +205,12 @@ module Rails
         if options.dev?
           [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
            GemfileEntry.github('arel', 'rails/arel'),
-           GemfileEntry.github('rack', 'rack/rack')]
+           GemfileEntry.github('rack', 'rack/rack'),
            GemfileEntry.github('i18n', 'svenfuchs/i18n')]
         elsif options.edge?
           [GemfileEntry.github('rails', 'rails/rails'),
            GemfileEntry.github('arel', 'rails/arel'),
+           GemfileEntry.github('rack', 'rack/rack'),
            GemfileEntry.github('i18n', 'svenfuchs/i18n')]
         else
           [GemfileEntry.version('rails',
-- 
cgit v1.2.3


From 2a7fcc8c9b2e7062fb6a726e0290561a4368b446 Mon Sep 17 00:00:00 2001
From: noinkling <malkey@server.fake>
Date: Fri, 25 Jul 2014 15:55:55 +1200
Subject: Add password:digest information to scaffold generator help text [ci
 skip]

---
 railties/lib/rails/generators/rails/scaffold/USAGE | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE
index 4a3eb2c7c7..144267cd52 100644
--- a/railties/lib/rails/generators/rails/scaffold/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold/USAGE
@@ -9,11 +9,15 @@ Description:
 
     Attributes are field arguments specifying the model's attributes. You can
     optionally pass the type and an index to each field. For instance:
-    "title body:text tracking_id:integer:uniq" will generate a title field of
+    'title body:text tracking_id:integer:uniq' will generate a title field of
     string type, a body with text type and a tracking_id as an integer with an
     unique index. "index" could also be given instead of "uniq" if one desires
     a non unique index.
 
+    As a special case, passing 'password:digest' will generate a password_digest
+    field and configure your generated model, controller, views, and test suite
+    for use with ActiveModel has_secure_password.
+
     Timestamps are added by default, so you don't have to specify them by hand
     as 'created_at:datetime updated_at:datetime'.
 
-- 
cgit v1.2.3


From 31d37826b3f5f2ce2643d5d311e5f82b4995bbe9 Mon Sep 17 00:00:00 2001
From: noinkling <noinkling@users.noreply.github.com>
Date: Fri, 25 Jul 2014 17:59:53 +1200
Subject: Additional clarification on password:digest in scaffold and model
 generator help [ci skip]

---
 railties/lib/rails/generators/rails/model/USAGE    | 12 +++++++++++-
 railties/lib/rails/generators/rails/scaffold/USAGE |  8 +++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE
index 833b7beb7f..2a6b8700e3 100644
--- a/railties/lib/rails/generators/rails/model/USAGE
+++ b/railties/lib/rails/generators/rails/model/USAGE
@@ -6,6 +6,11 @@ Description:
     model's attributes. Timestamps are added by default, so you don't have to
     specify them by hand as 'created_at:datetime updated_at:datetime'.
 
+    As a special case, specifying 'password:digest' will generate a
+    password_digest field of string type, and configure your generated model and
+    tests for use with ActiveModel has_secure_password (assuming the default ORM
+    and test framework are being used).
+
     You don't have to think up every attribute up front, but it helps to
     sketch out a few so you can start working with the model immediately.
 
@@ -27,7 +32,8 @@ Available field types:
         `rails generate model post title:string body:text`
 
     will generate a title column with a varchar type and a body column with a text
-    type. You can use the following types:
+    type. If no type is specified the string type will be used by default.
+    You can use the following types:
 
         integer
         primary_key
@@ -73,6 +79,10 @@ Available field types:
         `rails generate model user username:string{30}:uniq`
         `rails generate model product supplier:references{polymorphic}:index`
 
+    If you require a `password_digest` string column for use with
+    has_secure_password, you should specify `password:digest`:
+
+        `rails generate model user password:digest`
 
 Examples:
     `rails generate model account`
diff --git a/railties/lib/rails/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE
index 144267cd52..1b2a944103 100644
--- a/railties/lib/rails/generators/rails/scaffold/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold/USAGE
@@ -14,9 +14,10 @@ Description:
     unique index. "index" could also be given instead of "uniq" if one desires
     a non unique index.
 
-    As a special case, passing 'password:digest' will generate a password_digest
-    field and configure your generated model, controller, views, and test suite
-    for use with ActiveModel has_secure_password.
+    As a special case, specifying 'password:digest' will generate a
+    password_digest field of string type, and configure your generated model,
+    controller, views, and test suite for use with ActiveModel
+    has_secure_password (assuming they are using Rails defaults).
 
     Timestamps are added by default, so you don't have to specify them by hand
     as 'created_at:datetime updated_at:datetime'.
@@ -37,3 +38,4 @@ Examples:
     `rails generate scaffold post`
     `rails generate scaffold post title body:text published:boolean`
     `rails generate scaffold purchase amount:decimal tracking_id:integer:uniq`
+    `rails generate scaffold user email:uniq password:digest`
-- 
cgit v1.2.3


From ed29c0a96b266f1c45511c55507308d6116799d5 Mon Sep 17 00:00:00 2001
From: noinkling <noinkling@users.noreply.github.com>
Date: Tue, 29 Jul 2014 16:16:31 +1200
Subject: Give password_confirmation div the "field" class in erb form template

---
 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
index da99e74435..bba9141fb8 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -17,7 +17,7 @@
     <%%= f.label :password %><br>
     <%%= f.password_field :password %>
   </div>
-  <div>
+  <div class="field">
     <%%= f.label :password_confirmation %><br>
     <%%= f.password_field :password_confirmation %>
 <% else -%>
-- 
cgit v1.2.3


From 2bbcca004cc232cef868cd0e301f274ce5638df0 Mon Sep 17 00:00:00 2001
From: "@schneems and @sgrif" <sean@thoughtbot.com>
Date: Thu, 19 Jun 2014 17:26:29 -0500
Subject: Deprecate `*_path` methods in mailers

Email does not support relative links since there is no implicit host. Therefore all links inside of emails must be fully qualified URLs. All path helpers are now deprecated. When removed, the error will give early indication to developers to use `*_url` methods instead.

Currently if a developer uses a `*_path` helper, their tests and `mail_view` will not catch the mistake. The only way to see the error is by sending emails in production. Preventing sending out emails with non-working path's is the desired end goal of this PR.

Currently path helpers are mixed-in to controllers (the ActionMailer::Base acts as a controller). All `*_url` and `*_path` helpers are made available through the same module. This PR separates this behavior into two modules so we can extend the `*_path` methods to add a Deprecation to them. Once deprecated we can use this same area to raise a NoMethodError and add an informative message directing the developer to use `*_url` instead.

The module with warnings is only mixed in when a controller returns false from the newly added `supports_relative_path?`.

Paired @sgrif & @schneems
---
 railties/lib/rails/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index b36ab3d0d5..aa4f94ef1b 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -395,7 +395,7 @@ module Rails
             end
 
             unless mod.respond_to?(:railtie_routes_url_helpers)
-              define_method(:railtie_routes_url_helpers) { railtie.routes.url_helpers }
+              define_method(:railtie_routes_url_helpers) {|include_path_helpers = true| railtie.routes.url_helpers(include_path_helpers) }
             end
           end
         end
-- 
cgit v1.2.3


From 097b2101897af447591d00fb2809d91894572b87 Mon Sep 17 00:00:00 2001
From: Stefan Kanev <stefan.kanev@gmail.com>
Date: Thu, 31 Jul 2014 12:05:07 +0200
Subject: Add an after_bundle callback in Rails templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The template runs before the generation of binstubs – this does not
allow to write one, that makes an initial commit to version control.
It is solvable by adding an after_bundle callback.
---
 railties/lib/rails/generators/actions.rb                 | 11 +++++++++++
 railties/lib/rails/generators/rails/app/app_generator.rb |  6 ++++++
 2 files changed, 17 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index a239874df0..4709914947 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -7,6 +7,7 @@ module Rails
       def initialize(*) # :nodoc:
         super
         @in_group = nil
+        @after_bundle_callbacks = []
       end
 
       # Adds an entry into +Gemfile+ for the supplied gem.
@@ -232,6 +233,16 @@ module Rails
         log File.read(find_in_source_paths(path))
       end
 
+      # Registers a callback to be executed after bundle and spring binstubs
+      # have run.
+      #
+      #   after_bundle do
+      #     git add: '.'
+      #   end
+      def after_bundle(&block)
+        @after_bundle_callbacks << block
+      end
+
       protected
 
         # Define log for backwards compatibility. If just one argument is sent,
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 188e62b6c8..9110c129d1 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -259,6 +259,12 @@ module Rails
       public_task :apply_rails_template, :run_bundle
       public_task :generate_spring_binstubs
 
+      def run_after_bundle_callbacks
+        @after_bundle_callbacks.each do |callback|
+          callback.call
+        end
+      end
+
     protected
 
       def self.banner
-- 
cgit v1.2.3


From a34b6649d061977026db7124d834faccdf5bd8ef Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 3 Aug 2014 14:50:50 -0700
Subject: Generating stubs for helper tests is overly specific. Most helpers
 should simply be tested as part of the view thats using them. If you need
 something beyond that, you can add a test yourself for them

---
 .../lib/rails/generators/rails/helper/helper_generator.rb   |  2 --
 .../rails/generators/test_unit/helper/helper_generator.rb   | 13 -------------
 .../generators/test_unit/helper/templates/helper_test.rb    |  6 ------
 3 files changed, 21 deletions(-)
 delete mode 100644 railties/lib/rails/generators/test_unit/helper/helper_generator.rb
 delete mode 100644 railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/helper/helper_generator.rb b/railties/lib/rails/generators/rails/helper/helper_generator.rb
index 5ff38e4111..419607839a 100644
--- a/railties/lib/rails/generators/rails/helper/helper_generator.rb
+++ b/railties/lib/rails/generators/rails/helper/helper_generator.rb
@@ -6,8 +6,6 @@ module Rails
       def create_helper_files
         template 'helper.rb', File.join('app/helpers', class_path, "#{file_name}_helper.rb")
       end
-
-      hook_for :test_framework
     end
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
deleted file mode 100644
index 0db76f9eaf..0000000000
--- a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'rails/generators/test_unit'
-
-module TestUnit # :nodoc:
-  module Generators # :nodoc:
-    class HelperGenerator < Base # :nodoc:
-      check_class_collision suffix: "HelperTest"
-
-      def create_helper_files
-        template 'helper_test.rb', File.join('test/helpers', class_path, "#{file_name}_helper_test.rb")
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb b/railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb
deleted file mode 100644
index 7d37bda0f9..0000000000
--- a/railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'test_helper'
-
-<% module_namespacing do -%>
-class <%= class_name %>HelperTest < ActionView::TestCase
-end
-<% end -%>
-- 
cgit v1.2.3


From 58ce115fa563a0ce752041a0320c1c0de44f65da Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 3 Aug 2014 14:57:43 -0700
Subject: Change the production log level default from :info to :debug. All
 production apps I have ever worked with has done this. Let us reflect that
 default. You often want those SQL quieries to be able to debug issues in
 production

---
 .../rails/app/templates/config/environments/production.rb.tt          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

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 5e52f97249..6bd8091fd4 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
@@ -43,8 +43,8 @@ Rails.application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
+  # Set to :info to see decrease the log volume.
+  config.log_level = :debug
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
-- 
cgit v1.2.3


From e5632f37f797fd3cc6e2f793d7c73e97a55a8d73 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 3 Aug 2014 15:12:27 -0700
Subject: A few more tests asserting the presence of helper test stubs

---
 railties/lib/rails/generators/rails/controller/USAGE | 1 -
 railties/lib/rails/generators/rails/helper/USAGE     | 4 ----
 2 files changed, 5 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/controller/USAGE b/railties/lib/rails/generators/rails/controller/USAGE
index de33900e0a..64239ad599 100644
--- a/railties/lib/rails/generators/rails/controller/USAGE
+++ b/railties/lib/rails/generators/rails/controller/USAGE
@@ -16,4 +16,3 @@ Example:
         Test:       test/controllers/credit_cards_controller_test.rb
         Views:      app/views/credit_cards/debit.html.erb [...]
         Helper:     app/helpers/credit_cards_helper.rb
-        Test:       test/helpers/credit_cards_helper_test.rb
diff --git a/railties/lib/rails/generators/rails/helper/USAGE b/railties/lib/rails/generators/rails/helper/USAGE
index 30e323a858..8855ef3b01 100644
--- a/railties/lib/rails/generators/rails/helper/USAGE
+++ b/railties/lib/rails/generators/rails/helper/USAGE
@@ -5,13 +5,9 @@ Description:
     To create a helper within a module, specify the helper name as a
     path like 'parent_module/helper_name'.
 
-    This generates a helper class in app/helpers and invokes the configured
-    test framework.
-
 Example:
     `rails generate helper CreditCard`
 
     Credit card helper.
         Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/helpers/credit_card_helper_test.rb
 
-- 
cgit v1.2.3


From 611849772dd66c2e4d005dcfe153f7ce79a8a7db Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 3 Aug 2014 15:48:14 -0700
Subject: Pull in the custom configuration concept from
 dhh/custom_configuration

---
 railties/lib/rails/application/configuration.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 5e8f4de847..782bc4b0f1 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -13,7 +13,7 @@ module Rails
                     :railties_order, :relative_url_root, :secret_key_base, :secret_token,
                     :serve_static_assets, :ssl_options, :static_cache_control, :session_options,
                     :time_zone, :reload_classes_only_on_change,
-                    :beginning_of_week, :filter_redirect
+                    :beginning_of_week, :filter_redirect, :x
 
       attr_writer :log_level
       attr_reader :encoding
@@ -48,6 +48,7 @@ module Rails
         @eager_load                    = nil
         @secret_token                  = nil
         @secret_key_base               = nil
+        @x                             = Custom.new
 
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled                  = true
@@ -154,6 +155,17 @@ module Rails
       def annotations
         SourceAnnotationExtractor::Annotation
       end
+      
+      private
+        class Custom
+          def initialize
+            @configurations = Hash.new
+          end
+    
+          def method_missing(method, *args)
+            @configurations[method] ||= ActiveSupport::OrderedOptions.new
+          end
+        end
     end
   end
 end
-- 
cgit v1.2.3


From 5132f8383c322963ab03dd44854c7cd8d5d3f70f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 3 Aug 2014 15:55:22 -0700
Subject: Add suggestion as to how you can app the the assets load path

---
 .../generators/rails/app/templates/config/initializers/assets.rb.tt    | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index d2f4ec33a6..01ef3e6630 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -3,6 +3,9 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
-- 
cgit v1.2.3


From 3d70f0740b26b0a137d7e6436f9909330f8ee888 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 3 Aug 2014 16:02:32 -0700
Subject: Explain why we use asset digests, not what a setter does

---
 .../rails/app/templates/config/environments/development.rb.tt          | 3 ++-
 .../rails/app/templates/config/environments/production.rb.tt           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

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 bbb409616d..35e3035a0b 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
@@ -30,7 +30,8 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Generate digests for assets URLs.
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets, 
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
   # Adds additional error checking when serving assets at runtime.
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 6bd8091fd4..48d1b06674 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
@@ -30,7 +30,8 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs.
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets, 
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-- 
cgit v1.2.3


From 9794e74977a99daa56b7beb6fc0621356ddd7a81 Mon Sep 17 00:00:00 2001
From: Jon Atack <jon@atack.com>
Date: Mon, 4 Aug 2014 19:19:26 +0200
Subject: Fix typo [ci skip]

---
 .../generators/rails/app/templates/config/environments/production.rb.tt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

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 48d1b06674..277fe01e89 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
@@ -44,7 +44,7 @@ Rails.application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :info to see decrease the log volume.
+  # Set to :info to decrease the log volume.
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-- 
cgit v1.2.3


From e5e4d08450642c77c5e4f8051d478663c57d97a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Tue, 5 Aug 2014 13:59:41 +0200
Subject: Bring back the helpers tests

Also keep the hook as other tools may rely on it,
we just don't do anything by default on Rails.
---
 railties/lib/rails/generators/rails/helper/helper_generator.rb   | 2 ++
 .../lib/rails/generators/test_unit/helper/helper_generator.rb    | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 railties/lib/rails/generators/test_unit/helper/helper_generator.rb

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/helper/helper_generator.rb b/railties/lib/rails/generators/rails/helper/helper_generator.rb
index 419607839a..5ff38e4111 100644
--- a/railties/lib/rails/generators/rails/helper/helper_generator.rb
+++ b/railties/lib/rails/generators/rails/helper/helper_generator.rb
@@ -6,6 +6,8 @@ module Rails
       def create_helper_files
         template 'helper.rb', File.join('app/helpers', class_path, "#{file_name}_helper.rb")
       end
+
+      hook_for :test_framework
     end
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
new file mode 100644
index 0000000000..bde4e88915
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
@@ -0,0 +1,9 @@
+require 'rails/generators/test_unit'
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class HelperGenerator < Base # :nodoc:
+      # Rails does not generate anything here.
+    end
+  end
+end
-- 
cgit v1.2.3


From d25fe31c40928712b5e08fe0afb567c3bc88eddf Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 6 Aug 2014 18:27:16 -0700
Subject: lazily instantiate application subclasses

this means we can meaningfully override methods in the subclass
---
 railties/lib/rails/application.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c5fd08e743..292986b475 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -87,7 +87,7 @@ module Rails
     class << self
       def inherited(base)
         super
-        base.instance
+        Rails.app_class = base
       end
 
       # Makes the +new+ method public.
@@ -117,8 +117,6 @@ module Rails
       @railties          = nil
       @message_verifiers = {}
 
-      Rails.application ||= self
-
       add_lib_to_load_path!
       ActiveSupport.run_load_hooks(:before_configuration, self)
 
-- 
cgit v1.2.3


From 22969898262b8c92bea1ac93b668a817c7511158 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 7 Aug 2014 15:28:31 -0700
Subject: defer running after_config hooks until after the object is allocated

---
 railties/lib/rails/application.rb | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 292986b475..796c068a10 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -90,6 +90,10 @@ module Rails
         Rails.app_class = base
       end
 
+      def instance
+        super.run_load_hooks!
+      end
+
       # Makes the +new+ method public.
       #
       # Note that Rails::Application inherits from Rails::Engine, which
@@ -116,22 +120,33 @@ module Rails
       @ordered_railties  = nil
       @railties          = nil
       @message_verifiers = {}
+      @ran_load_hooks    = false
+
+      # are these actually used?
+      @initial_variable_values = initial_variable_values
+      @block = block
 
       add_lib_to_load_path!
+    end
+
+    # Returns true if the application is initialized.
+    def initialized?
+      @initialized
+    end
+
+    def run_load_hooks! # :nodoc:
+      return self if @ran_load_hooks
+      @ran_load_hooks = true
       ActiveSupport.run_load_hooks(:before_configuration, self)
 
-      initial_variable_values.each do |variable_name, value|
+      @initial_variable_values.each do |variable_name, value|
         if INITIAL_VARIABLES.include?(variable_name)
           instance_variable_set("@#{variable_name}", value)
         end
       end
 
-      instance_eval(&block) if block_given?
-    end
-
-    # Returns true if the application is initialized.
-    def initialized?
-      @initialized
+      instance_eval(&@block) if @block
+      self
     end
 
     # Implements call according to the Rack API. It simply
-- 
cgit v1.2.3


From 8121eefc222fbd8979ab70d89725a2e330f5a9b2 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 7 Aug 2014 15:50:46 -0700
Subject: add a new constructor that runs load hooks

---
 railties/lib/rails/application.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 796c068a10..61639be7c6 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -94,6 +94,10 @@ module Rails
         super.run_load_hooks!
       end
 
+      def create(initial_variable_values = {}, &block)
+        new(initial_variable_values, &block).run_load_hooks!
+      end
+
       # Makes the +new+ method public.
       #
       # Note that Rails::Application inherits from Rails::Engine, which
-- 
cgit v1.2.3


From cc1de71bfaced172fe00a66fd381da69d9528e8b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 7 Aug 2014 16:10:14 -0700
Subject: Stop using padding in the generated Gemfile -- it looks shit

---
 railties/lib/rails/generators/app_base.rb                 | 4 ----
 railties/lib/rails/generators/rails/app/templates/Gemfile | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 7f5a916c5d..c0fcf7d3b4 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -195,10 +195,6 @@ module Rails
         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
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 5bdbd58097..826fb86058 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
 <% gemfile_entries.each do |gem| -%>
 <% if gem.comment -%>
 
@@ -8,7 +7,7 @@ source 'https://rubygems.org'
 <% end -%>
 <%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
 <% if gem.options.any? -%>
-,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
+, <%= gem.options.map { |k,v|
   "#{k}: #{v.inspect}" }.join(', ') %>
 <% end -%>
 <% end -%>
-- 
cgit v1.2.3


From fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 7 Aug 2014 16:34:27 -0700
Subject: Pull spring gem entry into the Gemfile template instead of
 gemfile_entries so it can be grouped with the other development tools

---
 railties/lib/rails/generators/app_base.rb                 |  7 -------
 railties/lib/rails/generators/rails/app/templates/Gemfile | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index c0fcf7d3b4..caaaae09e6 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -113,7 +113,6 @@ module Rails
          javascript_gemfile_entry,
          jbuilder_gemfile_entry,
          sdoc_gemfile_entry,
-         spring_gemfile_entry,
          psych_gemfile_entry,
          @extra_entries].flatten.find_all(&@gem_filter)
       end
@@ -306,12 +305,6 @@ module Rails
         end
       end
 
-      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/rails/spring'
-        GemfileEntry.new('spring', nil, comment, group: :development)
-      end
-
       def psych_gemfile_entry
         return [] unless defined?(Rubinius)
 
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 826fb86058..d97be95e27 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -21,14 +21,23 @@ source 'https://rubygems.org'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
+group :development, :test do
 <% unless defined?(JRUBY_VERSION) -%>
-# To use a debugger
+  # Call 'debugger' anywhere in the code to stop execution and get a debugger console
   <%- if RUBY_VERSION < '2.0.0' -%>
-# gem 'debugger', group: [:development, :test]
+  gem 'debugger'
   <%- else -%>
-# gem 'byebug', group: [:development, :test]
+  gem 'byebug'
   <%- end -%>
+  
+  # Access an IRB console on exceptions page and /console in development
+  gem 'web-console'
+<%- if spring_install? %>
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
 <% end -%>
+<% end -%>
+end
 
 <% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%>
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-- 
cgit v1.2.3


From 301b5fd52265298e1fe16a7914bc656c808d931e Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 8 Aug 2014 13:28:06 +0200
Subject: Fixes test for Gemfile entry changes

Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c
---
 railties/lib/rails/generators/rails/app/templates/Gemfile    | 2 +-
 railties/lib/rails/generators/rails/plugin/templates/Gemfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index d97be95e27..8b51fda359 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -29,7 +29,7 @@ group :development, :test do
   <%- else -%>
   gem 'byebug'
   <%- end -%>
-  
+
   # Access an IRB console on exceptions page and /console in development
   gem 'web-console'
 <%- if spring_install? %>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/Gemfile b/railties/lib/rails/generators/rails/plugin/templates/Gemfile
index 796587f316..35ad9fbf9e 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin/templates/Gemfile
@@ -31,7 +31,7 @@ end
 <% end -%>
 <%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
 <% if gem.options.any? -%>
-,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
+, <%= gem.options.map { |k,v|
   "#{k}: #{v.inspect}" }.join(', ') %>
 <% end -%>
 <% end -%>
-- 
cgit v1.2.3


From dde91e9bf5ab246f0f684b40288b272f4ba9a699 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 8 Aug 2014 11:41:54 -0700
Subject: save a hash allocation per request.

---
 railties/lib/rails/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index aa4f94ef1b..dc3da1eb41 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -509,7 +509,7 @@ module Rails
     def call(env)
       env.merge!(env_config)
       if env['SCRIPT_NAME']
-        env.merge! "ROUTES_#{routes.object_id}_SCRIPT_NAME" => env['SCRIPT_NAME'].dup
+        env["ROUTES_#{routes.object_id}_SCRIPT_NAME"] = env['SCRIPT_NAME'].dup
       end
       app.call(env)
     end
-- 
cgit v1.2.3


From cfbedd3479d5021b9fb862ecfa49fc6bc8602994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?=
 <lukasz.strzalkowski@gmail.com>
Date: Fri, 8 Aug 2014 21:18:30 +0200
Subject: Add config option for cookies digest

You can now configure custom digest for cookies in the same way as `serializer`:

config.action_dispatch.cookies_digest = \SHA256'
---
 railties/lib/rails/application.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 61639be7c6..d4a6bc3042 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -257,6 +257,7 @@ module Rails
           "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.cookies_serializer" => config.action_dispatch.cookies_serializer
+          "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest
         })
       end
     end
-- 
cgit v1.2.3


From 629f4e007c1e80b931ed3d3a2553ad26997d8345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?=
 <lukasz.strzalkowski@gmail.com>
Date: Fri, 8 Aug 2014 21:24:02 +0200
Subject: Return preconfigured AS::MessageVerifier

---
 railties/lib/rails/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index d4a6bc3042..16bea413b5 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -200,7 +200,7 @@ module Rails
     def message_verifier(verifier_name)
       @message_verifiers[verifier_name] ||= begin
         secret = key_generator.generate_key(verifier_name.to_s)
-        ActiveSupport::MessageVerifier.new(secret)
+        ActiveSupport::MessageVerifier.new(secret, digest: config.action_dispatch.cookies_digest, serializer: config.action_dispatch.cookies_serializer)
       end
     end
 
-- 
cgit v1.2.3


From d70ba48c4dd6b57d8f38612ea95a3842337c1419 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 8 Aug 2014 18:20:17 -0300
Subject: Revert "Merge pull request #16434 from
 strzalek/cookies-digest-config-option"

This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing
changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699.

IT BROKE THE BUILD!!!
---
 railties/lib/rails/application.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 16bea413b5..61639be7c6 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -200,7 +200,7 @@ module Rails
     def message_verifier(verifier_name)
       @message_verifiers[verifier_name] ||= begin
         secret = key_generator.generate_key(verifier_name.to_s)
-        ActiveSupport::MessageVerifier.new(secret, digest: config.action_dispatch.cookies_digest, serializer: config.action_dispatch.cookies_serializer)
+        ActiveSupport::MessageVerifier.new(secret)
       end
     end
 
@@ -257,7 +257,6 @@ module Rails
           "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.cookies_serializer" => config.action_dispatch.cookies_serializer
-          "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest
         })
       end
     end
-- 
cgit v1.2.3