diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 00:08:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 00:08:11 +0000 |
commit | 93dcf45d441bc884b167f4338380c8c888e9b86f (patch) | |
tree | f55e8c1d39013380d1ff7d2a4e3cca537a35192a /doc/administration | |
parent | 0e68afab211a172b862a7acc774e1eda5da8e471 (diff) | |
download | gitlab-ce-93dcf45d441bc884b167f4338380c8c888e9b86f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/troubleshooting/group_saml_scim.md | 18 | ||||
-rw-r--r-- | doc/administration/troubleshooting/img/Okta-SAMLsetup.png | bin | 0 -> 53899 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/Okta-advancedsettings.png | bin | 0 -> 47658 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/Okta-attributes.png | bin | 0 -> 22228 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/Okta-linkscert.png | bin | 0 -> 159197 bytes |
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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew file mode 100644 index 00000000000..33e6b3cc53e --- /dev/null +++ b/doc/administration/troubleshooting/img/Okta-linkscert.png |