diff --git a/Gemfile b/Gemfile index 59b5dcf62a..2bc9ec7cf8 100644 --- a/Gemfile +++ b/Gemfile @@ -45,9 +45,9 @@ gem 'stripe' # which is needed for Pin Payments (and possibly others). gem 'activemerchant', '~> 1.78.0' -gem 'devise', '~> 3.5.10' # v4.0.0 needs rails 4.1 +gem 'devise' gem 'devise-encryptable' -gem 'devise-token_authenticatable', '~> 0.4.10' # v0.5.0 needs devise v4 +gem 'devise-token_authenticatable' gem 'jwt', '~> 2.2' gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect diff --git a/Gemfile.lock b/Gemfile.lock index ff721252e8..d80e53fc9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,17 +205,16 @@ GEM delayed_job (> 2.0.3) rack-protection (>= 1.5.5) sinatra (>= 1.4.4) - devise (3.5.10) + devise (4.7.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0) responders - thread_safe (~> 0.1) warden (~> 1.2.3) devise-encryptable (0.2.0) devise (>= 2.1.0) - devise-token_authenticatable (0.4.10) - devise (>= 3.5.2, < 4.0.0) + devise-token_authenticatable (1.1.0) + devise (>= 4.0.0, < 5.0.0) diff-lcs (1.4.4) docile (1.3.2) domain_name (0.5.20190701) @@ -443,7 +442,7 @@ GEM letter_opener (1.7.0) launchy (~> 2.2) libv8 (7.3.492.27.1) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -758,9 +757,9 @@ DEPENDENCIES debugger-linecache delayed_job_active_record delayed_job_web - devise (~> 3.5.10) + devise devise-encryptable - devise-token_authenticatable (~> 0.4.10) + devise-token_authenticatable dfc_provider! eventmachine (>= 1.2.3) factory_bot_rails (= 4.10.0)