summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-09 09:09:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-09 09:09:53 +0000
commit1613500bf7400f5692a55fd65235a4a10fc40a7d (patch)
tree967ae692bf524c89abdde048d8f74361642293c7 /.gitignore
parent97576e3dfdc15b26c0a7832608397edd69167351 (diff)
downloadgitlab-ce-1613500bf7400f5692a55fd65235a4a10fc40a7d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 323741575de..d1d2bfde1aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ eslint-report.html
/config/redis.trace_chunks.yml
/config/unicorn.rb
/config/puma.rb
-/config/puma_actioncable.rb
/config/secrets.yml
/config/sidekiq.yml
/config/registry.key