Commit ef45a827 authored by Igor Drozdov's avatar Igor Drozdov

Merge branch 'sh-update-omniauth-openid' into 'master'

Update gitlab-omniauth-openid-connect gem to support ECSDA keys

See merge request gitlab-org/gitlab!77491
parents 71198f50 1c8377c8
...@@ -50,7 +50,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0' ...@@ -50,7 +50,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4' gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.4.0' gem 'omniauth_crowd', '~> 2.4.0'
gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.8.0', require: 'omniauth_openid_connect' gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-salesforce', '~> 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.16.0' gem 'rack-oauth2', '~> 1.16.0'
......
...@@ -491,7 +491,7 @@ GEM ...@@ -491,7 +491,7 @@ GEM
gitlab-mail_room (0.0.9) gitlab-mail_room (0.0.9)
gitlab-markup (1.8.0) gitlab-markup (1.8.0)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
gitlab-omniauth-openid-connect (0.8.0) gitlab-omniauth-openid-connect (0.9.1)
addressable (~> 2.7) addressable (~> 2.7)
omniauth (~> 1.9) omniauth (~> 1.9)
openid_connect (~> 1.2) openid_connect (~> 1.2)
...@@ -887,7 +887,7 @@ GEM ...@@ -887,7 +887,7 @@ GEM
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
omniauth (~> 1.0) omniauth (~> 1.0)
open4 (1.3.4) open4 (1.3.4)
openid_connect (1.2.0) openid_connect (1.3.0)
activemodel activemodel
attr_required (>= 1.0.0) attr_required (>= 1.0.0)
json-jwt (>= 1.5.0) json-jwt (>= 1.5.0)
...@@ -1251,7 +1251,7 @@ GEM ...@@ -1251,7 +1251,7 @@ GEM
unicode-display_width (>= 1.5, < 3.0) unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4) unicode_utils (~> 1.4)
strings-ansi (0.2.0) strings-ansi (0.2.0)
swd (1.2.0) swd (1.3.0)
activesupport (>= 3) activesupport (>= 3)
attr_required (>= 0.0.5) attr_required (>= 0.0.5)
httpclient (>= 2.4) httpclient (>= 2.4)
...@@ -1358,7 +1358,7 @@ GEM ...@@ -1358,7 +1358,7 @@ GEM
safety_net_attestation (~> 0.4.0) safety_net_attestation (~> 0.4.0)
securecompare (~> 1.0) securecompare (~> 1.0)
tpm-key_attestation (~> 0.9.0) tpm-key_attestation (~> 0.9.0)
webfinger (1.1.0) webfinger (1.2.0)
activesupport activesupport
httpclient (>= 2.4) httpclient (>= 2.4)
webmock (3.9.1) webmock (3.9.1)
...@@ -1484,7 +1484,7 @@ DEPENDENCIES ...@@ -1484,7 +1484,7 @@ DEPENDENCIES
gitlab-mail_room (~> 0.0.9) gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.8.0) gitlab-markup (~> 1.8.0)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.8.0) gitlab-omniauth-openid-connect (~> 0.9.0)
gitlab-sidekiq-fetcher (= 0.8.0) gitlab-sidekiq-fetcher (= 0.8.0)
gitlab-styles (~> 6.6.0) gitlab-styles (~> 6.6.0)
gitlab_chronic_duration (~> 0.10.6.2) gitlab_chronic_duration (~> 0.10.6.2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment