From da25502bed9a8f826bc8af4101d5cbcee0e44cb5 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 11 Jan 2016 23:29:01 +1100
Subject: [PATCH] downgrade google omniauth
---
Gemfile | 3 ++-
Gemfile.lock | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 3fba8be65..30c060666 100644
--- a/Gemfile
+++ b/Gemfile
@@ -85,7 +85,8 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
gem 'omniauth-oauth2', require: false
# see: https://github.com/zquestz/omniauth-google-oauth2/pull/193#issuecomment-170447701
-gem 'omniauth-google-oauth2', '0.2.6'
+# https://meta.discourse.org/t/google-authentication-bug-on-discourse/37734
+gem 'omniauth-google-oauth2', '0.2.5'
gem 'oj'
gem 'pg'
gem 'pry-rails', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a93fb3ff..4625568ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -194,7 +194,7 @@ GEM
omniauth-github-discourse (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
- omniauth-google-oauth2 (0.2.6)
+ omniauth-google-oauth2 (0.2.5)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth (1.1.0)
@@ -444,7 +444,7 @@ DEPENDENCIES
omniauth
omniauth-facebook
omniauth-github-discourse
- omniauth-google-oauth2 (= 0.2.6)
+ omniauth-google-oauth2 (= 0.2.5)
omniauth-oauth2
omniauth-openid
omniauth-twitter