From 89866b85f87ca0e2277db94fce5c363442a11006 Mon Sep 17 00:00:00 2001
From: Phil Lee <asmega@users.noreply.github.com>
Date: Tue, 9 May 2023 13:24:55 +0100
Subject: [PATCH] switch to orignal devise gem

---
 Gemfile                             |  2 +-
 Gemfile.lock                        | 20 +++++++-------------
 app/mailers/devise_notify_mailer.rb |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5322a25b2..777de1349 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem "roo"
 gem "json-schema"
 # Authentication
 # Point at branch until devise is compatible with Turbo, see https://github.com/heartcombo/devise/pull/5340
-gem "devise", github: "baarkerlounger/devise", branch: "dluhc-fixes"
+gem "devise"
 # Two-factor Authentication for devise models.
 gem "devise_two_factor_authentication"
 # UK postcode parsing and validation
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ebae16b2..66a699356 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,3 @@
-GIT
-  remote: https://github.com/baarkerlounger/devise.git
-  revision: 9b93eff1be452683b9fed61ec8c350fbc8387e7f
-  branch: dluhc-fixes
-  specs:
-    devise (4.8.1)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -140,6 +128,12 @@ GEM
       rexml
     crass (1.0.6)
     date (3.3.3)
+    devise (4.8.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
     devise_two_factor_authentication (3.0.0)
       devise
       encryptor
@@ -457,7 +451,7 @@ DEPENDENCIES
   capybara
   capybara-lockstep
   capybara-screenshot
-  devise!
+  devise
   devise_two_factor_authentication
   dotenv-rails
   erb_lint
diff --git a/app/mailers/devise_notify_mailer.rb b/app/mailers/devise_notify_mailer.rb
index 827e81b56..5560e7925 100644
--- a/app/mailers/devise_notify_mailer.rb
+++ b/app/mailers/devise_notify_mailer.rb
@@ -51,7 +51,7 @@ class DeviseNotifyMailer < Devise::Mailer
   end
 
   def email_allowlist
-    Rails.application.credentials[:email_allowlist]
+    Rails.application.credentials[:email_allowlist] || []
   end
 
 private