diff --git a/Gemfile b/Gemfile index aa3a5edb2..cb06d2eca 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'deep_cloneable' # Enable deep clone of active record models gem 'delayed_cron_job', require: false # Cron jobs gem 'delayed_job_active_record' gem 'delayed_job_web' -gem 'devise', git: 'https://github.com/heartcombo/devise.git', ref: "edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1" # Gestion des comptes utilisateurs, drop ref on next release: 4.9.4 +gem 'devise' gem 'devise-i18n' gem 'devise-two-factor' gem 'discard' diff --git a/Gemfile.lock b/Gemfile.lock index 4b248b34c..82452fb76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,18 +6,6 @@ GIT json (>= 2.5) sidekiq (~> 7.0) -GIT - remote: https://github.com/heartcombo/devise.git - revision: edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1 - ref: edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1 - specs: - devise (4.9.3) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0) - responders - warden (~> 1.2.3) - GEM remote: https://rubygems.org/ specs: @@ -213,6 +201,12 @@ GEM sinatra (>= 1.4.4) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) + devise (4.9.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) devise-i18n (1.12.0) devise (>= 4.9.0) devise-two-factor (5.0.0) @@ -910,7 +904,7 @@ DEPENDENCIES delayed_cron_job delayed_job_active_record delayed_job_web - devise! + devise devise-i18n devise-two-factor discard