consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #557 from AyuntamientoMadrid/upgrade_omniauth

Browse Source 
upgrades omniauth google gem
This commit is contained in:
Juanjo Bazán
2015-09-27 18:05:58 +02:00
parent 050ff00c35 570d1523b4
commit c3b4102a00
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -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'

11
Gemfile.lock
View File

@@ -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