summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2018-03-15 15:01:13 +0000
committerMark Fletcher <mark@gitlab.com>2018-03-21 14:43:47 +0000
commit140cb0c092151636463a2222ce3fc2267f621d3a (patch)
treea1338289fd405b9e617ed7e01728b086be820da6 /doc/integration
parent95ced3bb5fa52e166aa03ee592f63180601cbde7 (diff)
downloadgitlab-ce-140cb0c092151636463a2222ce3fc2267f621d3a.tar.gz
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 'doc/integration')
-rw-r--r--doc/integration/auth0.md7
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' }
}
```