diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-01 03:13:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-01 03:13:18 +0000 |
| commit | b42648225b016a6c7645befded54a93332661526 (patch) | |
| tree | bb6d636102c77d0a74c26301107b7af4d96947bf | |
| parent | 09237b02b51ab32cb23cde2b7eb66e47d4ef4702 (diff) | |
| download | gitlab-ce-b42648225b016a6c7645befded54a93332661526.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/integration/saml.md | 6 | ||||
| -rw-r--r-- | doc/user/group/index.md | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md index 876eb7ba80b..a2955c4df48 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -269,7 +269,7 @@ Example: idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8', idp_sso_target_url: 'https://login.example.com/idp', issuer: 'https://gitlab.example.com', - name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' + name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent' } } ``` @@ -311,7 +311,7 @@ The requirements are the same as the previous settings: idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8', idp_sso_target_url: 'https://login.example.com/idp', issuer: 'https://gitlab.example.com', - name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' + name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent' } } ``` @@ -335,7 +335,7 @@ The requirements are the same as the previous settings: idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8', idp_sso_target_url: 'https://login.example.com/idp', issuer: 'https://gitlab.example.com', - name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' + name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent' } } ``` diff --git a/doc/user/group/index.md b/doc/user/group/index.md index 5cc0de9cdd3..ca33a2fd02a 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -736,14 +736,13 @@ The group's new subgroups have push rules set for them based on either: ## Group approval rules **(PREMIUM)** -> Introduced in GitLab 13.9. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../administration/feature_flags.md), disabled by default. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/285458) in GitLab 13.9. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../administration/feature_flags.md), disabled by default. +> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/285410) in GitLab 14.5. FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, -per group, ask an administrator to [enable the `group_merge_request_approval_settings_feature_flag` flag](../../administration/feature_flags.md). -The feature is not ready for production use. +On self-managed GitLab, by default this feature is available. To hide the feature per group, ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `group_merge_request_approval_settings_feature_flag`. On GitLab.com, this feature is available. -Group approval rules are an in-development feature that provides an interface for managing +Group approval rules provides an interface for managing [project merge request approval rules](../project/merge_requests/approvals/index.md) at the top-level group level. When rules are configured [at the instance level](../admin_area/merge_requests_approvals.md), you can't edit locked rules. |