Merge branch 'zj-exclude-geo-database-yaml' into 'master'

Exclude Geo DB Yaml on CE too

See merge request gitlab-org/gitlab-ce!20143
This commit is contained in:
Robert Speicher 2018-06-25 19:43:09 +00:00
commit eb0416ae17
1 changed files with 1 additions and 1 deletions

2
.gitignore vendored
View File

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