cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch back to the upstream omniauth-google-oauth2 gem

Browse source 
Out patch is included now, so there is no need to use our version.
This commit is contained in:
Tom Hughes 2015-10-02 09:01:58 +01:00
parent 3c771a7844
commit 509f07b32e
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -57,7 +57,7 @@ gem "actionpack-page_caching"
# Omniauth for authentication
gem "omniauth"
gem "omniauth-openid"
gem "openstreetmap-omniauth-google-oauth2", ">= 0.2.6.1", :require => "omniauth-google-oauth2"
gem "omniauth-google-oauth2", ">= 0.2.7"
gem "omniauth-facebook"
gem "omniauth-windowslive"

28
Gemfile.lock
View file

@ -39,6 +39,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
arel (6.0.3)
ast (2.1.0)
astrolabe (1.3.1)
@ -69,7 +70,7 @@ GEM
colorize (0.7.7)
composite_primary_keys (8.1.1)
activerecord (~> 4.2.0)
coveralls (0.8.2)
coveralls (0.8.3)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.10.0)
@ -143,7 +144,7 @@ GEM
mime-types (2.6.2)
mimemagic (0.3.0)
mini_portile (0.6.2)
minitest (5.8.0)
minitest (5.8.1)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
@ -169,6 +170,12 @@ GEM
rack (~> 1.0)
omniauth-facebook (2.0.1)
omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (0.2.8)
addressable (~> 2.3)
jwt (~> 1.0)
multi_json (~> 1.3)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.1.1)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
@ -178,11 +185,6 @@ GEM
omniauth-windowslive (0.0.9.1)
multi_json (>= 1.0.3)
omniauth-oauth2 (~> 1.0)
openstreetmap-omniauth-google-oauth2 (0.2.6.1)
jwt (~> 1.0)
multi_json (~> 1.3)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.1.1)
paperclip (4.3.1)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
@ -192,7 +194,7 @@ GEM
parser (2.2.2.6)
ast (>= 1.1, < 3.0)
pg (0.18.3)
poltergeist (1.6.0)
poltergeist (1.7.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
@ -237,7 +239,7 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.4.2)
redcarpet (3.3.2)
redcarpet (3.3.3)
ref (2.0.0)
request_store (1.2.0)
rest-client (1.8.0)
@ -245,7 +247,7 @@ GEM
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rinku (1.7.3)
rubocop (0.34.1)
rubocop (0.34.2)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1)
@ -270,8 +272,8 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
soap4r-ruby1.9 (2.0.5)
sprockets (3.3.4)
rack (~> 1.0)
sprockets (3.3.5)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
@ -335,9 +337,9 @@ DEPENDENCIES
oauth-plugin (>= 0.5.1)
omniauth
omniauth-facebook
omniauth-google-oauth2 (>= 0.2.7)
omniauth-openid
omniauth-windowslive
openstreetmap-omniauth-google-oauth2 (>= 0.2.6.1)
paperclip (~> 4.0)
pg
poltergeist