Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2018-03-15 18:58:18 +0300
committerMark Fletcher <mark@gitlab.com>2018-03-16 14:58:24 +0300
commit7dd97985d11369c62056a4b91b7a88c88443c641 (patch)
tree45b4bbf78f37572376d576abd1b2ae2281deef9a /doc/integration
parent4b55923402f75ce7651bc173f2c3b46b397b7c88 (diff)
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 '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' }
}
```