From ed0d55ded7a03c8d5da501d3c86b38084f695cae Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 2 Sep 2021 09:11:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/integration/jira/dvcs.md | 2 +- doc/integration/openid_connect_provider.md | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'doc/integration') diff --git a/doc/integration/jira/dvcs.md b/doc/integration/jira/dvcs.md index 14259628543..0c2dfd2b92e 100644 --- a/doc/integration/jira/dvcs.md +++ b/doc/integration/jira/dvcs.md @@ -79,7 +79,7 @@ maintenance does not affect your integration. generated `Redirect URL` from [Linking GitLab accounts with Jira](https://confluence.atlassian.com/adminjiraserver/linking-gitlab-accounts-1027142272.html). - *For GitLab versions 13.0 and later* **and** *Jira Cloud,* use `https:///login/oauth/callback`. - - *For GitLab versions 11.3 and later,* use `https:///login/oauth/callback`. + - *For GitLab versions 11.3 and later* **and** *Jira versions 8.13 and earlier,* use `https:///login/oauth/callback`. If you use GitLab.com, the URL is `https://gitlab.com/login/oauth/callback`. - *For GitLab versions 11.2 and earlier,* use `https:///-/jira/login/oauth/callback`. diff --git a/doc/integration/openid_connect_provider.md b/doc/integration/openid_connect_provider.md index 84457485382..dd65fb4822a 100644 --- a/doc/integration/openid_connect_provider.md +++ b/doc/integration/openid_connect_provider.md @@ -49,6 +49,7 @@ The following user information is shared with clients: | `website` | `string` | URL for the user's website | `profile` | `string` | URL for the user's GitLab profile | `picture` | `string` | URL for the user's GitLab avatar -| `groups` | `array` | Names of the groups the user is a member of +| `groups` | `array` | Paths for the groups the user is a member of, either directly or through an ancestor group. +| `groups_direct` | `array` | Paths for the groups the user is a direct member of. -The claims `sub`, `sub_legacy`, `email` and `email_verified` are included in the ID token, all other claims are available from the `/oauth/userinfo` endpoint used by OIDC clients. +The claims `sub`, `sub_legacy`, `email`, `email_verified` and `groups_direct` are included in the ID token. All other claims are available from the `/oauth/userinfo` endpoint used by OIDC clients. -- cgit v1.2.3