From d46e47a5b637c02136489dd89f7277454a5f8c28 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 19 May 2016 14:09:24 +0000
Subject: [PATCH] Revert "Merge branch 'issues/15127' into 'master'"
This reverts merge request !3647
---
app/models/user.rb | 5 +++++
config/initializers/devise_async.rb | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 02e1f461fa6..6a09b78455b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -789,6 +789,11 @@ class User < ActiveRecord::Base
other.select(:id)])
end
+ # Added according to https://github.com/plataformatec/devise/blob/7df57d5081f9884849ca15e4fde179ef164a575f/README.md#activejob-integration
+ def send_devise_notification(notification, *args)
+ devise_mailer.send(notification, self, *args).deliver_later
+ end
+
def ensure_external_user_rights
return unless self.external?
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
index fa602cbe554..05a1852cdbd 100644
--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
@@ -1,2 +1 @@
Devise::Async.backend = :sidekiq
-Devise::Async.queue = :mailers
--
GitLab