summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-10-21 22:28:39 -0700
committerStan Hu <stanhu@gmail.com>2016-10-21 22:28:39 -0700
commitd79c41e7629b6e983c4cf5c0670a1fbab37528ed (patch)
tree9254a7de3ae16a99ce7ca0c79c2167cb496a6e5f
parent77ea6909fa90e40ce2189bd9f2569f0799ddf353 (diff)
downloadgitlab-ce-d79c41e7629b6e983c4cf5c0670a1fbab37528ed.tar.gz
Fix bug where e-mails were not being sent out via Sidekiq
By default, ActionMailer uses the "mailers" queue, but this entry was not included in the list of queues for Sidekiq to use. For more details: * https://github.com/plataformatec/devise/wiki/How-To:-Send-devise-emails-in-background-(Resque,-Sidekiq-and-Delayed::Job) * http://guides.rubyonrails.org/active_job_basics.html
-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 c2e880e891f..f36fe893fd0 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -27,6 +27,7 @@
- [gitlab_shell, 2]
- [email_receiver, 2]
- [emails_on_push, 2]
+ - [mailers, 2]
- [repository_fork, 1]
- [repository_import, 1]
- [project_service, 1]