From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 12 Jul 2015 10:45:12 +0000 (+0000)
Subject: Merged r14440 from trunk to 3.1-stable (#20292)
X-Git-Tag: 3.1.0~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4e371042f9f82224be4b10f14ad83daf28037e01;p=redmine.git

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
---

diff --git a/.gitignore b/.gitignore
index 6a5f53416..173b030c2 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 d198dcb4f..cbc028a94 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