Merge pull request #557 from AyuntamientoMadrid/upgrade_omniauth

upgrades omniauth google gem
consuldemocracy · Sep 27, 2015 · c3b4102 · c3b4102
2 parents 050ff00 + 570d152
commit c3b4102
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,7 @@ gem 'devise'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-facebook'
-gem 'omniauth-google-oauth2'
+gem 'omniauth-google-oauth2', '~> 0.2.7'
 
 gem 'kaminari'
 gem 'ancestry'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -245,9 +245,12 @@ GEM
       rack (~> 1.0)
     omniauth-facebook (2.0.1)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.2.6)
-      omniauth (> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.2.7)
+      addressable (~> 2.3)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.1.1)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
@@ -449,7 +452,7 @@ DEPENDENCIES
   newrelic_rpm (~> 3.13.1)
   omniauth
   omniauth-facebook
-  omniauth-google-oauth2
+  omniauth-google-oauth2 (~> 0.2.7)
   omniauth-twitter
   paranoia
   pg