diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-07 12:38:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-07 12:38:23 +0000 |
| commit | 6f0042421447f6675a5fc3d2bf3fdaedb6007451 (patch) | |
| tree | eabd8730754fcd1055522a56c7659f292e35067f | |
| parent | ff79b0a7c00523849c494ea015f59eb2723a42c8 (diff) | |
| parent | a11b1926b7a363f0d370f4f2bb7b4cba4003d854 (diff) | |
| download | gitlab-ce-6f0042421447f6675a5fc3d2bf3fdaedb6007451.tar.gz | |
Merge branch '37411-update-omniauth-google-oauth2' into 'master'
Update the omniauth-google-oauth2 gem to 0.5.2
Closes #37411
See merge request !14105
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -31,7 +31,7 @@ gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.4.1' +gem 'omniauth-google-oauth2', '~> 0.5.2' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5e3d12544fc..9fbf08d80e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -530,8 +530,8 @@ GEM omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.4.1) - jwt (~> 1.5.2) + omniauth-google-oauth2 (0.5.2) + jwt (~> 1.5) multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) @@ -1076,7 +1076,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.4.1) + omniauth-google-oauth2 (~> 0.5.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.7.0) |