From 4e371042f9f82224be4b10f14ad83daf28037e01 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 12 Jul 2015 10:45:12 +0000
Subject: [PATCH] Merged r14440 from trunk to 3.1-stable (#20292)

add config/secrets.yml to .gitignore and .hgignore.

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14441 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .gitignore | 1 +
 .hgignore  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6a5f534160..173b030c24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /config/configuration.yml
 /config/database.yml
 /config/email.yml
+/config/secrets.yml
 /config/initializers/session_store.rb
 /config/initializers/secret_token.rb
 /coverage
diff --git a/.hgignore b/.hgignore
index d198dcb4f0..cbc028a947 100644
--- a/.hgignore
+++ b/.hgignore
@@ -8,6 +8,7 @@ config/additional_environment.rb
 config/configuration.yml
 config/database.yml
 config/email.yml
+config/secrets.yml
 config/initializers/session_store.rb
 config/initializers/secret_token.rb
 coverage