diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 00:09:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 00:09:48 +0000 |
| commit | 0dc67904c1b8b01e7406fc510cf432c5bfc919fb (patch) | |
| tree | 93fffcf04b7d5ef50291c9d6386e6dd5f199dcef /Gemfile.lock | |
| parent | 915ce2e09259d71275f3e0a6e5214b793c2eb52e (diff) | |
| download | gitlab-ce-0dc67904c1b8b01e7406fc510cf432c5bfc919fb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5bfda48ca3a..9451f114bae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,14 @@ PATH omniauth-oauth2 (~> 1.7.1) PATH + remote: vendor/gems/omniauth-google-oauth2 + specs: + omniauth-google-oauth2 (0.6.0) + jwt (>= 2.0) + omniauth (>= 1.9, < 3) + omniauth-oauth2 (>= 1.5) + +PATH remote: vendor/gems/omniauth-salesforce specs: omniauth-salesforce (1.0.5) @@ -925,10 +933,6 @@ GEM omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.6.0) - jwt (>= 2.0) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.5) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) @@ -1673,7 +1677,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.4) omniauth-gitlab (~> 4.0.0)! - omniauth-google-oauth2 (~> 0.6.0) + omniauth-google-oauth2 (~> 0.6.0)! omniauth-oauth2-generic (~> 0.2.2) omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 1.10) |