From 1cc614f2bdd30b4fce35ee9e680f9272b9012978 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 24 Apr 2016 17:33:54 -0600
Subject: Remove the Devise Async gem.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.

Resolves #15575.
---
 CHANGELOG                           | 1 +
 Gemfile                             | 1 -
 Gemfile.lock                        | 3 ---
 app/models/user.rb                  | 2 +-
 config/initializers/devise_async.rb | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 config/initializers/devise_async.rb

diff --git a/CHANGELOG b/CHANGELOG
index 558897ad892..2be50c5bb11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.8.0 (unreleased)
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
   - Updated search UI
+  - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea)
 
 v 8.7.1 (unreleased)
   - Throttle the update of `project.last_activity_at` to 1 minute. !3848
diff --git a/Gemfile b/Gemfile
index 6e15da8dc6a..5dd27e24306 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,6 @@ gem "pg", '~> 0.18.2', group: :postgres
 
 # Authentication libraries
 gem 'devise',                 '~> 3.5.4'
-gem 'devise-async',           '~> 0.9.0'
 gem 'doorkeeper',             '~> 2.2.0'
 gem 'omniauth',               '~> 1.3.1'
 gem 'omniauth-auth0',         '~> 1.4.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 679c52eff25..c3c52eebbfa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -164,8 +164,6 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-async (0.9.0)
-      devise (~> 3.2)
     devise-two-factor (2.0.1)
       activesupport
       attr_encrypted (~> 1.3.2)
@@ -918,7 +916,6 @@ DEPENDENCIES
   database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
   devise (~> 3.5.4)
-  devise-async (~> 0.9.0)
   devise-two-factor (~> 2.0.0)
   diffy (~> 3.0.3)
   doorkeeper (~> 2.2.0)
diff --git a/app/models/user.rb b/app/models/user.rb
index ab48f8f1960..b6f405c6981 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -91,7 +91,7 @@ class User < ActiveRecord::Base
   devise :two_factor_backupable, otp_number_of_backup_codes: 10
   serialize :otp_backup_codes, JSON
 
-  devise :lockable, :async, :recoverable, :rememberable, :trackable,
+  devise :lockable, :recoverable, :rememberable, :trackable,
     :validatable, :omniauthable, :confirmable, :registerable
 
   attr_accessor :force_random_password
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
deleted file mode 100644
index 05a1852cdbd..00000000000
--- a/config/initializers/devise_async.rb
+++ /dev/null
@@ -1 +0,0 @@
-Devise::Async.backend = :sidekiq
-- 
cgit v1.2.1