summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-10-22 05:51:09 +0000
committerStan Hu <stanhu@gmail.com>2016-10-21 22:52:47 -0700
commit4c0474aa52656df646af2987262d147c520e4204 (patch)
tree2449d120a8cf46bab20f03ecb055effb0741f9cb
parent2289ee1cdde87001d3a458aae2a91679b29a3c63 (diff)
downloadgitlab-ce-4c0474aa52656df646af2987262d147c520e4204.tar.gz
Merge branch 'sh-add-mailers-to-sidekiq-config' into 'master'
Fix bug where e-mails were not being sent out via Sidekiq 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 See merge request !7053
-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]