Revert "Point to a forked devise to fix build errors"
This reverts commit 1b58bfad3e
.
This commit is contained in:
parent
3d31fcca4b
commit
7d6b5f8426
2 changed files with 8 additions and 14 deletions
2
Gemfile
2
Gemfile
|
@ -43,7 +43,7 @@ gem 'draper'
|
|||
gem 'unicode_utils'
|
||||
|
||||
# Gestion des comptes utilisateurs
|
||||
gem 'devise', git: 'https://github.com/jcoyne/devise.git', ref: '6e7b20b248b4d9eb8ed04674a9c1ce0a74f06cf2'
|
||||
gem 'devise'
|
||||
gem 'openid_connect'
|
||||
gem 'omniauth-github'
|
||||
|
||||
|
|
20
Gemfile.lock
20
Gemfile.lock
|
@ -6,18 +6,6 @@ GIT
|
|||
warden (1.2.8)
|
||||
rack (>= 1.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/jcoyne/devise.git
|
||||
revision: 6e7b20b248b4d9eb8ed04674a9c1ce0a74f06cf2
|
||||
ref: 6e7b20b248b4d9eb8ed04674a9c1ce0a74f06cf2
|
||||
specs:
|
||||
devise (4.4.1)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0, < 5.2)
|
||||
responders
|
||||
warden (~> 1.2.3)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/mina-deploy/mina.git
|
||||
revision: 343a7ab672d8b4f0ddb84ec240cde7d94b46397a
|
||||
|
@ -183,6 +171,12 @@ GEM
|
|||
activerecord (> 3.0.0)
|
||||
delayed_job (> 2.0.3)
|
||||
sinatra (>= 1.4.4)
|
||||
devise (4.4.1)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0, < 5.2)
|
||||
responders
|
||||
warden (~> 1.2.3)
|
||||
diff-lcs (1.3)
|
||||
domain_name (0.5.20170404)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
|
@ -782,7 +776,7 @@ DEPENDENCIES
|
|||
delayed_cron_job
|
||||
delayed_job_active_record
|
||||
delayed_job_web
|
||||
devise!
|
||||
devise
|
||||
dotenv-rails
|
||||
draper
|
||||
factory_bot
|
||||
|
|
Loading…
Reference in a new issue