diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-22 05:51:09 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-22 05:51:09 +0000 |
| commit | 4ae57e0b374bbb8e461305d8a7a68b550bdd768d (patch) | |
| tree | 9254a7de3ae16a99ce7ca0c79c2167cb496a6e5f | |
| parent | 77ea6909fa90e40ce2189bd9f2569f0799ddf353 (diff) | |
| parent | d79c41e7629b6e983c4cf5c0670a1fbab37528ed (diff) | |
| download | gitlab-ce-4ae57e0b374bbb8e461305d8a7a68b550bdd768d.tar.gz | |
Merge branch 'sh-add-mailers-to-sidekiq-config' into 'master'
v8.14.0.pre
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.yml | 1 |
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] |