codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update google oauth

Browse source 
early versions are not working with omniauth so we are stuck with this and addressable
This commit is contained in:
Sam Saffron 2016-01-11 23:48:31 +11:00
parent da25502bed
commit 38c63c2185
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -84,9 +84,7 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
gem 'omniauth-oauth2', require: false
# see: https://github.com/zquestz/omniauth-google-oauth2/pull/193#issuecomment-170447701
# https://meta.discourse.org/t/google-authentication-bug-on-discourse/37734
gem 'omniauth-google-oauth2', '0.2.5'
gem 'omniauth-google-oauth2'
gem 'oj'
gem 'pg'
gem 'pry-rails', require: false

12
Gemfile.lock
View file

@ -38,6 +38,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
annotate (2.7.0)
activerecord (>= 3.2, < 6.0)
rake (~> 10.4)
@ -194,9 +195,12 @@ GEM
omniauth-github-discourse (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.2.5)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.3.0)
addressable (~> 2.3)
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)
@ -444,7 +448,7 @@ DEPENDENCIES
omniauth
omniauth-facebook
omniauth-github-discourse
omniauth-google-oauth2 (= 0.2.5)
omniauth-google-oauth2
omniauth-oauth2
omniauth-openid
omniauth-twitter