Commit 6db586a8 authored by Suzanne Selhorn's avatar Suzanne Selhorn

Merge branch 'docs-dgruesso-scm-codereview' into 'master'

Docs: clarify connection between SCM and code review in shared features

See merge request gitlab-org/gitlab!61010
parents afd1e93f 371b90f3
...@@ -22,19 +22,19 @@ The GitLab Code Owners feature defines who owns specific ...@@ -22,19 +22,19 @@ The GitLab Code Owners feature defines who owns specific
files or paths in a repository, allowing other users to understand files or paths in a repository, allowing other users to understand
who is responsible for each file or path. 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? ## Why is this useful?
Code Owners allows for a version controlled, single source of Code Owners allows for a version controlled, single source of
truth file outlining the exact GitLab users or groups that truth file outlining the exact GitLab users or groups that
own certain files or paths in a repository. Code Owners can be own certain files or paths in a repository. In larger organizations
used in the merge request approval process which can streamline or popular open source projects, Code Owners can help you understand
the process of finding the right reviewers and approvers for a given who to contact if you have a question about a specific portion of
merge request. the codebase. Code Owners can also streamline the merge request approval
process, identifying the most relevant reviewers and approvers for a
In larger organizations or popular open source projects, Code Owners given change.
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.
## How to set up Code Owners ## How to set up Code Owners
......
...@@ -10,14 +10,15 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/merge ...@@ -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. > 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 You can configure your merge requests so that they must be approved before
someone's ability to merge proposed changes. Approvals [are optional](#optional-approvals) they can be merged. You can do this by creating [rules](rules.md) or by specifying
in GitLab Free, but you can require them for your project in higher tiers. a list of users who act as [code owners](../../code_owners.md) for specific files.
Merge request approvals are configured at the project level. Administrator users You can configure merge request approvals for each project. In higher GitLab tiers,
of self-managed GitLab installations can also configure Administrators of self-managed GitLab instances can configure approvals
[instance-level approval rules](../../../admin_area/merge_requests_approvals.md) [for the entire instance](../../../admin_area/merge_requests_approvals.md).
that cannot be overridden on a project-level basis.
## How approvals work
With [merge request approval rules](rules.md), you can set the minimum number of 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 required approvals before work can merge into your project. You can also extend these
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment