summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-25 14:37:09 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-25 14:38:55 +0200
commit51826849ab67bab3d959bfed8c0a48af6af93343 (patch)
treefd49ea9d6bc3db14585b059451562d75e92cd6d6 /.gitignore
parent901159bbae51d818cd6f643da713eee8319923da (diff)
downloadgitlab-ce-51826849ab67bab3d959bfed8c0a48af6af93343.tar.gz
Exclude Geo DB Yaml on CE too
For Geo, a file is created for configuration of the database. This file shouldn't appear in CE, but if you've setup your GDK with a remote pointing to CE and one to EE, this file might be around when switching branches. This will mark the workspace dirty, which annoys me more than it should. [ci skip]
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 21dc67384aa..9a42a663fb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ eslint-report.html
/app/assets/javascripts/locale/**/app.js
/backups/*
/config/aws.yml
-/config/database.yml
+/config/database*.yml
/config/gitlab.yml
/config/gitlab_ci.yml
/config/initializers/rack_attack.rb