summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-25 03:08:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-25 03:08:49 +0000
commita8c82a6395ed62380b9061a26d92e41d46c2877e (patch)
treebd8ab49ac11104ad9ae953afd4c5e0036fdddaa2 /.gitignore
parent0b881f91159cc97ccb7328a2e52977a60ea83fbe (diff)
downloadgitlab-ce-a8c82a6395ed62380b9061a26d92e41d46c2877e.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 b3e6cbae96b..8dbfaa2e1b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ eslint-report.html
/app/assets/javascripts/locale/**/app.js
/backups/*
/config/aws.yml
+/config/cable.yml
/config/database*.yml
/config/gitlab.yml
/config/gitlab_ci.yml