diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-07-12 10:47:53 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-07-12 10:47:53 +0000 |
| commit | a013b0fa1132592b566e81e115ac4ca6a9eccff1 (patch) | |
| tree | bd79b61483d630ccabfd88d47783804229ca8fe4 | |
| parent | ccd40728afdee5b86ec92cbc032b9dd5c02f4c6e (diff) | |
| download | redmine-a013b0fa1132592b566e81e115ac4ca6a9eccff1.tar.gz redmine-a013b0fa1132592b566e81e115ac4ca6a9eccff1.zip | |
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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .hgignore | 1 |
2 files changed, 2 insertions, 0 deletions
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 @@ -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 |