diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-19 15:21:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-19 15:21:08 +0000 |
| commit | c2fedd73358b31697c3393a607a960ebf60af961 (patch) | |
| tree | f880fe51c107fa7e570f803b15c1593695555bb6 /Gemfile | |
| parent | 9dbc60b85cf3e9eb9041b205cd51580353c473d9 (diff) | |
| parent | 6ad1b988678b33e7079f1b1558a0e2a74fb8e600 (diff) | |
| download | gitlab-ce-c2fedd73358b31697c3393a607a960ebf60af961.tar.gz | |
Merge branch 'update-doorkeeper-openid_connect' into 'master'
Update doorkeeper-openid_connect and doorkeeper
See merge request gitlab-org/gitlab-ce!17797
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -22,8 +22,8 @@ gem 'faraday', '~> 0.12' # Authentication libraries gem 'devise', '~> 4.2' -gem 'doorkeeper', '~> 4.2.0' -gem 'doorkeeper-openid_connect', '~> 1.2.0' +gem 'doorkeeper', '~> 4.3' +gem 'doorkeeper-openid_connect', '~> 1.3' gem 'omniauth', '~> 1.4.2' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.9' |