summaryrefslogtreecommitdiff
path: root/doc/integration/saml.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 03:08:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 03:08:55 +0000
commit500626a5c953ad81cfc3ed74bf0148c075617e58 (patch)
tree554e385e0e548f15fc90388da8b73622b803d6f3 /doc/integration/saml.md
parentb133cb2468b412683dbc5f19492d98b2ffa47d09 (diff)
downloadgitlab-ce-500626a5c953ad81cfc3ed74bf0148c075617e58.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/saml.md')
-rw-r--r--doc/integration/saml.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index c5c918e4282..10319b83233 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -243,7 +243,7 @@ considered `admin groups`.
>**Note:**
This setting is only available on GitLab 11.4 EE and above.
-This setting also follows the requirements documented for the `External Groups` setting. GitLab uses the Group information provided by your IdP to determine if a user should be assigned the `auditor` role.
+This setting also follows the requirements documented for the `External Groups` setting. GitLab uses the Group information provided by your IdP to determine if a user should be assigned the `auditor` role.
```yaml
{ name: 'saml',
@@ -374,7 +374,7 @@ in the OmniAuth [info hash](https://github.com/omniauth/omniauth/wiki/Auth-Hash-
For example, if your SAMLResponse contains an Attribute called 'EmailAddress',
specify `{ email: ['EmailAddress'] }` to map the Attribute to the
-corresponding key in the info hash. URI-named Attributes are also supported, e.g.
+corresponding key in the info hash. URI-named Attributes are also supported, e.g.
`{ email: ['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'] }`.
This setting allows you tell GitLab where to look for certain attributes required