From 7d6b5f84269ca1d2ef9210f20a8c8d6714e18d66 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 1 Feb 2018 15:20:02 +0100
Subject: [PATCH] Revert "Point to a forked devise to fix build errors"

This reverts commit 1b58bfad3e0172ed3c44d87e4de0cee7468a967c.
---
 Gemfile      |  2 +-
 Gemfile.lock | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index f79737bcd..0b9fa75cd 100644
--- a/Gemfile
+++ b/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'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ae9cbf9c..6497187df 100644
--- a/Gemfile.lock
+++ b/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