diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-06 03:22:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-06 03:22:21 +0300 |
commit | e622d769cea776ed0ba88321a87bcd3b8a359a4d (patch) | |
tree | 8de73104658f8e963381f94cce9f77d2d48f8619 /doc/user | |
parent | 6fd670b99b45d3374f8b429e87be51dd67d6ab39 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
4 files changed, 8 insertions, 10 deletions
diff --git a/doc/user/packages/maven_repository/index.md b/doc/user/packages/maven_repository/index.md index 118be200a4f..e571c01f6b8 100644 --- a/doc/user/packages/maven_repository/index.md +++ b/doc/user/packages/maven_repository/index.md @@ -17,8 +17,6 @@ Supported clients: - `mvn`. Learn how to build a [Maven](../workflows/build_packages.md#maven) package. - `gradle`. Learn how to build a [Gradle](../workflows/build_packages.md#gradle) package. - `sbt`. - - `sbt` can only be used to [pull dependencies](#install-a-package). - See this [issue 408479](https://gitlab.com/gitlab-org/gitlab/-/issues/408479) for more details. ## Publish to the GitLab package registry diff --git a/doc/user/project/merge_requests/approvals/index.md b/doc/user/project/merge_requests/approvals/index.md index 5436edf9f8d..1210ecc4637 100644 --- a/doc/user/project/merge_requests/approvals/index.md +++ b/doc/user/project/merge_requests/approvals/index.md @@ -25,7 +25,7 @@ group-level settings for merge request approval rules is tracked in this [GitLab Premium](https://about.gitlab.com/pricing/) and [GitLab Ultimate](https://about.gitlab.com/pricing/) self-managed GitLab instances can also configure approvals -[for the entire instance](../../../../administration/admin_area.md). +[for the entire instance](../../../../administration/merge_requests_approvals.md). ## How approvals work @@ -128,7 +128,7 @@ Invalid approval rules created through a scan result policy are presented with ## Related topics - [Merge request approvals API](../../../../api/merge_request_approvals.md) -- [Instance-level approval rules](../../../../administration/admin_area.md) for self-managed installations +- [Instance-level approval rules](../../../../administration/merge_requests_approvals.md) for self-managed installations <!-- ## Troubleshooting diff --git a/doc/user/project/merge_requests/approvals/rules.md b/doc/user/project/merge_requests/approvals/rules.md index 2c5d6b89c0e..2f1e2a96295 100644 --- a/doc/user/project/merge_requests/approvals/rules.md +++ b/doc/user/project/merge_requests/approvals/rules.md @@ -19,7 +19,7 @@ You can define approval rules: You can configure approval rules: -- [At the instance level](../../../../administration/admin_area.md). +- [At the instance level](../../../../administration/merge_requests_approvals.md). If you don't define a [default approval rule](#add-an-approval-rule), any user can approve a merge request. Even if you don't define a rule, you can still diff --git a/doc/user/project/merge_requests/approvals/settings.md b/doc/user/project/merge_requests/approvals/settings.md index f9e40a6714c..fa06fb59bc1 100644 --- a/doc/user/project/merge_requests/approvals/settings.md +++ b/doc/user/project/merge_requests/approvals/settings.md @@ -57,7 +57,7 @@ this setting, unless you configure one of these options: - [Prevent overrides of default approvals](#prevent-editing-approval-rules-in-merge-requests) at the project level. - *(Self-managed instances only)* Prevent overrides of default approvals - [at the instance level](../../../../administration/admin_area.md). When configured + [at the instance level](../../../../administration/merge_requests_approvals.md). When configured at the instance level, you can't edit this setting at the project or individual merge request levels. @@ -68,7 +68,7 @@ this setting, unless you configure one of these options: > - [Feature flag `keep_merge_commits_for_approvals`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131778) removed in GitLab 16.5. This check now includes merge commits. By default, users who commit to a merge request can still approve it. At both -the project level or [instance level](../../../../administration/admin_area.md), +the project level or instance level, you can prevent committers from approving merge requests that are partially their own. To do this: @@ -76,7 +76,7 @@ their own. To do this: 1. In the **Merge request approvals** section, scroll to **Approval settings** and select **Prevent approvals by users who add commits**. If this checkbox is cleared, an administrator has disabled it - [at the instance level](../../../../administration/admin_area.md), and + [at the instance level](../../../../administration/merge_requests_approvals.md), and it can't be changed at the project level. 1. Select **Save changes**. @@ -184,7 +184,7 @@ To do this: You can also enforce merge request approval settings: -- At the [instance level](../../../../administration/admin_area.md), which apply to all groups +- At the [instance level](../../../../administration/merge_requests_approvals.md), which apply to all groups on an instance and, therefore, all projects. - On a [top-level group](../../../group/manage.md#group-merge-request-approval-settings), which apply to all subgroups and projects. @@ -194,6 +194,6 @@ that inherited them. ## Related topics -- [Instance-level merge request approval settings](../../../../administration/admin_area.md) +- [Instance-level merge request approval settings](../../../../administration/merge_requests_approvals.md) - [Compliance center](../../../compliance/compliance_center/index.md) - [Merge request approvals API](../../../../api/merge_request_approvals.md) |