diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 15:10:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 15:10:00 +0300 |
| commit | 14a32c2d551a646525b1fabd93cb70a0e6924478 (patch) | |
| tree | 782ba91ba786aee2cda379704e7f2ebcb5b46748 /doc/integration | |
| parent | 11c2f3b08c3bab4718a97360d1502f90793d028b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/omniauth.md | 8 | ||||
| -rw-r--r-- | doc/integration/saml.md | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 61019915c52..66d4ccb871f 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -379,8 +379,12 @@ but we'd like to at least help those with specific needs. ## Keep OmniAuth user profiles up to date -You can enable profile syncing from selected OmniAuth providers. You can sync -all or specific user information. +You can enable profile syncing from selected OmniAuth providers. +You can sync any combination of the following user attributes: + +- `name` +- `email` +- `location` When authenticating using LDAP, the user's name and email are always synced. diff --git a/doc/integration/saml.md b/doc/integration/saml.md index 24b5e6152a5..888dd47a968 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -734,6 +734,10 @@ For a full list of supported assertions, see the [OmniAuth SAML gem](https://git ## Configure users based on SAML group membership +NOTE: +SAML Group Sync is only supported for the [SAML provider named `saml`](#configure-gitlab-to-use-multiple-saml-idps). +As a result, SAML Group Sync only supports a single SAML provider. For more information, see [issue 366450](https://gitlab.com/gitlab-org/gitlab/-/issues/366450). + You can: - Require users to be members of a certain group. @@ -749,7 +753,7 @@ Support for these groups depends on: - Whether you've installed [GitLab Enterprise Edition (EE)](https://about.gitlab.com/install/). - The [name of the SAML provider](#configure-saml-support-in-gitlab). Group memberships are only supported by a single SAML provider named - `saml`. For more information, see [issue 386605](https://gitlab.com/gitlab-org/gitlab/-/issues/386605). + `saml`. | Group | Tier | GitLab Enterprise Edition (EE) Only? | |------------------------------|--------------------|--------------------------------------| |