diff options
| author | James Lopez <james@gitlab.com> | 2018-03-15 18:01:13 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-03-21 17:43:47 +0300 |
| commit | 140cb0c092151636463a2222ce3fc2267f621d3a (patch) | |
| tree | a1338289fd405b9e617ed7e01728b086be820da6 /Gemfile.lock | |
| parent | 95ced3bb5fa52e166aa03ee592f63180601cbde7 (diff) | |
Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'
[10.6] Fix GitLab Auth0 integration signs in the wrong user
See merge request gitlab/gitlabhq!2354
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 f063edccc66..e210a522028 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -527,8 +527,8 @@ GEM omniauth (1.4.3) hashie (>= 1.2, < 4) rack (>= 1.6.2, < 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) @@ -1105,7 +1105,7 @@ DEPENDENCIES oauth2 (~> 1.4) octokit (~> 4.8) 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) |