Browse Source

switch to orignal devise gem

pull/1610/head
Phil Lee 3 years ago
parent
commit
89866b85f8
  1. 2
      Gemfile
  2. 20
      Gemfile.lock
  3. 2
      app/mailers/devise_notify_mailer.rb

2
Gemfile

@ -33,7 +33,7 @@ gem "roo"
gem "json-schema" gem "json-schema"
# Authentication # Authentication
# Point at branch until devise is compatible with Turbo, see https://github.com/heartcombo/devise/pull/5340 # 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. # Two-factor Authentication for devise models.
gem "devise_two_factor_authentication" gem "devise_two_factor_authentication"
# UK postcode parsing and validation # UK postcode parsing and validation

20
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 GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -140,6 +128,12 @@ GEM
rexml rexml
crass (1.0.6) crass (1.0.6)
date (3.3.3) 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_two_factor_authentication (3.0.0)
devise devise
encryptor encryptor
@ -457,7 +451,7 @@ DEPENDENCIES
capybara capybara
capybara-lockstep capybara-lockstep
capybara-screenshot capybara-screenshot
devise! devise
devise_two_factor_authentication devise_two_factor_authentication
dotenv-rails dotenv-rails
erb_lint erb_lint

2
app/mailers/devise_notify_mailer.rb

@ -51,7 +51,7 @@ class DeviseNotifyMailer < Devise::Mailer
end end
def email_allowlist def email_allowlist
Rails.application.credentials[:email_allowlist] Rails.application.credentials[:email_allowlist] || []
end end
private private

Loading…
Cancel
Save