From 9b9f0ab4af9e764d9fb156540a1238b903ed4ae0 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 29 Jan 2016 23:14:51 +0800
Subject: [PATCH] Upgrade omniauth-google-oauth2.
---
Gemfile | 3 +--
Gemfile.lock | 18 ++++++------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/Gemfile b/Gemfile
index b131b3d79..32a6f446e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,8 +84,7 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
gem 'omniauth-oauth2', require: false
-# this removes the dependency on 'addressable'
-gem 'omniauth-google-oauth2', git: 'git://github.com/zquestz/omniauth-google-oauth2.git', ref: 'b492c4bb8286d35'
+gem 'omniauth-google-oauth2'
gem 'oj'
gem 'pg'
gem 'pry-rails', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index aa64f7cd2..87a9f952a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,3 @@
-GIT
- remote: git://github.com/zquestz/omniauth-google-oauth2.git
- revision: b492c4bb8286d35ae1168d7f2e5c57769bfe45a0
- ref: b492c4bb8286d35
- specs:
- omniauth-google-oauth2 (0.3.0)
- jwt (~> 1.0)
- multi_json (~> 1.3)
- omniauth (>= 1.1.1)
- omniauth-oauth2 (>= 1.3.1)
-
GEM
remote: https://rubygems.org/
specs:
@@ -205,6 +194,11 @@ GEM
omniauth-github-discourse (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
+ omniauth-google-oauth2 (0.3.1)
+ jwt (~> 1.0)
+ multi_json (~> 1.3)
+ omniauth (>= 1.1.1)
+ omniauth-oauth2 (>= 1.3.1)
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
@@ -452,7 +446,7 @@ DEPENDENCIES
omniauth
omniauth-facebook
omniauth-github-discourse
- omniauth-google-oauth2!
+ omniauth-google-oauth2
omniauth-oauth2
omniauth-openid
omniauth-twitter