diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 09:07:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 09:07:59 +0000 |
| commit | a325f3a104748ecc68df7c3d793940aa709a111f (patch) | |
| tree | b3bce12be64ab2d9e31627dacd059165819797a3 /doc/development/code_review.md | |
| parent | 8fb943c7df5f2b399caaeaebd6c00d0630bc763c (diff) | |
| download | gitlab-ce-a325f3a104748ecc68df7c3d793940aa709a111f.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.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md index d5394e30d6a..7b00e3cea0d 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -17,7 +17,7 @@ uncovered edge cases. The reviewer can be from a different team, but it is recommended to pick someone who knows the domain well. You can read more about the importance of involving reviewer(s) in the section on the responsibility of the author below. -If you need some guidance (e.g. it's your first merge request), feel free to ask +If you need some guidance (for example, it's your first merge request), feel free to ask one of the [Merge request coaches](https://about.gitlab.com/company/team/). If you need assistance with security scans or comments, feel free to include the @@ -148,7 +148,7 @@ architecture, code organization, separation of concerns, tests, DRYness, consistency, and readability. Since a maintainer's job only depends on their knowledge of the overall GitLab -codebase, and not that of any specific domain, they can review, approve and merge +codebase, and not that of any specific domain, they can review, approve, and merge merge requests from any team and in any product area. In fact, authors are encouraged to get their merge requests merged by maintainers @@ -334,7 +334,7 @@ reviewee. 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 + if your review 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 |