From 9a2da2793576df0b0f33e34b90870356cd2a285a Mon Sep 17 00:00:00 2001
From: Shawn Davenport <sdavenport@github.com>
Date: Sat, 14 Dec 2013 12:55:32 -0600
Subject: [PATCH 1/2] Rails: Ignore the new home of secret_key_base.

---
 Rails.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rails.gitignore b/Rails.gitignore
index b4be5c7b..ce568526 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -13,6 +13,7 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
+config/secret.yml
 
 ## Environment normalisation:
 /.bundle

From 8c525145acc11c5174027fdbed92de2c80754fc6 Mon Sep 17 00:00:00 2001
From: Shawn Davenport <sdavenport@github.com>
Date: Sat, 14 Dec 2013 12:58:17 -0600
Subject: [PATCH 2/2] secrets.yml, not secret.

---
 Rails.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rails.gitignore b/Rails.gitignore
index ce568526..56454403 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -13,7 +13,7 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
-config/secret.yml
+config/secrets.yml
 
 ## Environment normalisation:
 /.bundle