Commit 4ae57e0b authored by Stan Hu's avatar Stan Hu

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
parents 77ea6909 d79c41e7
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
- [gitlab_shell, 2] - [gitlab_shell, 2]
- [email_receiver, 2] - [email_receiver, 2]
- [emails_on_push, 2] - [emails_on_push, 2]
- [mailers, 2]
- [repository_fork, 1] - [repository_fork, 1]
- [repository_import, 1] - [repository_import, 1]
- [project_service, 1] - [project_service, 1]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment