diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 20:30:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 20:30:09 +0300 |
commit | 858d175c1527d650ea5d83e201777d0cf8ae84c9 (patch) | |
tree | 147344d5699ea84eda6f980867e4d2045e0f22b9 /doc/user | |
parent | f6262510e6642bb91d112f1bf2ea70db8b7b772c (diff) |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/group/manage.md | 71 | ||||
-rw-r--r-- | doc/user/project/issues/managing_issues.md | 8 | ||||
-rw-r--r-- | doc/user/tasks.md | 10 |
3 files changed, 74 insertions, 15 deletions
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md index fc72b81d74c..d21dbe357da 100644 --- a/doc/user/group/manage.md +++ b/doc/user/group/manage.md @@ -549,6 +549,77 @@ To enable group file templates: 1. Choose a project to act as the template repository. 1. Select **Save changes**. +## Group merge checks settings **(PREMIUM)** + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/372040) in GitLab 15.9 [with a flag](../../administration/feature_flags.md) name `support_group_level_merge_checks_setting`. Disabled by default. + +FLAG: +On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to +[enable the feature flag](../../administration/feature_flags.md) named `support_group_level_merge_checks_setting`. On GitLab.com, this feature is not +available. + +Group owners can set up merge request checks on a top-level group, which apply to all subgroups and projects. + +If the settings are inherited by a subgroup or project, they cannot be changed in the subgroup or project +that inherited them. + +### Require a successful pipeline for merge + +You can configure all child projects in your group to require a complete and successful pipeline before +merge. + +See also [the project-level setting](../project/merge_requests/merge_when_pipeline_succeeds.md#require-a-successful-pipeline-for-merge). + +Prerequisites: + +- You must be the owner of the group. + +To enable this setting: + +1. On the top bar, select **Main menu > Groups** and find your group. +1. On the left sidebar, select **Settings > General**. +1. Expand **Merge requests**. +1. Under **Merge checks**, select **Pipelines must succeed**. + This setting also prevents merge requests from being merged if there is no pipeline. +1. Select **Save changes**. + +#### Allow merge after skipped pipelines + +You can configure [skipped pipelines](../../ci/pipelines/index.md#skip-a-pipeline) from preventing merge requests from being merged. + +See also [the project-level setting](../project/merge_requests/merge_when_pipeline_succeeds.md#allow-merge-after-skipped-pipelines). + +Prerequisite: + +- You must be the owner of the group. + +To change this behavior: + +1. On the top bar, select **Main menu > Groups** and find your group. +1. On the left sidebar, select **Settings > General**. +1. Expand **Merge requests**. +1. Under **Merge checks**: + - Select **Pipelines must succeed**. + - Select **Skipped pipelines are considered successful**. +1. Select **Save changes**. + +### Prevent merge unless all threads are resolved + +You can prevent merge requests from being merged until all threads are resolved. When this setting is enabled, for all child projects in your group, the +**Unresolved threads** count in a merge request is shown in orange when at least one thread remains unresolved. + +Prerequisite: + +- You must be the owner of the group. + +To enable this setting: + +1. On the top bar, select **Main menu > Groups** and find your group. +1. On the left sidebar, select **Settings > General**. +1. Expand **Merge requests**. +1. Under **Merge checks**, select **All threads must be resolved**. +1. Select **Save changes**. + ## Group merge request approval settings **(PREMIUM)** > - [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. diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md index 953d08ea903..c16074ea1d8 100644 --- a/doc/user/project/issues/managing_issues.md +++ b/doc/user/project/issues/managing_issues.md @@ -24,13 +24,7 @@ To edit an issue: ### Remove a task list item -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/377307) in GitLab 15.9 [with a flag](../../../administration/feature_flags.md) named `work_items_mvc`. Disabled by default. - -FLAG: -On self-managed GitLab, by default this feature is not available. -To make it available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `work_items_mvc`. -On GitLab.com, this feature is not available. -The feature is not ready for production use. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/377307) in GitLab 15.9. Prerequisites: diff --git a/doc/user/tasks.md b/doc/user/tasks.md index 42a3975a9d2..0fc4c7571ab 100644 --- a/doc/user/tasks.md +++ b/doc/user/tasks.md @@ -58,15 +58,9 @@ To create a task: 1. Enter the task title. 1. Select **Create task**. -### Create a task from a task list item +### From a task list item -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/377307) in GitLab 15.9 [with a flag](../administration/feature_flags.md) named `work_items_mvc`. Disabled by default. - -FLAG: -On self-managed GitLab, by default this feature is not available. -To make it available, ask an administrator to [enable the feature flag](../administration/feature_flags.md) named `work_items_mvc`. -On GitLab.com, this feature is not available. -The feature is not ready for production use. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/377307) in GitLab 15.9. Prerequisites: |