Merged r14440 from trunk to 3.0-stable (#20292)

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

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14442 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-07-12 10:47:53 +00:00
parent ccd40728af
commit a013b0fa11
2 changed files with 2 additions and 0 deletions

1
.gitignore vendored
View File

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

View File

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