Revert "Merge branch 'issues/15127' into 'master'"

This reverts merge request !3647

Revert "Merge branch 'issues/15127' into 'master'"
This reverts merge request !3647
d46e47a5 · Stan Hu · 3656b5db · d46e47a5 · d46e47a5
Commit d46e47a5 authored May 19, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

app/models/user.rb app/models/user.rb +5 -0

config/initializers/devise_async.rb config/initializers/devise_async.rb +0 -1

No files found.
--- 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?


--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
 Devise::Async.backend = :sidekiq
-Devise::Async.queue = :mailers