diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-15 00:10:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-15 00:10:41 +0300 |
commit | 80088b7f88992a64ef5253d57838b0b3463ce8b1 (patch) | |
tree | 352d2f2ace742555ec9bcf0fd11361618029623c /doc/user | |
parent | 7d4b2ed7bf75d316577b718c71a9fdef19184539 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/code_owners.md | 18 | ||||
-rw-r--r-- | doc/user/project/merge_requests/approvals/index.md | 17 |
2 files changed, 18 insertions, 17 deletions
diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md index 4fb65608b58..ea7bcce99c1 100644 --- a/doc/user/project/code_owners.md +++ b/doc/user/project/code_owners.md @@ -22,19 +22,19 @@ The GitLab Code Owners feature defines who owns specific files or paths in a repository, allowing other users to understand who is responsible for each file or path. +As an alternative to using Code Owners for approvals, you can instead +[configure rules](merge_requests/approvals/rules.md). + ## Why is this useful? Code Owners allows for a version controlled, single source of truth file outlining the exact GitLab users or groups that -own certain files or paths in a repository. Code Owners can be -used in the merge request approval process which can streamline -the process of finding the right reviewers and approvers for a given -merge request. - -In larger organizations or popular open source projects, Code Owners -can help you understand who to contact if you have -a question that may not be related to code review or a merge request -approval. +own certain files or paths in a repository. In larger organizations +or popular open source projects, Code Owners can help you understand +who to contact if you have a question about a specific portion of +the codebase. Code Owners can also streamline the merge request approval +process, identifying the most relevant reviewers and approvers for a +given change. ## How to set up Code Owners diff --git a/doc/user/project/merge_requests/approvals/index.md b/doc/user/project/merge_requests/approvals/index.md index aa668e85156..1f64eee033c 100644 --- a/doc/user/project/merge_requests/approvals/index.md +++ b/doc/user/project/merge_requests/approvals/index.md @@ -10,14 +10,15 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/merge > Redesign [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1979) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.8 and [feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/10685) in 12.0. -Successful projects depend on code reviews. Merge request approvals clearly communicate -someone's ability to merge proposed changes. Approvals [are optional](#optional-approvals) -in GitLab Free, but you can require them for your project in higher tiers. - -Merge request approvals are configured at the project level. Administrator users -of self-managed GitLab installations can also configure -[instance-level approval rules](../../../admin_area/merge_requests_approvals.md) -that cannot be overridden on a project-level basis. +You can configure your merge requests so that they must be approved before +they can be merged. You can do this by creating [rules](rules.md) or by specifying +a list of users who act as [code owners](../../code_owners.md) for specific files. + +You can configure merge request approvals for each project. In higher GitLab tiers, +Administrators of self-managed GitLab instances can configure approvals +[for the entire instance](../../../admin_area/merge_requests_approvals.md). + +## How approvals work With [merge request approval rules](rules.md), you can set the minimum number of required approvals before work can merge into your project. You can also extend these |