diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-07 03:08:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-07 03:08:33 +0300 |
commit | c9a3dc1c2464a92a8f2a5c2f4f30883aa9f976f1 (patch) | |
tree | a56df6907c26f0aa59f2c6e211e0cc7aea61e026 /doc/user/project/merge_requests/approvals/settings.md | |
parent | aa74b7b4c5f326e82fcd6bb681296dce435ea024 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/merge_requests/approvals/settings.md')
-rw-r--r-- | doc/user/project/merge_requests/approvals/settings.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/approvals/settings.md b/doc/user/project/merge_requests/approvals/settings.md index fb5244a63ec..c3358e0d90f 100644 --- a/doc/user/project/merge_requests/approvals/settings.md +++ b/doc/user/project/merge_requests/approvals/settings.md @@ -114,7 +114,11 @@ When this field is changed, it can affect all open merge requests depending on t ## Require user re-authentication to approve -> SAML authentication for GitLab.com groups [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5981) in GitLab 16.6. +> Requiring re-authentication by using SAML authentication for GitLab.com groups [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5981) in GitLab 16.6 [with a flag](../../../../administration/feature_flags.md) named `ff_require_saml_auth_to_approve`. Disabled by default. + +FLAG: +On self-managed GitLab, by default requiring re-authentication by using SAML authentication is not available. To make it available, an administrator can +[enable the feature flag](../../../../administration/feature_flags.md) named `ff_require_saml_auth_to_approve`. On GitLab.com, this feature is not available. You can force potential approvers to first authenticate with either: |