diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-24 09:50:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-25 15:24:33 +0200 |
| commit | 8742a18ea2329c0468f0998b5b869fbd5545e4fb (patch) | |
| tree | 164f14e3c5b2145665fb9e45bf66bba3db002970 /config | |
| parent | 9e5f1e1e61f032804a78e5a43b5100106f1e35b7 (diff) | |
| download | gitlab-ce-8742a18ea2329c0468f0998b5b869fbd5545e4fb.tar.gz | |
Merge branch 'sh-fix-mailroom-config' into 'master'
Fix reply-by-email not working due to queue name mismatch
See merge request !7068
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
| -rw-r--r-- | config/mail_room.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml index c639f8260aa..68697bd1dc4 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -25,7 +25,7 @@ :delivery_options: :redis_url: <%= config[:redis_url].to_json %> :namespace: <%= Gitlab::Redis::SIDEKIQ_NAMESPACE %> - :queue: incoming_email + :queue: email_receiver :worker: EmailReceiverWorker :arbitration_method: redis |