From fe21dfc256211495d4c8a8e0bb0bccb6baea590c Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Mon, 23 Apr 2018 16:54:06 +0000
Subject: Merge branch '45433-upgrade-doorkeeper' into 'master'

Update doorkeeper

Closes #45433 and #45647

See merge request gitlab-org/gitlab-ce!18543
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
cgit v1.2.1