diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-28 03:10:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-28 03:10:21 +0300 |
| commit | 533d1ccc9875370e8f296c3de7dfb9c0e6a5c512 (patch) | |
| tree | 1304e56f627d1e69c5e27887269809905e61f919 /Gemfile.lock | |
| parent | a28eb91c64e50623d3614892db798656ee7d83ca (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b24d40d2a35..989d812228f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -477,6 +477,10 @@ GEM gitlab-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) + gitlab-omniauth-openid-connect (0.4.0) + addressable (~> 2.7) + omniauth (~> 1.9) + openid_connect (~> 1.2) gitlab-pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) @@ -872,12 +876,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) - omniauth_openid_connect (0.3.5) - addressable (~> 2.5) - omniauth (~> 1.9) - openid_connect (~> 1.1) open4 (1.3.4) - openid_connect (1.1.8) + openid_connect (1.2.0) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) @@ -1230,7 +1230,7 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) - swd (1.1.2) + swd (1.2.0) activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -1454,6 +1454,7 @@ DEPENDENCIES gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) + gitlab-omniauth-openid-connect (~> 0.4.0) gitlab-pry-byebug gitlab-sidekiq-fetcher (= 0.5.6) gitlab-styles (~> 6.2.0) @@ -1537,7 +1538,6 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0) - omniauth_openid_connect (~> 0.3.5) org-ruby (~> 0.9.12) parallel (~> 1.19) parslet (~> 1.8) |