Commit 3571b97e authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'update-doorkeeper' into 'master'

Update Doorkeeper OpenID for Kubernetes support

Closes #44485

See merge request gitlab-org/gitlab-ce!19293
parents e30168dd b6caf937
...@@ -172,7 +172,7 @@ GEM ...@@ -172,7 +172,7 @@ GEM
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.2) doorkeeper (4.3.2)
railties (>= 4.2) railties (>= 4.2)
doorkeeper-openid_connect (1.3.0) doorkeeper-openid_connect (1.4.0)
doorkeeper (~> 4.3) doorkeeper (~> 4.3)
json-jwt (~> 1.6) json-jwt (~> 1.6)
dropzonejs-rails (0.7.2) dropzonejs-rails (0.7.2)
......
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