diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-23 15:10:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-23 15:10:34 +0000 |
commit | a8b96c3072b3bd4d45e6364931042b350bf7fa2e (patch) | |
tree | 70d8a5faa2171c82a0007364f89c11d2e45aeac5 /Gemfile.lock | |
parent | 8137303e47baaff97a36396cfb05efc0d99879a2 (diff) | |
download | gitlab-ce-a8b96c3072b3bd4d45e6364931042b350bf7fa2e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 832102ce337..787bec68aeb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -599,10 +599,6 @@ GEM gitlab-mail_room (0.0.9) gitlab-markup (1.8.1) gitlab-net-dns (0.9.1) - gitlab-omniauth-openid-connect (0.10.0) - addressable (~> 2.7) - omniauth (>= 1.9, < 3) - openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.9.0) json (>= 2.5) sidekiq (~> 6.1) @@ -1025,6 +1021,9 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack + omniauth_openid_connect (0.6.0) + omniauth (>= 1.9, < 3) + openid_connect (~> 1.1) open4 (1.3.4) openid_connect (1.3.0) activemodel @@ -1679,7 +1678,6 @@ DEPENDENCIES gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) gitlab-net-dns (~> 0.9.1) - gitlab-omniauth-openid-connect (~> 0.10.0) gitlab-sidekiq-fetcher (= 0.9.0) gitlab-styles (~> 9.2.0) gitlab_chronic_duration (~> 0.10.6.2) @@ -1770,6 +1768,8 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! + omniauth_openid_connect (~> 0.6.0) + openid_connect (= 1.3.0) openssl (= 2.2.2) org-ruby (~> 0.9.12) pact (~> 1.63) |