From ca4694eeade454f6676aaae76bb92768f7a94f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= <jlecour@evolix.fr>
Date: Tue, 20 Aug 2019 08:12:05 +0200
Subject: [PATCH] update devise

---
 Gemfile      |  3 +--
 Gemfile.lock | 19 +++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 95b915b..8f7b9ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,8 +11,7 @@ gem 'mysql2', '>= 0.4.4', '< 0.6.0'
 # Use Puma as the app server
 gem 'puma', '~> 4.0'
 
-# gem 'devise', '~> 4.6'
-gem 'devise', github: "plataformatec/devise"
+gem 'devise', '~> 4.7'
 gem 'devise-i18n', '~> 1.8'
 gem 'simple_form', '~> 4.0'
 gem 'pundit', '~> 1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index a59dc5f..e0d248b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,3 @@
-GIT
-  remote: https://github.com/plataformatec/devise.git
-  revision: 12fc5b76d89cf6e9c47289416fb24bf1a85f03da
-  specs:
-    devise (4.6.2)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -120,6 +109,12 @@ GEM
     concurrent-ruby (1.1.5)
     crass (1.0.4)
     database_cleaner (1.7.0)
+    devise (4.7.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
     devise-i18n (1.8.1)
       devise (>= 4.6)
     docile (1.3.2)
@@ -374,7 +369,7 @@ DEPENDENCIES
   capistrano3-puma
   capybara (>= 2.15)
   database_cleaner
-  devise!
+  devise (~> 4.7)
   devise-i18n (~> 1.8)
   factory_bot_rails (~> 5.0)
   guard