diff options
| author | James Lopez <james@gitlab.com> | 2018-03-15 15:58:18 +0000 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-03-16 11:58:24 +0000 |
| commit | 7dd97985d11369c62056a4b91b7a88c88443c641 (patch) | |
| tree | 45b4bbf78f37572376d576abd1b2ae2281deef9a /Gemfile.lock | |
| parent | 4b55923402f75ce7651bc173f2c3b46b397b7c88 (diff) | |
| download | gitlab-ce-7dd97985d11369c62056a4b91b7a88c88443c641.tar.gz | |
Merge branch 'fix/auth0-unsafe-login-10-4' into 'security-10-4'
[10.4] Fix GitLab Auth0 integration signs in the wrong user
See merge request gitlab/gitlabhq!2352
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c5604d5ec6f..0833449de22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -525,8 +525,8 @@ GEM omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) - omniauth-oauth2 (~> 1.1) + omniauth-auth0 (2.0.0) + omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1) omniauth-azure-oauth2 (0.0.9) @@ -1100,7 +1100,7 @@ DEPENDENCIES octokit (~> 4.6.2) oj (~> 2.17.4) omniauth (~> 1.4.2) - omniauth-auth0 (~> 1.4.1) + omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) |