diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2022-06-01 20:33:49 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2022-06-01 20:33:49 +0300 |
| commit | 9a8ae3b4e90e56f71bb770463b943512efdcd1d1 (patch) | |
| tree | 4a791b23a3b7085fa89d2dc300ef1cf0228f01a5 /doc | |
| parent | 8a186dedfc1da12270ea77f2673b59fa08f770c1 (diff) | |
| parent | 39b217000ded81fdbd7ff509dd27895d1952ffc1 (diff) | |
Merge remote-tracking branch 'dev/15-0-stable' into 15-0-stable
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/scim.md | 14 | ||||
| -rw-r--r-- | doc/user/group/subgroups/index.md | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/doc/api/scim.md b/doc/api/scim.md index ab3a181f5be..9c88997b94c 100644 --- a/doc/api/scim.md +++ b/doc/api/scim.md @@ -170,13 +170,13 @@ Returns a `201` status code if successful. Fields that can be updated are: -| SCIM/IdP field | GitLab field | -|:---------------------------------|:---------------------------------------| -| `id/externalId` | `extern_uid` | -| `name.formatted` | `name` | -| `emails\[type eq "work"\].value` | `email` | -| `active` | Identity removal if `active` = `false` | -| `userName` | `username` | +| SCIM/IdP field | GitLab field | +|:---------------------------------|:-----------------------------------------------------------------------------| +| `id/externalId` | `extern_uid` | +| `name.formatted` | `name` ([Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/363058)) | +| `emails\[type eq "work"\].value` | `email` ([Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/363058)) | +| `active` | Identity removal if `active` = `false` | +| `userName` | `username` ([Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/363058)) | ```plaintext PATCH /api/scim/v2/groups/:group_path/Users/:id diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index 2cddbaa9723..5f3c859d15a 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -93,6 +93,9 @@ For more information, view the [permissions table](../../permissions.md#group-me ## Subgroup membership +NOTE: +There is a bug that causes some pages in the parent group to be accessible by subgroup members. For more details, see [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/340421). + When you add a member to a group, that member is also added to all subgroups. The user's permissions are inherited from the group's parent. |