Merge branch 'fix-mailroom-queue' into 'master'

Move mail_room queue from incoming_email to email_receiver

Closes #1669

See merge request !1060

CHANGELOG.md

@@ -7,6 +7,9 @@ omnibus-gitlab repository.
 
 - Switch the redis user's shell to /bin/false
 
+8.13.2
+- Move mail_room queue from incoming_email to email_receiver
+
 8.13.1
 
 - Update docs for nginx status, fix the default server for status config

files/gitlab-cookbooks/gitlab/files/default/mail_room.yml

@@ -30,7 +30,7 @@ if Gitlab::IncomingEmail.enabled?
     :delivery_options:
       :redis_url: <%= redis_url.to_json %>
       :namespace: resque:gitlab
-      :queue: incoming_email
+      :queue: email_receiver
       :worker: EmailReceiverWorker
 
     :arbitration_method: redis