Merge branch '45433-upgrade-doorkeeper' into 'master'

Update doorkeeper Closes #45433 and #45647 See merge request gitlab-org/gitlab-ce!18543

Merge branch '45433-upgrade-doorkeeper' into 'master'
fe21dfc2 · Marin Jankovski · Mayra Cabrera · 039cdcd5 · fe21dfc2
Commit fe21dfc2 authored Apr 23, 2018 by Marin Jankovski Committed by Mayra Cabrera Apr 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- 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)