From d5d3c03598df712550acf0c6463a61c6e7dcc19e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 31 Jan 2020 21:08:52 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 config/mail_room.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'config/mail_room.yml')

diff --git a/config/mail_room.yml b/config/mail_room.yml
index 75024c2b2e1..da37ef60587 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -1,9 +1,7 @@
 :mailboxes:
   <%
     require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
-    config = Gitlab::MailRoom.config
-
-    if Gitlab::MailRoom.enabled?
+    Gitlab::MailRoom.enabled_configs.each do |config|
   %>
     -
       :host: <%= config[:host].to_json %>
@@ -24,8 +22,8 @@
       :delivery_options:
         :redis_url: <%= config[:redis_url].to_json %>
         :namespace: <%= Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE %>
-        :queue: email_receiver
-        :worker: EmailReceiverWorker
+        :queue: <%= config[:queue] %>
+        :worker: <%= config[:worker] %>
         <% if config[:sentinels] %>
         :sentinels:
           <% config[:sentinels].each do |sentinel| %>
-- 
cgit v1.2.3