codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade omniauth-google-oauth2.

Browse source
This commit is contained in:
Guo Xiang Tan 2016-01-29 23:14:51 +08:00
parent 7d5fdd0997
commit 9b9f0ab4af
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -84,8 +84,7 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
gem 'omniauth-oauth2', require: false gem 'omniauth-oauth2', require: false
# this removes the dependency on 'addressable' gem 'omniauth-google-oauth2'
gem 'omniauth-google-oauth2', git: 'git://github.com/zquestz/omniauth-google-oauth2.git', ref: 'b492c4bb8286d35'
gem 'oj' gem 'oj'
gem 'pg' gem 'pg'
gem 'pry-rails', require: false gem 'pry-rails', require: false

18
Gemfile.lock
View file

@ -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 GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -205,6 +194,11 @@ GEM
omniauth-github-discourse (1.1.2) omniauth-github-discourse (1.1.2)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1) 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) omniauth-oauth (1.1.0)
oauth oauth
omniauth (~> 1.0) omniauth (~> 1.0)
@ -452,7 +446,7 @@ DEPENDENCIES
omniauth omniauth
omniauth-facebook omniauth-facebook
omniauth-github-discourse omniauth-github-discourse
omniauth-google-oauth2! omniauth-google-oauth2
omniauth-oauth2 omniauth-oauth2
omniauth-openid omniauth-openid
omniauth-twitter omniauth-twitter