Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue #1240 - Unable to add Linked Gitlab account.

Browse source
This commit is contained in:
Martin Edenhofer 2017-07-12 11:20:17 +02:00
parent 8a08a368fc
commit 899daa6530
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Gemfile.lock
View file

@ -155,7 +155,7 @@ GEM
guard guard
guard-compat (~> 1.1) guard-compat (~> 1.1)
hashdiff (0.3.2) hashdiff (0.3.2)
hashie (3.4.4) hashie (3.5.5)
htmlentities (4.3.4) htmlentities (4.3.4)
http (1.0.4) http (1.0.4)
addressable (~> 2.3) addressable (~> 2.3)
@ -170,7 +170,7 @@ GEM
icalendar (2.4.1) icalendar (2.4.1)
inflection (1.0.0) inflection (1.0.0)
json (1.8.6) json (1.8.6)
jwt (1.5.4) jwt (1.5.6)
kgio (2.11.0) kgio (2.11.0)
koala (2.4.0) koala (2.4.0)
addressable addressable
@ -195,7 +195,7 @@ GEM
mini_portile2 (2.2.0) mini_portile2 (2.2.0)
minitest (5.10.2) minitest (5.10.2)
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.5.5) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.4.6) mysql2 (0.4.6)
naught (1.1.0) naught (1.1.0)
@ -209,27 +209,27 @@ GEM
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
oauth (0.5.1) oauth (0.5.1)
oauth2 (1.2.0) oauth2 (1.4.0)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.13)
jwt (~> 1.0) jwt (~> 1.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
octokit (4.4.1) octokit (4.4.1)
sawyer (~> 0.7.0, >= 0.5.3) sawyer (~> 0.7.0, >= 0.5.3)
omniauth (1.3.1) omniauth (1.6.1)
hashie (>= 1.2, < 4) hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.0, < 3) rack (>= 1.6.2, < 3)
omniauth-facebook (4.0.0) omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2) omniauth-oauth2 (~> 1.2)
omniauth-github (1.1.2) omniauth-github (1.3.0)
omniauth (~> 1.0) omniauth (~> 1.5)
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-gitlab (1.0.2) omniauth-gitlab (1.0.2)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0) omniauth-oauth2 (~> 1.0)
omniauth-google-oauth2 (0.4.1) omniauth-google-oauth2 (0.5.0)
jwt (~> 1.5.2) jwt (~> 1.5)
multi_json (~> 1.3) multi_json (~> 1.3)
omniauth (>= 1.1.1) omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.3.1) omniauth-oauth2 (>= 1.3.1)

1
config/initializers/omniauth.rb
View file

@ -32,7 +32,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do
authorize_url: '/oauth/authorize', authorize_url: '/oauth/authorize',
token_url: '/oauth/token' token_url: '/oauth/token'
}, },
scope: 'read_user',
} }
# oauth2 database connect # oauth2 database connect