Add latest changes from gitlab-org/gitlab@master

9 files changed, 57 insertions, 0 deletions

diff --git a/doc/administration/troubleshooting/group_saml_scim.md b/doc/administration/troubleshooting/group_saml_scim.md
new file mode 100644
index 00000000000..109379f98ca
--- /dev/null
+++ b/doc/administration/troubleshooting/group_saml_scim.md
@@ -0,0 +1,57 @@
+---
+type: reference
+---
+
+# Group SAML and SCIM troubleshooting **(SILVER ONLY)**
+
+These are notes and screenshots regarding Group SAML and SCIM that the GitLab Support Team sometimes uses while troubleshooting, but which do not fit into the official documentation. GitLab is making this public, so that anyone can make use of the Support team’s collected knowledge.
+
+Please refer to GitLab's [Group SAML](../../user/group/saml_sso/index.md) docs for information on the feature and how to set it up.
+
+When troubleshooting a SAML configuration, GitLab team members will frequently start with the [SAML troubleshooting section](../../user/group/saml_sso/index.md#troubleshooting).
+
+They may then set up a test configuration of the desired identity provider. We include example screenshots in this section.
+
+## SAML and SCIM screenshots
+
+This section includes relevant screenshots of the following example configurations of [Group SAML](../../user/group/saml_sso/index.md) and [Group SCIM](../../user/group/saml_sso/scim_setup.md):
+
+- [Azure Active Directory](#azure-active-directory)
+- [OneLogin](#onelogin)
+
+CAUTION: **Caution:**
+These screenshots are updated only as needed by GitLab Support. They are **not** official documentation.
+
+If you are currently having an issue with GitLab, you may want to check your [support options](https://about.gitlab.com/support/).
+
+## Azure Active Directory
+
+Basic SAML app configuration:
+
+![Azure AD basic SAML](img/AzureAD-basic_SAML.png)
+
+User claims and attributes:
+
+![Azure AD user claims](img/AzureAD-claims.png)
+
+SCIM mapping:
+
+![Azure AD SCIM](img/AzureAD-scim_attribute_mapping.png)
+
+## OneLogin
+
+Application details:
+
+![OneLogin application details](img/OneLogin-app_details.png)
+
+Parameters:
+
+![OneLogin application details](img/OneLogin-parameters.png)
+
+Adding a user:
+
+![OneLogin user add](img/OneLogin-userAdd.png)
+
+SSO settings:
+
+![OneLogin SSO settings](img/OneLogin-SSOsettings.png)
diff --git a/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png b/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png
new file mode 100644
index 00000000000..be420b1a3de
--- /dev/null
+++ b/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png
diff --git a/doc/administration/troubleshooting/img/AzureAD-claims.png b/doc/administration/troubleshooting/img/AzureAD-claims.png
new file mode 100644
index 00000000000..ef594390ce0
--- /dev/null
+++ b/doc/administration/troubleshooting/img/AzureAD-claims.png
diff --git a/doc/administration/troubleshooting/img/AzureAD-scim_attribute_mapping.png b/doc/administration/troubleshooting/img/AzureAD-scim_attribute_mapping.png
new file mode 100644
index 00000000000..933d8fb6f36
--- /dev/null
+++ b/doc/administration/troubleshooting/img/AzureAD-scim_attribute_mapping.png
diff --git a/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png b/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png
new file mode 100644
index 00000000000..72737b9a017
--- /dev/null
+++ b/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png
diff --git a/doc/administration/troubleshooting/img/OneLogin-app_details.png b/doc/administration/troubleshooting/img/OneLogin-app_details.png
new file mode 100644
index 00000000000..3e36a001d1b
--- /dev/null
+++ b/doc/administration/troubleshooting/img/OneLogin-app_details.png
diff --git a/doc/administration/troubleshooting/img/OneLogin-encryption.png b/doc/administration/troubleshooting/img/OneLogin-encryption.png
new file mode 100644
index 00000000000..a1b90873a5a
--- /dev/null
+++ b/doc/administration/troubleshooting/img/OneLogin-encryption.png
diff --git a/doc/administration/troubleshooting/img/OneLogin-parameters.png b/doc/administration/troubleshooting/img/OneLogin-parameters.png
new file mode 100644
index 00000000000..c9ff4f8f018
--- /dev/null
+++ b/doc/administration/troubleshooting/img/OneLogin-parameters.png
diff --git a/doc/administration/troubleshooting/img/OneLogin-userAdd.png b/doc/administration/troubleshooting/img/OneLogin-userAdd.png
new file mode 100644
index 00000000000..c7187fe5dd6
--- /dev/null
+++ b/doc/administration/troubleshooting/img/OneLogin-userAdd.png