From e740e586e8f4aa39b98989dd55e90fc217d5b622 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Mon, 23 Oct 2017 10:43:32 +0200
Subject: [PATCH] Additional fixes required by latest merge from master (nr. 2)

---
 Gemfile                             |  4 +++-
 Gemfile.lock                        | 13 +++++++++----
 config/initializers/devise_async.rb |  3 +++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index d4e9bd6a7..6937d6d89 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,7 +71,9 @@ gem 'aws-sdk', '~> 2'
 gem 'aws-sdk-v1'
 
 gem 'delayed_job_active_record'
-gem 'devise-async'
+gem 'devise-async',
+  git: 'https://github.com/mhfs/devise-async.git',
+  branch: 'devise-4.x'
 gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
 gem 'tinymce-rails', '~> 4.6.4' # Rich text editor
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 90aab3ac9..c793aa1e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,6 +21,14 @@ GIT
       activejob (>= 4.2)
       paperclip (>= 3.3)
 
+GIT
+  remote: https://github.com/mhfs/devise-async.git
+  revision: 177f6363a002f7ff28f1d289c8cab7ad8d9cb8c5
+  branch: devise-4.x
+  specs:
+    devise-async (0.10.2)
+      devise (>= 4.0)
+
 GIT
   remote: https://github.com/phatworx/devise_security_extension.git
   revision: b2ee978af7d49f0fb0e7271c6ac074dfb4d39353
@@ -185,9 +193,6 @@ GEM
       railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
-    devise-async (1.0.0)
-      activejob (>= 5.0)
-      devise (>= 4.0)
     devise_invitable (1.7.2)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
@@ -498,7 +503,7 @@ DEPENDENCIES
   delayed_job_active_record
   delayed_paperclip!
   devise (~> 4.3.0)
-  devise-async
+  devise-async!
   devise_invitable
   devise_security_extension!
   factory_girl_rails
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
index 8f24c4a87..0255b5671 100644
--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
@@ -1 +1,4 @@
 Devise::Async.enabled = true
+Devise::Async.backend = :delayed_job
+Devise::Async.queue = :devise_email
+# Devise::Async.priority = 10
\ No newline at end of file