summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-05-27 19:21:36 +0700
committerShinya Maeda <shinya@gitlab.com>2019-06-04 10:51:32 +0700
commit197a3d053359e66535c41935eac065ee424cbb07 (patch)
tree65b2010d5446fe8c41a378c0f9c7f359ae1eab69 /config
parent9a9c947b145e6a43ae49687aa398d1154d07a25b (diff)
downloadgitlab-ce-197a3d053359e66535c41935eac065ee424cbb07.tar.gz
Introduce sidekiq worker for auto merge processintroduce-auto-merge-process-worker
As we have a central domain for auto merge process today, we should use a single worker for any auto merge process.
Diffstat (limited to 'config')
-rw-r--r--config/sidekiq_queues.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 0615da2d241..fd9ce4d3374 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -30,6 +30,7 @@
- [pipeline_default, 3]
- [pipeline_cache, 3]
- [deployment, 3]
+ - [auto_merge, 3]
- [pipeline_hooks, 2]
- [gitlab_shell, 2]
- [email_receiver, 2]