Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-05-19 09:12:34 +0300
committerStan Hu <stanhu@gmail.com>2016-05-19 09:12:34 +0300
commit3656b5db071d13b23803a9cbf9347da34b19fb24 (patch)
tree8d8702e5c4d8377b0088baf63b2992da9268336c /config
parent4607323e130fe5b04e830f7a6de8083b070808f1 (diff)
parente4d9d4e55b67ab04e46ee3f72c5496f91687a205 (diff)
Merge branch 'issues/15127' into 'master'
fix #15127 ActiveJob::DeserializationError thrown `send_devise_notification` pre-maturely enqueued the task when the user instance has not yet been committed into the database, causing a record-not-found in the other sidekiq process. `devise-async` has already been taking care of asynchronous mail sending, we just need to run it inside queue `mailers` instead of `mailer` to enable it. The implementation of `devise-async` enqueues the task in `after_commit` hook which is the right way to do it. See merge request !3647
Diffstat (limited to 'config')
-rw-r--r--config/initializers/devise_async.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
index 05a1852cdbd..fa602cbe554 100644
--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
@@ -1 +1,2 @@
Devise::Async.backend = :sidekiq
+Devise::Async.queue = :mailers