summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-06-17 01:01:30 +0000
committerEvan Read <eread@gitlab.com>2019-06-17 01:01:30 +0000
commit94b6b1abbffb14b334793ba442de1880996d6328 (patch)
tree49e5d919544c07f14cf31268e386e623cb88460d
parent8b5c6a687326b0b5de478185c7e99e4ec60fb8c1 (diff)
parent3e20e2186643d721c034149725d397300ac3005c (diff)
downloadgitlab-ce-94b6b1abbffb14b334793ba442de1880996d6328.tar.gz
Merge branch 'docs-sso-enforce-note' into 'master'
Docs: SSO Groups: Add login session note See merge request gitlab-org/gitlab-ce!29628
-rw-r--r--doc/user/group/saml_sso/index.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index fcfd638f185..26893f7e31e 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -35,6 +35,8 @@ SSO enforcement was:
With this option enabled, users must use your group's GitLab single sign on URL to be added to the group or be added via SCIM. Users cannot be added manually, and may only access project/group resources via the UI by signing in through the SSO URL.
+However, users will not be prompted to log via SSO on each visit. GitLab will check whether a user has authenticated through the SSO link, and will only prompt the user to login via SSO if it has been longer than 7 days.
+
We intend to add a similar SSO requirement for [Git and API activity](https://gitlab.com/gitlab-org/gitlab-ee/issues/9152) in the future.
### NameID