From 9aa49e922cb73d7dbc8e9753b5e8b77d83c46c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 7 Aug 2017 10:43:54 +0200
Subject: [PATCH] let's use the latest omniauth-github gem

---
 Gemfile      | 4 +---
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index f4a4b165876..0ef42b96510 100644
--- a/Gemfile
+++ b/Gemfile
@@ -85,9 +85,7 @@ gem 'openid-redis-store'
 gem 'omniauth-facebook'
 gem 'omniauth-twitter'
 gem 'omniauth-instagram'
-
-# Forked until https://github.com/intridea/omniauth-github/pull/41 is merged
-gem 'omniauth-github-discourse', require: 'omniauth-github'
+gem 'omniauth-github'
 
 gem 'omniauth-oauth2', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 02deaddef9f..6d672a14289 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,9 +191,9 @@ GEM
       rack (>= 1.6.2, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github-discourse (1.1.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-google-oauth2 (0.3.1)
       jwt (~> 1.0)
       multi_json (~> 1.3)
@@ -452,7 +452,7 @@ DEPENDENCIES
   oj
   omniauth
   omniauth-facebook
-  omniauth-github-discourse
+  omniauth-github
   omniauth-google-oauth2
   omniauth-instagram
   omniauth-oauth2