From 7d40aa4ddbf521d5e3bed9e63dc5a7f6fb45fe2b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 6 Jun 2013 23:16:04 +0200
Subject: registers recent patch in the railties CHANGELOG

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index d11b0b7e85..23a7cf6ca3 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Clearing autoloaded constants triggers routes reloading [Fixes #10685].
+
+    *Xavier Noria*
+
 *   Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
     Fixes #9525.
 
-- 
cgit v1.2.3


From f0e4254bfa1443c3d51af117b925a02b88076f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C4=B1tk=C4=B1=20Ba=C4=9Fdat?= <sbagdat@gmail.com>
Date: Mon, 17 Jun 2013 03:22:31 +0300
Subject: Use Colspan in th Tags

Is it more suitable that using ```<th colspan="3">``` instead of three empty ```<th>```? It is simple, but what i am missing about it?

Change repetitive th tags to use colspan attribute

Update CHANGELOG.md

Update CHANGELOG.md
---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 23a7cf6ca3..ae4bfc2447 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -12,5 +12,9 @@
     moved to class methods in Railtie and the Railtie has been made abstract.
 
     *John Wang*
+    
+*   Changes repetitive th tags to use colspan attribute in `index.html.erb` template.
+    
+    *Sıtkı Bağdat*
 
 Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes.
-- 
cgit v1.2.3


From 3e5dbda5bbcd0fdaa91b63fcfd22076c41b6a6db Mon Sep 17 00:00:00 2001
From: wangjohn <wangjohn@mit.edu>
Date: Wed, 26 Jun 2013 09:09:57 -0700
Subject: Removing deprecated rake tasks.

The `rake test:recent` and `rake test:uncommitted` tasks were
deprecated and are now being removed.
---
 railties/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index ae4bfc2447..11927e7132 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Removed deprecated rake tasks. You will no longer be able to use the following
+    commands: `rake test:uncommitted` and `rake test:recent`. Also removed are
+    the tests for these rake tasks.
+
+    *John Wang*
+
 *   Clearing autoloaded constants triggers routes reloading [Fixes #10685].
 
     *Xavier Noria*
-- 
cgit v1.2.3


From f5df6e5a6d5e6253708ea8cdb27ad675afea056c Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Wed, 26 Jun 2013 20:07:26 -0300
Subject: Review railties changelog [ci skip]

---
 railties/CHANGELOG.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 11927e7132..00ef1ad058 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,6 +1,5 @@
-*   Removed deprecated rake tasks. You will no longer be able to use the following
-    commands: `rake test:uncommitted` and `rake test:recent`. Also removed are
-    the tests for these rake tasks.
+*   Removed deprecated rake tasks for running tests: `rake test:uncommitted` and
+    `rake test:recent`.
 
     *John Wang*
 
@@ -18,9 +17,9 @@
     moved to class methods in Railtie and the Railtie has been made abstract.
 
     *John Wang*
-    
+
 *   Changes repetitive th tags to use colspan attribute in `index.html.erb` template.
-    
+
     *Sıtkı Bağdat*
 
 Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes.
-- 
cgit v1.2.3


From e68183cccbfbefab66c2e74855f5b30525f8e902 Mon Sep 17 00:00:00 2001
From: Nikita Fedyashev <nfedyashev@gmail.com>
Date: Fri, 28 Jun 2013 17:11:50 +0600
Subject: Omit turbolinks configuration completely on skip_javascript generator
 option

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 00ef1ad058..eb0545ccbf 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Omit turbolinks configuration completely on skip_javascript generator option.
+
+    *Nikita Fedyashev*
+
 *   Removed deprecated rake tasks for running tests: `rake test:uncommitted` and
     `rake test:recent`.
 
-- 
cgit v1.2.3


From 6ce18ba7dcce09401a3b80542a3f12b89e40ac98 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Sat, 29 Jun 2013 12:54:23 +0300
Subject: Fix `rails plugin --help`

Right now if you run the `rails plugin --help` command it fails because rails expects a command in `railties/lib/rails/commands/plugin.rb` that does not exist because the file is named `plugin_new`. This is the error:

```
ruby-2.0.0-p0  ~/documents/projects/tmp/vanilla (master)
$ rails plugin --help
/Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require': cannot load such file -- rails/commands/plugin (LoadError)
	from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `block in require'
	from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:213:in `load_dependency'
	from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require'
	from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/railties-4.0.0/lib/rails/commands.rb:49:in `<top (required)>'
	from bin/rails:4:in `require'
	from bin/rails:4:in `<main>'
```
---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index eb0545ccbf..639dd70152 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix `rails plugin --help` command.
+
+    *Richard Schneeman*
+
 *   Omit turbolinks configuration completely on skip_javascript generator option.
 
     *Nikita Fedyashev*
-- 
cgit v1.2.3


From ec8d8652f36bc4bf2ea19b8f7dd264187efc99ae Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Mon, 1 Jul 2013 00:02:19 +0300
Subject: s/plugin_new/plugin

There are historical reasons that the `plugin` command was `plugin_new`, now those are no longer applicable, we should remove the naming edge case from the project. This PR is based off of comments from #11176

ATP Railties
---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 639dd70152..a7132d0a9a 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Rename `commands/plugin_new.rb` to `commands/plugin.rb` and fix references
+
+    *Richard Schneeman*
+
 *   Fix `rails plugin --help` command.
 
     *Richard Schneeman*
-- 
cgit v1.2.3


From d50483b04894b7c21b057bca7be7d0e857ae90ac Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Tue, 2 Jul 2013 09:25:08 +0530
Subject: Remove deprecated `config.whiny_nils`

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a7132d0a9a..a3f5796b2c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `config.whiny_nils` option
+
+    *Vipul A M*
+
 *   Rename `commands/plugin_new.rb` to `commands/plugin.rb` and fix references
 
     *Richard Schneeman*
-- 
cgit v1.2.3


From 822d99562777f7d0ab2b79cacaec47690f6271e6 Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Wed, 3 Jul 2013 22:33:57 +0530
Subject: Remove deprecated
 `ActiveRecord::Generators::ActiveModel#update_attributes` in     favor of
 `ActiveRecord::Generators::ActiveModel#update`

---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a3f5796b2c..2fbdf6d12b 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in
+    favor of `ActiveRecord::Generators::ActiveModel#update`
+
+    *Vipul A M*
+
 *   Remove deprecated `config.whiny_nils` option
 
     *Vipul A M*
-- 
cgit v1.2.3


From 7e897d469f29096ff9f893db851e1d4a7cc48482 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 3 Jul 2013 21:58:01 +0200
Subject: Added missing CHANGELOG from PR #11279 [ci skip]

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 2fbdf6d12b..2a0119a3b2 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed deprecated threadsafe! from Rails Config.
+
+    *Paul Nikitochkin*
+
 *   Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in
     favor of `ActiveRecord::Generators::ActiveModel#update`
 
-- 
cgit v1.2.3


From 4a2a504f40a8b6eec88e6aafefcf8e579a24e1c9 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 4 Jul 2013 19:56:23 +0200
Subject: Removed deprecated `Rails.application.railties.engines`.

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 2a0119a3b2..b80aa944e0 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed deprecated `Rails.application.railties.engines`.
+
+    *Arun Agrawal*
+
 *   Removed deprecated threadsafe! from Rails Config.
 
     *Paul Nikitochkin*
-- 
cgit v1.2.3


From dd996ad394057a003ad851ff75e6242d0c5e8fa1 Mon Sep 17 00:00:00 2001
From: Yuri Artemev <i@artemeff.com>
Date: Mon, 8 Jul 2013 19:13:01 +0400
Subject: handle notes in *.sass files

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index b80aa944e0..cc7fecb28a 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix `rake notes` to look into `*.sass` files
+
+    *Yuri Artemev*
+
 *   Removed deprecated `Rails.application.railties.engines`.
 
     *Arun Agrawal*
-- 
cgit v1.2.3


From 9cac69c602f57e397fe01d866cb24ce1781606d4 Mon Sep 17 00:00:00 2001
From: Paul Nikitochkin <paul.nikitochkin@gmail.com>
Date: Tue, 9 Jul 2013 23:36:50 +0300
Subject:  #11381: Ignore config.eager_load=true for rake

Closes #11381
---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index cc7fecb28a..13a3301fbd 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix `rake environment` to do not eager load modules
+
+    *Paul Nikitochkin*
+
 *   Fix `rake notes` to look into `*.sass` files
 
     *Yuri Artemev*
-- 
cgit v1.2.3


From 8e1656e76f048893c552358fe02153b758c854e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= <josef.simanek@gmail.com>
Date: Sat, 13 Jul 2013 14:30:58 +0200
Subject: Remove update:application_controller rake task.

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 13a3301fbd..e4ed59e58c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed `update:application_controller` rake task.
+
+    *Josef Šimánek*
+
 *   Fix `rake environment` to do not eager load modules
 
     *Paul Nikitochkin*
-- 
cgit v1.2.3


From 5ecd125a62da693320da8ea7bbccd60b71f67e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= <josef.simanek@gmail.com>
Date: Sat, 13 Jul 2013 12:49:31 +0200
Subject: Added generated unit test for generator generator and new
 test:generators rake task included in test:all rake task.

---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e4ed59e58c..7e7b157483 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Added generated unit test for generator generator using new
+    `test:generators` rake task.
+
+    *Josef Šimánek*
+
 *   Removed `update:application_controller` rake task.
 
     *Josef Šimánek*
-- 
cgit v1.2.3


From f18aecfe7b70849f2f73da329a6a14260cea6edd Mon Sep 17 00:00:00 2001
From: Pawel Janiak <brand.magnate@gmail.com>
Date: Sun, 28 Jul 2013 15:05:17 +0200
Subject: Changed stylesheet load order in the stylesheet manifest generator.

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 7e7b157483..dd357bfbc5 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -68,4 +68,8 @@
 
     *Sıtkı Bağdat*
 
+*   Changed stylesheet load order in the stylesheet manifest generator. [Fixes #11639]
+
+    *Pawel Janiak*
+
 Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes.
-- 
cgit v1.2.3


From 4cf805a6d98f372148755b36153d4267889aa67f Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Mon, 29 Jul 2013 08:03:41 -0300
Subject: Move changelog entry to the top [ci skip]

---
 railties/CHANGELOG.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index dd357bfbc5..30328a0c19 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Changed stylesheet load order in the stylesheet manifest generator.
+    Fixes #11639.
+
+    *Pawel Janiak*
+
 *   Added generated unit test for generator generator using new
     `test:generators` rake task.
 
@@ -49,7 +54,8 @@
 
     *John Wang*
 
-*   Clearing autoloaded constants triggers routes reloading [Fixes #10685].
+*   Clearing autoloaded constants triggers routes reloading.
+    Fixes #10685.
 
     *Xavier Noria*
 
@@ -68,8 +74,4 @@
 
     *Sıtkı Bağdat*
 
-*   Changed stylesheet load order in the stylesheet manifest generator. [Fixes #11639]
-
-    *Pawel Janiak*
-
 Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes.
-- 
cgit v1.2.3


From 3a7e321246a8d1a4058b4c0ad5205cfc141e0cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 4 Aug 2013 11:38:14 -0300
Subject: Add CHANGELOG entry for #11665

[ci skip]
---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 30328a0c19..1965d09297 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Make `config.log_level` work with custom loggers.
+
+    *Max Shytikov*
+
 *   Changed stylesheet load order in the stylesheet manifest generator.
     Fixes #11639.
 
-- 
cgit v1.2.3


From d86ccec0979ad60c2430a40864e90dc2f14fd2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 5 Aug 2013 18:16:41 -0300
Subject: Use the right instrumentation name

The pattern is event.component

Closes #11769

Conflicts:
	railties/CHANGELOG.md
---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 1965d09297..7a89e5c219 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix the event name of action_dispatch requests.
+
+    *Rafael Mendonça França*
+
 *   Make `config.log_level` work with custom loggers.
 
     *Max Shytikov*
-- 
cgit v1.2.3


From 53c5794a4bb7a1bc8b3cbe9bae86c35de06c5088 Mon Sep 17 00:00:00 2001
From: Prathamesh Sonpatki <csonpatki@gmail.com>
Date: Sun, 21 Jul 2013 20:36:35 +0530
Subject: Generate namespaced routes correctly for generators. Fix for #11532

---
 railties/CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 7a89e5c219..2f41d92f55 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,21 @@
+*   Generate nested route for namespaced controller generated using
+    `rails g controller`.
+    Fixes #11532.
+    
+    Example:
+    
+        rails g controller admin/dashboard index
+        
+        # Before:
+        get "dashboard/index"
+        
+        # After:
+        namespace :admin do
+          get "dashboard/index"
+        end
+    
+    *Prathamesh Sonpatki*
+    
 *   Fix the event name of action_dispatch requests.
 
     *Rafael Mendonça França*
-- 
cgit v1.2.3


From f3073773a31d2a6a4f3946dc706a31400c0f53a0 Mon Sep 17 00:00:00 2001
From: Josh Crowder <josh@seriousfox.co.uk>
Date: Thu, 15 Aug 2013 11:30:01 +0100
Subject: Adding LESS to rake notes

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 2f41d92f55..cc9722e59c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   rake notes now searches *.less files
+
+    *Josh Crowder*
+
 *   Generate nested route for namespaced controller generated using
     `rails g controller`.
     Fixes #11532.
-- 
cgit v1.2.3


From 47ac67b8d4f77e22ce1cae5c7bf836b0d6325d1e Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 7 Sep 2013 22:50:54 +0200
Subject: Don't require using application_name before options

Before this commit options for `rails new` and `rails plugin new` had to
be passed in a strict order, trying to execute a following command:

    rails new -J path/to/app

resulted in an error.

This commit fixes the situation and allows to pass path to app anywhere
after `new`
---
 railties/CHANGELOG.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index cc9722e59c..797cffc884 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Don't require passing path to app before options in `rails new`
+    and `rails plugin new`
+
+    *Piotr Sarnacki*
+
 *   rake notes now searches *.less files
 
     *Josh Crowder*
@@ -5,21 +10,21 @@
 *   Generate nested route for namespaced controller generated using
     `rails g controller`.
     Fixes #11532.
-    
+
     Example:
-    
+
         rails g controller admin/dashboard index
-        
+
         # Before:
         get "dashboard/index"
-        
+
         # After:
         namespace :admin do
           get "dashboard/index"
         end
-    
+
     *Prathamesh Sonpatki*
-    
+
 *   Fix the event name of action_dispatch requests.
 
     *Rafael Mendonça França*
-- 
cgit v1.2.3


From 5f98bb402b657f785e6bf1a49e83d44c6d3aa062 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 18 Jun 2013 15:24:00 -0500
Subject: Only output Server logs in Development

Right now when you start a server via `rails s`, the logger gets extended so that it logs to the file system and also to stdout. This extension behavior is not "intelligent" and if the default logger is already set to output to stdout, then the contents will be received twice.

To capture logs in accordance with http://www.12factor.net/logs some platforms require the logs to be sent to standard out. If a logger is set to stdout, and the server is started using `rails server` instead of another method (i.e. `thin start` etc.) then the app will produce double logs.

This PR fixes the issue by only extending the logger to standard out in the development environment. So that in production you don't get double logs like this:

```
ActionView::Template::Error (wrong number of arguments (5 for 4)):
    1: <% lang_index = 0 %>
    2: <div class="row">
    3:   <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs">
    4:     <% repos.group_by(&:language).each do |lang, repos| %>
    5:       <% unless lang == nil %>
    6:         <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li>
    7:       <% end -%>
  app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000'
  app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880'

ActionView::Template::Error (wrong number of arguments (5 for 4)):
    1: <% lang_index = 0 %>
    2: <div class="row">
    3:   <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs">
    4:     <% repos.group_by(&:language).each do |lang, repos| %>
    5:       <% unless lang == nil %>
    6:         <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li>
    7:       <% end -%>
  app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000'
  app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880'
```

ATP Railties. Opened against master in favor of #10999
---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 797cffc884..fabc981e7a 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   `rails server` will only extend the logger to output to STDOUT
+     in development environment.
+
+    *Richard Schneeman*
+
 *   Don't require passing path to app before options in `rails new`
     and `rails plugin new`
 
-- 
cgit v1.2.3


From b4fd1e338b2c1ec2c501c0e1207a4f774ed6e30a Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Tue, 24 Sep 2013 19:55:09 +0300
Subject: Add a CHANGELOG entry about Web Console inclusion

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index fabc981e7a..a4babbe8c3 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Include `web-console` into newly generated applications' Gemfile.
+
+    *Genadi Samokovarov*
+
 *   `rails server` will only extend the logger to output to STDOUT
      in development environment.
 
-- 
cgit v1.2.3


From 4de8851289077239ecc91473bdba30f8cf6727bb Mon Sep 17 00:00:00 2001
From: Ben Pickles <spideryoung@gmail.com>
Date: Wed, 9 Oct 2013 11:16:22 +0100
Subject: Expose MiddlewareStack#unshift to environment configuration.

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a4babbe8c3..4e6bf899af 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Expose MiddlewareStack#unshift to environment configuration.
+
+    *Ben Pickles*
+
 *   Include `web-console` into newly generated applications' Gemfile.
 
     *Genadi Samokovarov*
-- 
cgit v1.2.3


From 4f642dcb39cea155ddb50978a38fb3a2f2290ea3 Mon Sep 17 00:00:00 2001
From: yalab <rudeboyjet@gmail.com>
Date: Sat, 13 Jul 2013 14:38:00 +0900
Subject: Added --model-name option scaffold_controller_generator.

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 4e6bf899af..8a0e0ff3f6 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Added `--model-name` scaffld\_controller\_generator option.
+
+    *yalab*
+
 *   Expose MiddlewareStack#unshift to environment configuration.
 
     *Ben Pickles*
-- 
cgit v1.2.3


From 790b4011b27b4d4454c1613922887ed944aa6c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 15 Oct 2013 18:04:02 -0300
Subject: Fix typo in the changelog entry

[ci skip]
---
 railties/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8a0e0ff3f6..1d01c8d0e5 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-*   Added `--model-name` scaffld\_controller\_generator option.
+*   Added `--model-name` option to `ScaffoldControllerGenerator`.
 
     *yalab*
 
-- 
cgit v1.2.3


From 52b252614e275da799b6a15cebbfd067c59987d1 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Tue, 22 Oct 2013 13:17:52 +0200
Subject: Make the application name snake cased when it contains spaces

The application name is used to fill the `database.yml` and
`session_store.rb` files ; previously, if the provided name contained
whitespaces, it led to unexpected names in these files.

Since Shellwords.escape adds backslashes to escape spaces, the app_name
should remove them and replace any space with an underscore (just like
periods previously).

Also improve the assert_file helper to work with paths containing spaces
using String#shellescape.
---
 railties/CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 1d01c8d0e5..d12a1f21f8 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,11 @@
+*   Make the application name snake cased when it contains spaces
+
+    The application name is used to fill the `database.yml` and
+    `session_store.rb` files ; previously, if the provided name
+    contained whitespaces, it led to unexpected names in these files.
+
+    *Robin Dupret*
+
 *   Added `--model-name` option to `ScaffoldControllerGenerator`.
 
     *yalab*
-- 
cgit v1.2.3


From 84e261b9309d362a210ed55941f2852ec4230038 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Sun, 27 Oct 2013 10:43:17 +0100
Subject: Removal of javascript related gems when creating an app

Commit 0417bc8 add the coffee-rails and javascript runtime gems even
when passing the --skip-javascript option but this is not the desired
behavior.

Also remove all javascript related stuff in the generated application
such as the vendor/assets/javascripts folder.
---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index d12a1f21f8..8963f6e604 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Removal of all javascript stuff (gems and files) when generating a new
+    application using the `--skip-javascript` option.
+
+    *Robin Dupret*
+
 *   Make the application name snake cased when it contains spaces
 
     The application name is used to fill the `database.yml` and
-- 
cgit v1.2.3


From fae08dd9ca917c09a136d68065a2ea59ae35a6ea Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sun, 3 Nov 2013 22:11:50 +0100
Subject: No web-console for now

---
 railties/CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8963f6e604..aadf24a125 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -19,10 +19,6 @@
 
     *Ben Pickles*
 
-*   Include `web-console` into newly generated applications' Gemfile.
-
-    *Genadi Samokovarov*
-
 *   `rails server` will only extend the logger to output to STDOUT
      in development environment.
 
-- 
cgit v1.2.3


From 84eac5dab8b0fe9ee20b51250e52ad7bfea36553 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Mon, 28 Oct 2013 13:44:17 +0100
Subject: BACKTRACE environment variable to show unfiltered backtraces.

We used to support the `BACKTRACE` environment variable but when
we switched to MiniTest it got removed: f9382cd7948

This commit adds back the functionality to show the unfiltered backtrace when needed.
This also works when you run your tests with `rake`:

* `BACKTRACE=1 bin/rake test`
* `BACKTRACE=1 ruby -Itest ...`
---
 railties/CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index aadf24a125..0606a4fbe7 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,14 @@
+*   `BACKTRACE` environment variable to show unfiltered backtraces for
+    test failures.
+
+    Example:
+
+        `BACKTRACE=1 ruby -Itest ...`
+        # or with rake
+        `BAKCTRACE=1 bin/rake`
+
+    *Yves Senn*
+
 *   Removal of all javascript stuff (gems and files) when generating a new
     application using the `--skip-javascript` option.
 
-- 
cgit v1.2.3


From b5cd187ae4c0fe69116e6e05ffef34d6b50dca29 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Mon, 4 Nov 2013 12:53:18 -0200
Subject: Fix typo in railties changelog

Also improve the example to show as shell command [ci skip]
---
 railties/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0606a4fbe7..0dddee0555 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -3,9 +3,9 @@
 
     Example:
 
-        `BACKTRACE=1 ruby -Itest ...`
+        $ BACKTRACE=1 ruby -Itest ...
         # or with rake
-        `BAKCTRACE=1 bin/rake`
+        $ BACKTRACE=1 bin/rake
 
     *Yves Senn*
 
-- 
cgit v1.2.3


From bc010e7140856bb13dbc1ed60f07b3542a38b220 Mon Sep 17 00:00:00 2001
From: Dmitry Korotkov <codename539@gmail.com>
Date: Mon, 11 Nov 2013 11:17:44 +0400
Subject: Fix missing line and shadow on static error pages [ci skip]

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0dddee0555..673da4e9be 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fixed missing line and shadow on service pages(404, 422, 500).
+
+    *Dmitry Korotkov*
+
 *   `BACKTRACE` environment variable to show unfiltered backtraces for
     test failures.
 
-- 
cgit v1.2.3


From ec3134739c6bf7cf6482feb46155293e2b09c45b Mon Sep 17 00:00:00 2001
From: Mike Pack <mikepackdev@gmail.com>
Date: Tue, 29 Oct 2013 16:58:52 -0600
Subject: Allow Pathnames to be added to eager load paths

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 673da4e9be..bf09066cf1 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Support for Pathnames in eager load paths.
+
+    *Mike Pack*
+
 *   Fixed missing line and shadow on service pages(404, 422, 500).
 
     *Dmitry Korotkov*
-- 
cgit v1.2.3


From 251923c7a85a303d74b41255c39d8928ffa109ea Mon Sep 17 00:00:00 2001
From: Paul Nikitochkin <paul.nikitochkin@gmail.com>
Date: Mon, 11 Nov 2013 19:56:02 +0200
Subject: Instrument each load config initializer

In order to simplify profiling loading of initializers,
added instument for tracking load config initializer event from
`config/initializers`
---
 railties/CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index bf09066cf1..3822486412 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,33 @@
+*   Instrument an `load_config_initializer.railties` event on each load of configuration initializer
+    from `config/initializers`. Subscribers should be attached before `load_config_initializers`
+    initializer completed.
+
+    Registering subscriber examples:
+
+        # config/application.rb
+        module RailsApp
+          class Application < Rails::Application
+            ActiveSupport::Notifications.subscribe('load_config_initializer.railties') do |*args|
+              event = ActiveSupport::Notifications::Event.new(*args)
+              puts "Loaded initializer #{event.payload[:initializer]} (#{event.duration}ms)"
+            end
+          end
+        end
+
+        # my_engine/lib/my_engine/engine.rb
+        module MyEngine
+          class Engine < ::Rails::Engine
+            config.before_initialize do
+              ActiveSupport::Notifications.subscribe('load_config_initializer.railties') do |*args|
+                event = ActiveSupport::Notifications::Event.new(*args)
+                puts "Loaded initializer #{event.payload[:initializer]} (#{event.duration}ms)"
+              end
+            end
+          end
+        end
+
+    *Paul Nikitochkin*
+
 *   Support for Pathnames in eager load paths.
 
     *Mike Pack*
-- 
cgit v1.2.3


From c09ef94a494eb8d0f690a84bc82b2bddcfe13e1b Mon Sep 17 00:00:00 2001
From: Lauro Caetano <laurocaetano1@gmail.com>
Date: Thu, 21 Nov 2013 22:11:26 -0200
Subject: Remove turbolinks when generating a new application based on a
 template that skips it.

It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template.
---
 railties/CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 3822486412..0b252bf745 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,11 @@
+*   Remove turbolinks when generating a new application based on a template that skips it.
+
+    Example
+        Skips turbolinks adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }`
+        to the template.
+
+    *Lauro Caetano*
+
 *   Instrument an `load_config_initializer.railties` event on each load of configuration initializer
     from `config/initializers`. Subscribers should be attached before `load_config_initializers`
     initializer completed.
-- 
cgit v1.2.3


From 18964368f3725e166719b6dc1f4b6546f6ef9e0c Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Fri, 22 Nov 2013 08:30:03 -0200
Subject: Improve changelogs

Also make Action Mailer changelog format more consistent with the
others [ci skip]
---
 railties/CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0b252bf745..21ac596ab9 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,6 +1,7 @@
 *   Remove turbolinks when generating a new application based on a template that skips it.
 
-    Example
+    Example:
+
         Skips turbolinks adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }`
         to the template.
 
-- 
cgit v1.2.3


From 4816fdd385b3187b1eaaa2ec4d0026324d631e45 Mon Sep 17 00:00:00 2001
From: Prathamesh Sonpatki <csonpatki@gmail.com>
Date: Tue, 21 May 2013 21:04:29 +0530
Subject: Use .railsrc while creating new plugin if available

- Fixes #10700
---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 21ac596ab9..6169f3ebee 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Uses .railsrc while creating new plugin if it is available.
+    Fixes #10700.
+
+    *Prathamesh Sonpatki*
+
 *   Remove turbolinks when generating a new application based on a template that skips it.
 
     Example:
-- 
cgit v1.2.3


From df50e3064abc3099adc524f381ffced0dab84869 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 2 Nov 2013 18:25:02 +0000
Subject: Install Spring preloader when generating new applications

---
 railties/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 6169f3ebee..0eda858cca 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   The [Spring application
+    preloader](https://github.com/jonleighton/spring) is now installed
+    by default for new applications. It uses the development group of
+    the Gemfile, so will not be installed in production.
+
+    *Jon Leighton*
+
 *   Uses .railsrc while creating new plugin if it is available.
     Fixes #10700.
 
-- 
cgit v1.2.3


From 69ac53cfec067103427945b3ef137b9ce07294c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 19 Nov 2013 22:34:32 -0200
Subject: Add documentation and CHANGELOG entry to Application#verifier

---
 railties/CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0eda858cca..a42e942f9b 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,15 @@
+*   Add `Application#verifier` method to return a application's message verifier.
+
+    This verifier can be used to generate and verify signed messages in the application.
+
+        message = Rails.application.verifier.generate('my sensible data')
+        Rails.application.verifier.verify(message)
+        # => 'my sensible data'
+
+    See the `ActiveSupport::MessageVerifier` documentation to more information.
+
+    *Rafael Mendonça França*
+
 *   The [Spring application
     preloader](https://github.com/jonleighton/spring) is now installed
     by default for new applications. It uses the development group of
-- 
cgit v1.2.3


From 609c217628acb4e1a01c4c40055d6d3304710bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 21 Nov 2013 23:07:26 -0200
Subject: Rename verifier to message_verifier

---
 railties/CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a42e942f9b..dc753dbeac 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,9 +1,9 @@
-*   Add `Application#verifier` method to return a application's message verifier.
+*   Add `Application#message_verifier` method to return a application's message verifier.
 
     This verifier can be used to generate and verify signed messages in the application.
 
-        message = Rails.application.verifier.generate('my sensible data')
-        Rails.application.verifier.verify(message)
+        message = Rails.application.message_verifier.generate('my sensible data')
+        Rails.application.message_verifier.verify(message)
         # => 'my sensible data'
 
     See the `ActiveSupport::MessageVerifier` documentation to more information.
-- 
cgit v1.2.3


From 2be4916e8ee6f36b090df91d28d0c484983dcb5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 21 Nov 2013 23:42:10 -0200
Subject: Make possibile to get different message verifiers

---
 railties/CHANGELOG.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index dc753dbeac..85db9f62ed 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-*   Add `Application#message_verifier` method to return a application's message verifier.
+*   Add `Application#message_verifier` method to return a message verifier.
 
     This verifier can be used to generate and verify signed messages in the application.
 
@@ -6,6 +6,14 @@
         Rails.application.message_verifier.verify(message)
         # => 'my sensible data'
 
+    It is recommended to not use the same verifier to different things, so you can get different
+    verifiers passing the name argument.
+
+        message = Rails.application.message_verifier('cookies').generate('my sensible cookie data')
+
+    By default all the verifiers will share the same salt, so messages generates by one can be
+    verifier by another one.
+
     See the `ActiveSupport::MessageVerifier` documentation to more information.
 
     *Rafael Mendonça França*
-- 
cgit v1.2.3


From f98bd42854cc00868cd3f17fe164f32be7315d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 22 Nov 2013 00:02:10 -0200
Subject: No need to configure salts

---
 railties/CHANGELOG.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 85db9f62ed..6c3090bc34 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -6,15 +6,12 @@
         Rails.application.message_verifier.verify(message)
         # => 'my sensible data'
 
-    It is recommended to not use the same verifier to different things, so you can get different
+    It is recommended not not use the same verifier for different things, so you can get different
     verifiers passing the name argument.
 
         message = Rails.application.message_verifier('cookies').generate('my sensible cookie data')
 
-    By default all the verifiers will share the same salt, so messages generates by one can be
-    verifier by another one.
-
-    See the `ActiveSupport::MessageVerifier` documentation to more information.
+    See the `ActiveSupport::MessageVerifier` documentation for more information.
 
     *Rafael Mendonça França*
 
-- 
cgit v1.2.3


From d3d84988674dde77236d04181b48468765ed56c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 2 Dec 2013 22:42:10 -0200
Subject: Fix typos

---
 railties/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 6c3090bc34..255e49356f 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -6,7 +6,7 @@
         Rails.application.message_verifier.verify(message)
         # => 'my sensible data'
 
-    It is recommended not not use the same verifier for different things, so you can get different
+    It is recommended not to use the same verifier for different things, so you can get different
     verifiers passing the name argument.
 
         message = Rails.application.message_verifier('cookies').generate('my sensible cookie data')
-- 
cgit v1.2.3


From 48c703b055a6b287100f3c0fbc18f1294d7c7af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 4 Dec 2013 23:11:42 -0200
Subject: Make salt argument required for message verifier

---
 railties/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 255e49356f..166080c5b0 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -2,8 +2,8 @@
 
     This verifier can be used to generate and verify signed messages in the application.
 
-        message = Rails.application.message_verifier.generate('my sensible data')
-        Rails.application.message_verifier.verify(message)
+        message = Rails.application.message_verifier('salt').generate('my sensible data')
+        Rails.application.message_verifier('salt').verify(message)
         # => 'my sensible data'
 
     It is recommended not to use the same verifier for different things, so you can get different
-- 
cgit v1.2.3


From 64c784f5534bdd18866700f9441d99bcef568c3a Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Thu, 5 Dec 2013 11:33:12 +0100
Subject: end sentences with a `.`. [ci skip]

---
 railties/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 166080c5b0..3813ef7909 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -177,11 +177,11 @@
     *Paul Nikitochkin*
 
 *   Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in
-    favor of `ActiveRecord::Generators::ActiveModel#update`
+    favor of `ActiveRecord::Generators::ActiveModel#update`.
 
     *Vipul A M*
 
-*   Remove deprecated `config.whiny_nils` option
+*   Remove deprecated `config.whiny_nils` option.
 
     *Vipul A M*
 
-- 
cgit v1.2.3


From 971d5107cd4cd08c22a85d34546f4ba03ed5c925 Mon Sep 17 00:00:00 2001
From: Huiming Teo <teohuiming@gmail.com>
Date: Sun, 15 Dec 2013 14:07:34 +0800
Subject: fixed rails dbconsole to support ENV['DATABASE_URL'].

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 3813ef7909..cf8d2c2c88 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Add `ENV['DATABASE_URL']` support in `rails dbconsole`. Fixes #13320.
+
+    *Huiming Teo*
+
 *   Add `Application#message_verifier` method to return a message verifier.
 
     This verifier can be used to generate and verify signed messages in the application.
-- 
cgit v1.2.3


From 83e4dde41a09bf501c41386f874a83b2f50af5f3 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 17 Dec 2013 12:40:13 -0500
Subject: Add changelog entries about secrets.yml and secrets.secret_key_base

---
 railties/CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index cf8d2c2c88..8fbac31c0a 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,32 @@
+*   Move `secret_key_base` from `config/initializers/secret_token.rb`
+    to `config/secrets.yml`.
+
+    `secret_key_base` is now saved in `Rails.application.secrets.secret_key_base`
+    and it fallbacks to the value of `config.secret_key_base` when it is not
+    present in `config/secrets.yml`.
+
+    `config/initializers/secret_token.rb` is not generated by default
+    in new applications.
+
+    *Guillermo Iguaran*
+
+*   Generate a new `secrets.yml` file in the `config` folder for new
+    applications. By default, this file contains the application's `secret_key_base`,
+    but it could also be used to store other secrets such as access keys for external
+    APIs.
+
+    The secrets added to this file will be accessible via `Rails.application.secrets`.
+    For example, with the following `secrets.yml`:
+
+        development:
+          secret_key_base: 3b7cd727ee24e8444053437c36cc66c3
+          some_api_key: SOMEKEY
+
+    `Rails.application.secrets.some_api_key` will return `SOMEKEY` in the development
+    environment.
+
+    *Guillermo Iguaran*
+
 *   Add `ENV['DATABASE_URL']` support in `rails dbconsole`. Fixes #13320.
 
     *Huiming Teo*
-- 
cgit v1.2.3


From 61f6b47204c63715b4a49f078f9d58f24f06f502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 19 Dec 2013 17:00:53 -0200
Subject: Change the message verifier argument to verifier_name

---
 railties/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8fbac31c0a..084b87bf35 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -35,8 +35,8 @@
 
     This verifier can be used to generate and verify signed messages in the application.
 
-        message = Rails.application.message_verifier('salt').generate('my sensible data')
-        Rails.application.message_verifier('salt').verify(message)
+        message = Rails.application.message_verifier('sensitive_data').generate('my sensible data')
+        Rails.application.message_verifier('sensitive_data').verify(message)
         # => 'my sensible data'
 
     It is recommended not to use the same verifier for different things, so you can get different
-- 
cgit v1.2.3


From bfdae1775a298a4240c32e87d84ea7e8c6dccb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 19 Dec 2013 17:04:07 -0200
Subject: Make possible to use symbol as the verifier name

---
 railties/CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 084b87bf35..9404c18f57 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -35,14 +35,14 @@
 
     This verifier can be used to generate and verify signed messages in the application.
 
-        message = Rails.application.message_verifier('sensitive_data').generate('my sensible data')
-        Rails.application.message_verifier('sensitive_data').verify(message)
+        message = Rails.application.message_verifier(:sensitive_data).generate('my sensible data')
+        Rails.application.message_verifier(:sensitive_data).verify(message)
         # => 'my sensible data'
 
     It is recommended not to use the same verifier for different things, so you can get different
     verifiers passing the name argument.
 
-        message = Rails.application.message_verifier('cookies').generate('my sensible cookie data')
+        message = Rails.application.message_verifier(:cookies).generate('my sensible cookie data')
 
     See the `ActiveSupport::MessageVerifier` documentation for more information.
 
-- 
cgit v1.2.3


From 02c814c99202e42ebeb10b89af1392b594c727e9 Mon Sep 17 00:00:00 2001
From: Kassio Borges <kassioborgesm@gmail.com>
Date: Thu, 19 Dec 2013 22:12:55 -0200
Subject: `html` and `text` templates for mailers by default

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 9404c18f57..ab8f64c647 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Generates `html` and `text` templates for mailers by default.
+
+    *Kassio Borges*
+
 *   Move `secret_key_base` from `config/initializers/secret_token.rb`
     to `config/secrets.yml`.
 
-- 
cgit v1.2.3


From d39db9da1a7e093f0248c9755fb8333d89dc1724 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Sat, 21 Dec 2013 14:49:16 +0100
Subject: Add a changelog entry for #13326 [ci skip]

---
 railties/CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index ab8f64c647..aa26017bda 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,11 @@
+*   `config.assets.raise_runtime_errors` is set to true by default
+
+    This option has been introduced in
+    [sprockets-rails#100][https://github.com/rails/sprockets-rails/pull/100]
+    and defaults to true in new applications in development.
+
+    *Richard Schneeman*
+
 *   Generates `html` and `text` templates for mailers by default.
 
     *Kassio Borges*
-- 
cgit v1.2.3


From 2d4cfb28408f53daea11f45fb5e0aebdce8963d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 23 Dec 2013 20:34:11 +0100
Subject: Update CHANGELOG [ci skip]

---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index aa26017bda..a83c2b2355 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Configure `secrets.yml` and `database.yml` to read configuration
+    from the system environment by default for production.
+
+    *José Valim*
+
 *   `config.assets.raise_runtime_errors` is set to true by default
 
     This option has been introduced in
-- 
cgit v1.2.3


From ff7ab3bc78abc3e8439a57ef7d755c5aa5b069f4 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 29 Dec 2013 11:05:04 +0000
Subject: Automatically maintain test database schema

* Move check from generated helper to test_help.rb, so that all
  applications can benefit
* Rather than just raising when the test schema has pending migrations,
  try to load in the schema and only raise if there are pending
  migrations afterwards
* Opt out of the check by setting
  config.active_record.maintain_test_schema = false
* Deprecate db:test:* tasks. The test helper is now fully responsible
  for maintaining the test schema, so we don't need rake tasks for this.
  This is also a speed improvement since we're no longer reloading the
  test database on every call to "rake test".
---
 railties/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a83c2b2355..21887c32fe 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   `test_help.rb` now automatically checks/maintains your test datbase
+    schema. (Use `config.active_record.maintain_test_schema = false` to
+    disable.)
+
+    *Jon Leighton*
+
 *   Configure `secrets.yml` and `database.yml` to read configuration
     from the system environment by default for production.
 
-- 
cgit v1.2.3