diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-04 16:32:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-04 16:32:57 +0000 |
| commit | 3571b97effd81f9a84f238f918544c6e5c625b76 (patch) | |
| tree | f8adcecf6da9661dd101bbfda68806904ce946c9 | |
| parent | e30168ddb77dbb12375e255c54463f6132c95945 (diff) | |
| parent | b6caf937ccc780bd2abd7c4518f85ebcad12548f (diff) | |
| download | gitlab-ce-3571b97effd81f9a84f238f918544c6e5c625b76.tar.gz | |
Merge branch 'update-doorkeeper' into 'master'
Update Doorkeeper OpenID for Kubernetes support
Closes #44485
See merge request gitlab-org/gitlab-ce!19293
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b06755edb60..2daaa3b516e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -172,7 +172,7 @@ GEM unf (>= 0.0.5, < 1.0.0) doorkeeper (4.3.2) railties (>= 4.2) - doorkeeper-openid_connect (1.3.0) + doorkeeper-openid_connect (1.4.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) dropzonejs-rails (0.7.2) |