summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2018-04-23 16:54:06 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2018-04-23 11:57:14 -0500
commitfe21dfc256211495d4c8a8e0bb0bccb6baea590c (patch)
treefecc3eb1dceb7d96f199cd1c5f843f03f16aff02
parent039cdcd5f522b6b475513e19c86b92e57bd66b01 (diff)
downloadgitlab-ce-fe21dfc256211495d4c8a8e0bb0bccb6baea590c.tar.gz
Merge branch '45433-upgrade-doorkeeper' into 'master'
Update doorkeeper Closes #45433 and #45647 See merge request gitlab-org/gitlab-ce!18543
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 75c7b418a61..54e3e73ecf4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,7 +178,7 @@ GEM
docile (1.1.5)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
- doorkeeper (4.3.1)
+ doorkeeper (4.3.2)
railties (>= 4.2)
doorkeeper-openid_connect (1.3.0)
doorkeeper (~> 4.3)