summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrew Davis <abd3721@gmail.com>2017-10-26 00:40:19 +0000
committerAndrew Davis <abd3721@gmail.com>2017-10-26 00:40:19 +0000
commitacfa9090ec51a5944c4b330330075c4a47bc6cf1 (patch)
treee4bfb5f4598147cd636cdd658f0901fd1b29429b /doc
parent3ddffec0d62146e27298a982a7d2935dbe518fb9 (diff)
downloadgitlab-ce-acfa9090ec51a5944c4b330330075c4a47bc6cf1.tar.gz
Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups.
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/saml.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index b5b245c626f..3ae98adc465 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -132,14 +132,17 @@ On the sign in page there should now be a SAML button below the regular sign in
Click the icon to begin the authentication process. If everything goes well the user
will be returned to GitLab and will be signed in.
-## External Groups
+## Marking Users as External based on SAML Groups
>**Note:**
This setting is only available on GitLab 8.7 and above.
-SAML login includes support for external groups. You can define in the SAML
-settings which groups, to which your users belong in your IdP, you wish to be
-marked as [external](../user/permissions.md).
+SAML login includes support for automatically identifying whether a user should
+be considered an [external](../user/permissions.md) user based on the user's group
+membership in the SAML identity provider. This feature **does not** allow you to
+automatically add users to GitLab [Groups](../user/group/index.md), it simply
+allows you to mark users as External if they are members of certain groups in the
+Identity Provider.
### Requirements