diff options
Diffstat (limited to 'doc/user/group')
-rw-r--r-- | doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png | bin | 61942 -> 17415 bytes | |||
-rw-r--r-- | doc/user/group/saml_sso/troubleshooting_scim.md | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png b/doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png Binary files differindex 519e56acaa5..b253fe336ee 100644 --- a/doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png +++ b/doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png diff --git a/doc/user/group/saml_sso/troubleshooting_scim.md b/doc/user/group/saml_sso/troubleshooting_scim.md index 3dcb2d93096..e5af37e7327 100644 --- a/doc/user/group/saml_sso/troubleshooting_scim.md +++ b/doc/user/group/saml_sso/troubleshooting_scim.md @@ -149,9 +149,9 @@ The first workaround is: 1. Have the end user [link SAML to their existing GitLab.com account](index.md#link-saml-to-your-existing-gitlabcom-account). 1. After the user has done this, initiate a SCIM sync from your identity provider. -If the SCIM sync completes without the same error, GitLab has -successfully linked the SCIM identity to the existing user account, and the user -should now be able to sign in using SAML SSO. + If the SCIM sync completes without the same error, GitLab has + successfully linked the SCIM identity to the existing user account, and the user + should now be able to sign in using SAML SSO. If the error persists, the user most likely already exists, has both a SAML and SCIM identity, and a SCIM identity that is set to `active: false`. To resolve @@ -166,7 +166,7 @@ this: If any of this information does not match, [contact GitLab Support](https://support.gitlab.com/). 1. Use the API to [update the SCIM provisioned user's `active` value to `true`](/ee/development/internal_api/index.md#update-a-single-scim-provisioned-user). 1. If the update returns a status code `204`, have the user attempt to sign in -using SAML SSO. + using SAML SSO. ## Azure Active Directory |