summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitrie Hoekstra <dimitrie@gitlab.com>2018-10-23 14:16:46 +0000
committerDimitrie Hoekstra <dimitrie@gitlab.com>2018-10-23 14:16:46 +0000
commit305892200f000413db8d064d72a04e0be9ecee34 (patch)
tree0957f7eabfee166e7e6a39471ba5f63805098772
parent6fb74139e56499c2f0ad154fbc8473bb457f3df9 (diff)
downloadgitlab-ce-dimitrieh-master-patch-39313.tar.gz
Improve wording according to feedbackdimitrieh-master-patch-39313
-rw-r--r--doc/development/code_review.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 6389143eecf..96f3861f8d7 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -9,7 +9,7 @@ code is effective, understandable, and maintainable.
## Getting your merge request reviewed, approved, and merged
-You are required to get your code **reviewed** by a
+You are strongly encouraged to get your code **reviewed** by a
[reviewer](https://about.gitlab.com/handbook/engineering/#reviewer) as soon as
there is any code to review, to get a second opinion on the chosen solution and
implementation, and an extra pair of eyes looking for bugs, logic problems, or
@@ -23,7 +23,7 @@ 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, GitLab uses the approval functionality found in the merge request
+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
@@ -100,8 +100,8 @@ 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 reviewed by the
-required reviewers.
+Maintainers should check before merging if the merge request is approved by the
+required approvers.
## Best practices