Add latest changes from gitlab-org/gitlab@master

5 files changed, 18 insertions, 0 deletions

diff --git a/doc/administration/troubleshooting/group_saml_scim.md b/doc/administration/troubleshooting/group_saml_scim.md
index 7c2733d9d63..e2ce72d5a16 100644
--- a/doc/administration/troubleshooting/group_saml_scim.md
+++ b/doc/administration/troubleshooting/group_saml_scim.md
@@ -38,6 +38,24 @@ SCIM mapping:
 
 ![Azure AD SCIM](img/AzureAD-scim_attribute_mapping.png)
 
+## Okta
+
+Basic SAML app configuration:
+
+![Okta basic SAML](img/Okta-SAMLsetup.png)
+
+User claims and attributes:
+
+![Okta Attributes](img/Okta-attributes.png)
+
+Advanced SAML app settings (defaults):
+
+![Okta Advanced Settings](img/Okta-advancedsettings.png)
+
+IdP Links and Certificate:
+
+![Okta Links and Certificate](img/Okta-linkscert.png)
+
 ## OneLogin
 
 Application details:
diff --git a/doc/administration/troubleshooting/img/Okta-SAMLsetup.png b/doc/administration/troubleshooting/img/Okta-SAMLsetup.png
new file mode 100644
index 00000000000..8171febb5bc
--- /dev/null
+++ b/doc/administration/troubleshooting/img/Okta-SAMLsetup.png
diff --git a/doc/administration/troubleshooting/img/Okta-advancedsettings.png b/doc/administration/troubleshooting/img/Okta-advancedsettings.png
new file mode 100644
index 00000000000..43eb546f238
--- /dev/null
+++ b/doc/administration/troubleshooting/img/Okta-advancedsettings.png
diff --git a/doc/administration/troubleshooting/img/Okta-attributes.png b/doc/administration/troubleshooting/img/Okta-attributes.png
new file mode 100644
index 00000000000..e4a7b33fe55
--- /dev/null
+++ b/doc/administration/troubleshooting/img/Okta-attributes.png
diff --git a/doc/administration/troubleshooting/img/Okta-linkscert.png b/doc/administration/troubleshooting/img/Okta-linkscert.png
new file mode 100644
index 00000000000..33e6b3cc53e
--- /dev/null
+++ b/doc/administration/troubleshooting/img/Okta-linkscert.png