diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-25 19:43:09 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-25 19:43:09 +0000 |
| commit | eb0416ae1704ea2460ed31b5e8053325cc0f3199 (patch) | |
| tree | 10156884369fea91fb0385be2565dfa92eb279b6 | |
| parent | 52ea9b26d5b6eef6677eca200581190274be3229 (diff) | |
| parent | 51826849ab67bab3d959bfed8c0a48af6af93343 (diff) | |
| download | gitlab-ce-eb0416ae1704ea2460ed31b5e8053325cc0f3199.tar.gz | |
Merge branch 'zj-exclude-geo-database-yaml' into 'master'
Exclude Geo DB Yaml on CE too
See merge request gitlab-org/gitlab-ce!20143
| -rw-r--r-- | .gitignore | 2 |
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 |