summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-20 18:09:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-20 18:09:31 +0000
commitae4ef81757bdd2c984777d8f0b2c275bbcb4b17d (patch)
tree1ac23c80190bafb47a1f5a6f1aae9da91d35d9dc /.gitignore
parent194b499aa8e26df26ff70a1e1ce0396587bd5243 (diff)
downloadgitlab-ce-ae4ef81757bdd2c984777d8f0b2c275bbcb4b17d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4bebf3fd047..3120c1c1bdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ eslint-report.html
/config/database*.yml
/config/gitlab.yml
/config/gitlab_ci.yml
+/config/Gitlab.gitlab-license
/config/initializers/rack_attack.rb
/config/initializers/smtp_settings.rb
/config/initializers/relative_url.rb