diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-06 08:29:39 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-06 08:29:39 +0000 |
| commit | 8b55b794cb48c726cde7cf0ad24180d8e6bb975f (patch) | |
| tree | a0d30241a9703e611c188197661b398c3aea21b9 /Gemfile.lock | |
| parent | f741a7dd3258f2f0d19d8e95642d35934ca59a36 (diff) | |
| parent | 6018d5bb87a09a4e624983a3bfbb2e573fbb0dd9 (diff) | |
| download | gitlab-ce-8b55b794cb48c726cde7cf0ad24180d8e6bb975f.tar.gz | |
Merge branch 'feature/omniauth_oidc_strategy' into 'master'
Added Omniauth OpenID Connect strategy
See merge request gitlab-org/gitlab-ce!27383
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bdcefd2e2b5..9b1a036030a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -561,13 +561,13 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - omniauth-ultraauth (0.0.1) - omniauth_openid_connect (~> 0.2.4) + omniauth-ultraauth (0.0.2) + omniauth_openid_connect (~> 0.3.0) omniauth_crowd (2.2.3) activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) - omniauth_openid_connect (0.2.4) + omniauth_openid_connect (0.3.0) addressable (~> 2.5) omniauth (~> 1.3) openid_connect (~> 1.1) @@ -1130,8 +1130,9 @@ DEPENDENCIES omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) - omniauth-ultraauth (~> 0.0.1) + omniauth-ultraauth (~> 0.0.2) omniauth_crowd (~> 2.2.0) + omniauth_openid_connect (~> 0.3.0) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) |