diff options
author | Rémy Coutable <remy@rymai.me> | 2018-11-06 08:23:14 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-11-06 08:23:14 +0000 |
commit | 836ab5f7a189129d381ee55972415ce68023f1a1 (patch) | |
tree | 30822b7de20e7c8efa238cea080486f5376b3859 | |
parent | 84f562e7040f1da818157853de84874d57135ca9 (diff) | |
parent | a9b3f0811ae95e79e56abbfbfa8e0d1851a87b94 (diff) | |
download | gitlab-ce-836ab5f7a189129d381ee55972415ce68023f1a1.tar.gz |
Merge branch 'dimitrieh-master-patch-39313' into 'master'
Includes the way approvals are handled to the documentation
Closes #52929
See merge request gitlab-org/gitlab-ce!22498
-rw-r--r-- | doc/development/code_review.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 3fe79943fdc..96f3861f8d7 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -23,6 +23,9 @@ one of the [Merge request coaches][team]. Depending on the areas your merge request touches, it must be **approved** by one or more [maintainers](https://about.gitlab.com/handbook/engineering/#maintainer): +For approvals, we use the approval functionality found in the merge request +widget. Reviewers can add their approval by [approving additionally](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#adding-or-removing-an-approval). + 1. If your merge request includes backend changes [^1], it must be **approved by a [backend maintainer](https://about.gitlab.com/handbook/engineering/projects/#gitlab-ce_maintainers_backend)**. 1. If your merge request includes frontend changes [^1], it must be @@ -97,6 +100,9 @@ If a developer who happens to also be a maintainer was involved in a merge reque as a domain expert and/or reviewer, it is recommended that they are not also picked as the maintainer to ultimately approve and merge it. +Maintainers should check before merging if the merge request is approved by the +required approvers. + ## Best practices ### Everyone |