diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-08 21:14:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-08 21:14:31 +0300 |
| commit | bb0d99269b1bee11939e6a3ddfcefed8c6fd4874 (patch) | |
| tree | 58f5d3f64251e1847a1bfb77d76ead2abb16c899 /doc/integration | |
| parent | f1ce233e6ab6535afef76f10528e104672426710 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/saml.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md index 5beff3af5b4..6a312f76388 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -38,8 +38,8 @@ For more information on: gitlab_rails['omniauth_block_auto_created_users'] = false ``` -1. Optional. You can automatically link SAML users with existing GitLab users if their - email addresses match by adding the following setting in `/etc/gitlab/gitlab.rb`: +1. Optional. You should automatically link a first-time SAML sign-in with existing GitLab users if their + email addresses match. To do this, add the following setting in `/etc/gitlab/gitlab.rb`: ```ruby gitlab_rails['omniauth_auto_link_saml_user'] = true @@ -728,6 +728,9 @@ On GitLab.com, Microsoft Azure/Entra ID attributes are introduced [with a flag](../administration/feature_flags.md) named `saml_microsoft_attribute_names`. On GitLab.com, this feature is unavailable but can be configured by GitLab.com administrators only. +NOTE: +The attributes are case-sensitive. + | Field | Supported default keys | |-----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Email (required)| `email`, `mail`, `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress`, `http://schemas.microsoft.com/ws/2008/06/identity/claims/emailaddress` | |