diff options
author | James Lopez <james@gitlab.com> | 2018-03-15 14:59:21 +0000 |
---|---|---|
committer | Mark Fletcher <mark@gitlab.com> | 2018-03-16 12:57:58 +0000 |
commit | 7fca314680776995b4e6858b55001a4bf56bf17a (patch) | |
tree | b00df8878203d7e19fb8e7e5902a0fe8e86e6478 /doc | |
parent | 254529300eeb0a11e50e0b2ebc1abecf9908f13e (diff) | |
download | gitlab-ce-7fca314680776995b4e6858b55001a4bf56bf17a.tar.gz |
Merge branch 'fix/auth0-unsafe-login-10-5' into 'security-10-5'
[10.5] Fix GitLab Auth0 integration signs in the wrong user
See merge request gitlab/gitlabhq!2353
Diffstat (limited to 'doc')
-rw-r--r-- | doc/integration/auth0.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/integration/auth0.md b/doc/integration/auth0.md index c39d7ab57c6..a75836a915a 100644 --- a/doc/integration/auth0.md +++ b/doc/integration/auth0.md @@ -56,7 +56,8 @@ for initial settings. "name" => "auth0", "args" => { client_id: 'YOUR_AUTH0_CLIENT_ID', client_secret: 'YOUR_AUTH0_CLIENT_SECRET', - namespace: 'YOUR_AUTH0_DOMAIN' + domain: 'YOUR_AUTH0_DOMAIN', + scope: 'openid profile email' } } ] @@ -69,8 +70,8 @@ for initial settings. args: { client_id: 'YOUR_AUTH0_CLIENT_ID', client_secret: 'YOUR_AUTH0_CLIENT_SECRET', - namespace: 'YOUR_AUTH0_DOMAIN' - } + domain: 'YOUR_AUTH0_DOMAIN', + scope: 'openid profile email' } } ``` |