Commit 99d21e45 authored by charlie ablett's avatar charlie ablett

Merge branch 'update-doorkeeper-503' into 'master'

Updated doorkeeper to 5.0.3 and ran bundle update doorkeeper to update Gemfile.lock

Closes #217396

See merge request gitlab-org/gitlab!31673
parents b426455d ed8ba34d
...@@ -26,7 +26,7 @@ gem 'marginalia', '~> 1.8.0' ...@@ -26,7 +26,7 @@ gem 'marginalia', '~> 1.8.0'
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.6' gem 'devise', '~> 4.6'
gem 'doorkeeper', '~> 5.0.2' gem 'doorkeeper', '~> 5.0.3'
gem 'doorkeeper-openid_connect', '~> 1.6.3' gem 'doorkeeper-openid_connect', '~> 1.6.3'
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-auth0', '~> 2.0.0'
......
...@@ -245,7 +245,7 @@ GEM ...@@ -245,7 +245,7 @@ GEM
docile (1.3.2) docile (1.3.2)
domain_name (0.5.20180417) domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.0.2) doorkeeper (5.0.3)
railties (>= 4.2) railties (>= 4.2)
doorkeeper-openid_connect (1.6.3) doorkeeper-openid_connect (1.6.3)
doorkeeper (>= 5.0, < 5.2) doorkeeper (>= 5.0, < 5.2)
...@@ -1205,7 +1205,7 @@ DEPENDENCIES ...@@ -1205,7 +1205,7 @@ DEPENDENCIES
diff_match_patch (~> 0.1.0) diff_match_patch (~> 0.1.0)
diffy (~> 3.3) diffy (~> 3.3)
discordrb-webhooks-blackst0ne (~> 3.3) discordrb-webhooks-blackst0ne (~> 3.3)
doorkeeper (~> 5.0.2) doorkeeper (~> 5.0.3)
doorkeeper-openid_connect (~> 1.6.3) doorkeeper-openid_connect (~> 1.6.3)
ed25519 (~> 1.2) ed25519 (~> 1.2)
elasticsearch-api (~> 6.8) elasticsearch-api (~> 6.8)
......
---
title: Update doorkeeper to latest version 5.0.3
merge_request: 31673
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment