diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-21 03:09:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-21 03:09:28 +0300 |
| commit | b1031060f00cdb201cf8d790c6ec6421860c30f3 (patch) | |
| tree | 44b572f9df4a5696d4378bc7848f19ac79e02cbd /doc/user | |
| parent | cfd505b1984183857fcfeab259c5a38791205914 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/application_security/container_scanning/index.md | 2 | ||||
| -rw-r--r-- | doc/user/group/index.md | 25 | ||||
| -rw-r--r-- | doc/user/markdown.md | 2 |
3 files changed, 27 insertions, 2 deletions
diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index 2b3d4dbfc0a..0e5399f9d56 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -397,7 +397,7 @@ For details on saving and transporting Docker images as a file, see Docker's doc We recommend that you set up a [scheduled pipeline](../../../ci/pipelines/schedules.md) to fetch the latest vulnerabilities database on a preset schedule. Automating this with a pipeline means you do not have to do it manually each time. You can use the -following `.gitlab-yml.ci` example as a template. +following `.gitlab-ci.yml` example as a template. ```yaml variables: diff --git a/doc/user/group/index.md b/doc/user/group/index.md index caf874cfe28..1b1118aa2f3 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -732,6 +732,31 @@ The group's new subgroups have push rules set for them based on either: - The closest parent group with push rules defined. - Push rules set at the instance level, if no parent groups have push rules defined. +## Group approval rules **(ULTIMATE)** + +> Introduced in GitLab 13.9. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../administration/feature_flags.md), disabled by default. + +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. + +Group approval rules are an in-development feature that provides an interface for managing +[project merge request approval rules](../project/merge_requests/approvals/index.md) at the +top-level group level. + +The feature is limited to the user interface but the following merge requests extend the UI to: + +- [Enforce group settings on projects](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69750). +- [Cascade group settings onto projects](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68476). + +To view the merge request approval rules UI for a group: + +1. Go to the top-level group's **Settings > General** page. +1. Expand the **Merge request approvals** section. +1. Select the settings you want. +1. Select **Save changes**. + ## Related topics - [Group wikis](../project/wiki/index.md) diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 5eab5fcb513..5e600b6e0d1 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -524,7 +524,7 @@ GitLab Flavored Markdown recognizes the following: | specific user | `@user_name` | | | | specific group | `@group_name` | | | | entire team | `@all` | | | -| project | `namespace/project` | | | +| project | `namespace/project>` | | | | issue | ``#123`` | `namespace/project#123` | `project#123` | | merge request | `!123` | `namespace/project!123` | `project!123` | | snippet | `$123` | `namespace/project$123` | `project$123` | |