diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-10 20:16:33 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-10 20:16:33 +0000 |
| commit | 639d8490f1f37d5c392df650b5e939679a375c8a (patch) | |
| tree | 4362ded086b70056ee32337bfb1b53ca977477ff /Gemfile | |
| parent | 49df1f27ba00fe1035a5c950a47046ec34c75bda (diff) | |
| parent | 85cb5635babe5aa2c051fa2f40be4b28a106640f (diff) | |
| download | gitlab-ce-639d8490f1f37d5c392df650b5e939679a375c8a.tar.gz | |
Merge branch 'bump-omniauth-google-oauth2' into 'master'
Bump google-omniauth-oauth2 to 0.4.1
Closes #19064
See merge request !4882
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -28,7 +28,7 @@ gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' -gem 'omniauth-google-oauth2', '~> 0.2.0' +gem 'omniauth-google-oauth2', '~> 0.4.1' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-saml', '~> 1.6.0' gem 'omniauth-shibboleth', '~> 1.2.0' |