diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 00:08:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 00:08:53 +0300 |
| commit | 269e52662aceba62b91424e87f4def90ecc81e6c (patch) | |
| tree | 6ba6a0ce47114c969ce92e7e726ee303013bebcf /Gemfile.lock | |
| parent | bbc241ab7fff1f6854a70eb56ee70b0dad2b6144 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 48acba4d16b..4167a5e7b8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,8 +199,8 @@ GEM asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) ast (2.4.2) - atlassian-jwt (0.2.1) - jwt (~> 2.1) + atlassian-jwt (0.2.0) + jwt (~> 2.1.0) attr_required (1.0.1) autoprefixer-rails (10.2.5.1) execjs (> 0) @@ -397,11 +397,11 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.6.6) + doorkeeper (5.5.4) railties (>= 5) - doorkeeper-openid_connect (1.8.5) + doorkeeper-openid_connect (1.8.3) doorkeeper (>= 5.5, < 5.7) - jwt (>= 2.5) + json-jwt (>= 1.15.0) dotenv (2.7.6) dry-configurable (0.12.0) concurrent-ruby (~> 1.0) @@ -856,7 +856,7 @@ GEM uri_template (~> 0.7) jsonpath (1.1.2) multi_json - jwt (2.5.0) + jwt (2.1.0) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -1708,8 +1708,8 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.4) discordrb-webhooks (~> 3.4) - doorkeeper (~> 5.6, >= 5.6.6) - doorkeeper-openid_connect (~> 1.8, >= 1.8.5) + doorkeeper (~> 5.5) + doorkeeper-openid_connect (~> 1.8) duo_api (~> 1.3) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) @@ -1795,7 +1795,7 @@ DEPENDENCIES js_regex (~> 3.8) json (~> 2.6.3) json_schemer (~> 0.2.18) - jwt (~> 2.5) + jwt (~> 2.1.0) kaminari (~> 1.2.2) kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) |