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 6a5f5341603d55d3c7b7ad3898fc0b79c7a3bd63..173b030c24664324afc776a1900c9a7c75bda8ba 100644 (file)
--- 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 d198dcb4f0dcb654117e7ae36754a86e0605c0be..cbc028a9471c60db369472e8116122e63689e1e7 100644 (file)
--- 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