diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 03:08:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 03:08:54 +0000 |
| commit | 5ee120f46740efac7b8a460d7a92e4da82f4fb0b (patch) | |
| tree | b44d3bef04e9db472913289e6b53e58a14cb3e61 /Gemfile.lock | |
| parent | 72721699f11187199e89631ce0b5e3d2f7c167e9 (diff) | |
| download | gitlab-ce-5ee120f46740efac7b8a460d7a92e4da82f4fb0b.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 9e261018f03..aa33bd4cd68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,10 +243,10 @@ GEM docile (1.3.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.4.3) + doorkeeper (5.0.2) railties (>= 4.2) - doorkeeper-openid_connect (1.5.0) - doorkeeper (~> 4.3) + doorkeeper-openid_connect (1.6.3) + doorkeeper (>= 5.0, < 5.2) json-jwt (~> 1.6) ed25519 (1.2.4) elasticsearch (6.8.0) @@ -1197,8 +1197,8 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) - doorkeeper (~> 4.4.3) - doorkeeper-openid_connect (~> 1.5) + doorkeeper (~> 5.0.2) + doorkeeper-openid_connect (~> 1.6.3) ed25519 (~> 1.2) elasticsearch-api (~> 6.8) elasticsearch-model (~> 6.1) |