diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-06 17:15:44 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-06 17:15:44 -0500 |
| commit | 02838d5be2f899793ce5e026f0bb20c509697061 (patch) | |
| tree | de3e125ca3f997bb94e079e2d2dbdc879d3dd7c6 /Gemfile | |
| parent | 035bf5d4d5d3209286aa257cbd56ec6ce9e1afb9 (diff) | |
| parent | 3cbab382f678cef273cde319aae55f050d27527d (diff) | |
| download | gitlab-ce-02838d5be2f899793ce5e026f0bb20c509697061.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -23,7 +23,7 @@ gem 'faraday', '~> 0.12' # Authentication libraries gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' -gem 'doorkeeper-openid_connect', '~> 1.1.0' +gem 'doorkeeper-openid_connect', '~> 1.2.0' gem 'omniauth', '~> 1.4.2' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.9' |