Merge pull request #3986 from tgxworld/upgrade_omniauth-google-oauth2

Upgrade omniauth-google-oauth2.

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

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