summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-14 00:07:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-14 00:07:47 +0000
commite2d4a6dedbb55154ff9389dbe061fa74ccbae287 (patch)
tree13f364616561701ce2cea0426cad72f7914c5128 /Gemfile.lock
parent30080dfe0a7475f37cdcf95ad1b04ce1ea060e3c (diff)
downloadgitlab-ce-e2d4a6dedbb55154ff9389dbe061fa74ccbae287.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 01431cb3cc0..7291d5748b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,7 +245,7 @@ GEM
docile (1.3.2)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
- doorkeeper (5.0.2)
+ doorkeeper (5.0.3)
railties (>= 4.2)
doorkeeper-openid_connect (1.6.3)
doorkeeper (>= 5.0, < 5.2)
@@ -1205,7 +1205,7 @@ DEPENDENCIES
diff_match_patch (~> 0.1.0)
diffy (~> 3.3)
discordrb-webhooks-blackst0ne (~> 3.3)
- doorkeeper (~> 5.0.2)
+ doorkeeper (~> 5.0.3)
doorkeeper-openid_connect (~> 1.6.3)
ed25519 (~> 1.2)
elasticsearch-api (~> 6.8)