summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 09:55:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 09:55:51 +0000
commite8d2c2579383897a1dd7f9debd359abe8ae8373d (patch)
treec42be41678c2586d49a75cabce89322082698334 /.gitignore
parentfc845b37ec3a90aaa719975f607740c22ba6a113 (diff)
downloadgitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
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