From fdcc4c2447144144168107984751ea73debd3562 Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Fri, 5 Jul 2019 15:54:10 +0100
Subject: [PATCH] Remove dependency to spree auth devise

---
 Gemfile      |  3 ++-
 Gemfile.lock | 27 +++------------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6cbec48c6b..dbbd80089c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,6 @@ gem 'spree_api', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
 gem 'spree_backend', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
 gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
 
-gem 'spree_auth_devise', github: 'luisramos0/spree_auth_devise', branch: '2-0-without-ctrls'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 
 # Our branch contains two changes
@@ -37,6 +36,8 @@ gem 'stripe'
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78'
 
+gem 'devise', '~> 2.2.5'
+gem 'devise-encryptable', '0.1.2'
 gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.1' # Used for Stripe Connect
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5dc405918e..11339eae89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,18 +12,6 @@ GIT
   specs:
     custom_error_message (1.1.1)
 
-GIT
-  remote: https://github.com/luisramos0/spree_auth_devise.git
-  revision: 562ac6b0b821173f36405457ccfad103e9c5dc6a
-  branch: 2-0-without-ctrls
-  specs:
-    spree_auth_devise (2.0.0)
-      devise (~> 2.2.5)
-      devise-encryptable (= 0.1.2)
-      spree_backend (~> 2.0.0)
-      spree_core (~> 2.0.0)
-      spree_frontend (~> 2.0.0)
-
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
   revision: 27ad7165ea4c6e8c5f120b42b676cb9c2c272100
@@ -78,14 +66,6 @@ GIT
       state_machine (= 1.2.0)
       stringex (~> 1.5.1)
       truncate_html (= 0.9.2)
-    spree_frontend (2.0.4)
-      canonical-rails
-      deface (>= 0.9.0)
-      jquery-rails (~> 3.0.0)
-      rails (~> 3.2.13)
-      spree_api (= 2.0.4)
-      spree_core (= 2.0.4)
-      stringex (~> 1.5.1)
 
 GIT
   remote: https://github.com/spree/spree_i18n.git
@@ -180,7 +160,7 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    bcrypt (3.1.12)
+    bcrypt (3.1.13)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.5.0)
@@ -189,8 +169,6 @@ GEM
     builder (3.0.4)
     byebug (9.0.6)
     cancan (1.6.10)
-    canonical-rails (0.1.0)
-      rails (>= 3.1, < 5.1)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -801,6 +779,8 @@ DEPENDENCIES
   deface (= 1.0.2)
   delayed_job_active_record
   delayed_job_web
+  devise (~> 2.2.5)
+  devise-encryptable (= 0.1.2)
   diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails
@@ -861,7 +841,6 @@ DEPENDENCIES
   skylight (< 2.0)
   spinjs-rails
   spree_api!
-  spree_auth_devise!
   spree_backend!
   spree_core!
   spree_i18n!