summaryrefslogtreecommitdiff
path: root/doc/development/code_review.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 18:08:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 18:08:50 +0000
commitca05512007cea51e05d3431b2c8bd7228c754370 (patch)
tree5202d429acd68c071445aff9e352379173ec9c0b /doc/development/code_review.md
parent6b833f1e0340e00fdee074da9c42c0d4e07a46d2 (diff)
downloadgitlab-ce-ca05512007cea51e05d3431b2c8bd7228c754370.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/code_review.md')
-rw-r--r--doc/development/code_review.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 9b82cf5ff99..3d41ff64380 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -347,6 +347,12 @@ reviewee.
of the contributed code. It's usually a good idea to ask another maintainer or
reviewer before doing it, but have the courage to do it when you believe it is
important.
+- In the interest of [Iteration](https://about.gitlab.com/handbook/values/#iteration),
+ if, as a reviewer, your suggestions are non-blocking changes or personal preference
+ (not a documented or agreed requirement), consider approving the merge request
+ before passing it back to the author. This allows them to implement your suggestions
+ if they agree, or allows them to pass it onto the
+ maintainer for review straight away. This can help reduce our overall time-to-merge.
- There is a difference in doing things right and doing things right now.
Ideally, we should do the former, but in the real world we need the latter as
well. A good example is a security fix which should be released as soon as