diff options
author | Stan Hu <stanhu@gmail.com> | 2016-10-23 21:17:23 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-10-23 21:35:52 -0700 |
commit | 59ed1d3cbbf6c89fde202889af798fc189035313 (patch) | |
tree | d23844cbdc785e6871c8c58ff1852d16b3be7e21 /config/mail_room.yml | |
parent | a98ad03ba18da0b1534f36dafafa9a1c644d0bf1 (diff) | |
download | gitlab-ce-59ed1d3cbbf6c89fde202889af798fc189035313.tar.gz |
Fix reply-by-email not working due to queue name mismatchsh-fix-mailroom-config
mail_room was configured to deliver mail to the `incoming_email`
queue while `EmailReceiveWorker` was reading the `email_receiver`
queue. Adds a migration that repeats the work of a previous
migration to ensure all mails that wound up in the old
queue get processed.
Closes #23689
Diffstat (limited to 'config/mail_room.yml')
-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 |