Merge pull request #1384 from betagouv/devise-edge

Point to a forked devise to fix build errors
This commit is contained in:
gregoirenovel 2018-01-31 12:44:33 +01:00 committed by GitHub
commit 0299525387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions

View file

@ -43,7 +43,7 @@ gem 'draper'
gem 'unicode_utils'
# Gestion des comptes utilisateurs
gem 'devise'
gem 'devise', git: 'https://github.com/jcoyne/devise.git', ref: '6e7b20b248b4d9eb8ed04674a9c1ce0a74f06cf2'
gem 'openid_connect'
gem 'omniauth-github'

View file

@ -6,6 +6,18 @@ 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
@ -167,12 +179,6 @@ 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)
@ -778,7 +784,7 @@ DEPENDENCIES
delayed_cron_job
delayed_job_active_record
delayed_job_web
devise
devise!
dotenv-rails
draper
factory_bot