code_review.md 26,4 КБ
Newer Older
Robert Speicher's avatar
Robert Speicher включено в состав коммита
1
2
# Code Review Guidelines

Douwe Maan's avatar
Douwe Maan включено в состав коммита
3
4
5
6
7
This guide contains advice and best practices for performing code review, and
having your code reviewed.

All merge requests for GitLab CE and EE, whether written by a GitLab team member
or a volunteer contributor, must go through a code review process to ensure the
Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
8
code is effective, understandable, maintainable, and secure.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
9

Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
10
11
## Getting your merge request reviewed, approved, and merged

Evan Read's avatar
Evan Read включено в состав коммита
12
You are strongly encouraged to get your code **reviewed** by a
Michael Kozono's avatar
Michael Kozono включено в состав коммита
13
[reviewer](https://about.gitlab.com/handbook/engineering/workflow/code-review/#reviewer) as soon as
Douwe Maan's avatar
Douwe Maan включено в состав коммита
14
15
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
Evan Read's avatar
Evan Read включено в состав коммита
16
uncovered edge cases. The reviewer can be from a different team, but it is
Douwe Maan's avatar
Douwe Maan включено в состав коммита
17
recommended to pick someone who knows the domain well. You can read more about the
Douwe Maan's avatar
Douwe Maan включено в состав коммита
18
importance of involving reviewer(s) in the section on the responsibility of the author below.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
19

GitLab Bot's avatar
GitLab Bot включено в состав коммита
20
If you need some guidance (for example, it's your first merge request), feel free to ask
GitLab Bot's avatar
GitLab Bot включено в состав коммита
21
one of the [Merge request coaches](https://about.gitlab.com/company/team/).
Douwe Maan's avatar
Douwe Maan включено в состав коммита
22

James Ritchey's avatar
James Ritchey включено в состав коммита
23
If you need assistance with security scans or comments, feel free to include the
Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
24
25
Security Team (`@gitlab-com/gl-security`) in the review.

Douwe Maan's avatar
Douwe Maan включено в состав коммита
26
Depending on the areas your merge request touches, it must be **approved** by one
Michael Kozono's avatar
Michael Kozono включено в состав коммита
27
or more [maintainers](https://about.gitlab.com/handbook/engineering/workflow/code-review/#maintainer):
Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
28

Evan Read's avatar
Evan Read включено в состав коммита
29
For approvals, we use the approval functionality found in the merge request
Achilleas Pipinellis's avatar
Achilleas Pipinellis включено в состав коммита
30
widget. Reviewers can add their approval by [approving additionally](../user/project/merge_requests/merge_request_approvals.md#adding-or-removing-an-approval).
Dimitrie Hoekstra's avatar
Dimitrie Hoekstra включено в состав коммита
31

Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
32
33
34
Getting your merge request **merged** also requires a maintainer. If it requires
more than one approval, the last maintainer to review and approve it will also merge it.

Sean McGivern's avatar
Sean McGivern включено в состав коммита
35
36
### Reviewer roulette

Nick Thomas's avatar
Nick Thomas включено в состав коммита
37
The [Danger bot](dangerbot.md) randomly picks a reviewer and a maintainer for
Sean McGivern's avatar
Sean McGivern включено в состав коммита
38
39
40
41
42
43
44
45
each area of the codebase that your merge request seems to touch. It only makes
recommendations - feel free to override it if you think someone else is a better
fit!

It picks reviewers and maintainers from the list at the
[engineering projects](https://about.gitlab.com/handbook/engineering/projects/)
page, with these behaviours:

Achilleas Pipinellis's avatar
Achilleas Pipinellis включено в состав коммита
46
1. It will not pick people whose [GitLab status](../user/profile/index.md#current-status)
Sean McGivern's avatar
Sean McGivern включено в состав коммита
47
   contains the string 'OOO'.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
48
1. [Trainee maintainers](https://about.gitlab.com/handbook/engineering/workflow/code-review/#trainee-maintainer)
Sean McGivern's avatar
Sean McGivern включено в состав коммита
49
   are three times as likely to be picked as other reviewers.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
50
1. It always picks the same reviewers and maintainers for the same
Sean McGivern's avatar
Sean McGivern включено в состав коммита
51
52
53
54
   branch name (unless their OOO status changes, as in point 1). It
   removes leading `ce-` and `ee-`, and trailing `-ce` and `-ee`, so
   that it can be stable for backport branches.

Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
55
56
57
58
59
60
### Approval guidelines

As described in the section on the responsibility of the maintainer below, you
are recommended to get your merge request approved and merged by maintainer(s)
from teams other than your own.

Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
61
1. If your merge request includes backend changes [^1], it must be
GitLab Bot's avatar
GitLab Bot включено в состав коммита
62
   **approved by a [backend maintainer](https://about.gitlab.com/handbook/engineering/projects/#gitlab_maintainers_backend)**.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
63
1. If your merge request includes database migrations or changes to expensive queries [^2], it must be
GitLab Bot's avatar
GitLab Bot включено в состав коммита
64
   **approved by a [database maintainer](https://about.gitlab.com/handbook/engineering/projects/#gitlab_maintainers_database)**.
Toon Claes's avatar
Toon Claes включено в состав коммита
65
   Read the [database review guidelines](database_review.md) for more details.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
66
1. If your merge request includes frontend changes [^1], it must be
GitLab Bot's avatar
GitLab Bot включено в состав коммита
67
   **approved by a [frontend maintainer](https://about.gitlab.com/handbook/engineering/projects/#gitlab_maintainers_frontend)**.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
68
1. If your merge request includes UX changes [^1], it must be
GitLab Bot's avatar
GitLab Bot включено в состав коммита
69
   **approved by a [UX team member](https://about.gitlab.com/company/team/)**.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
70
1. If your merge request includes adding a new JavaScript library [^1], it must be
GitLab Bot's avatar
GitLab Bot включено в состав коммита
71
   **approved by a [frontend lead](https://about.gitlab.com/company/team/)**.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
72
1. If your merge request includes adding a new UI/UX paradigm [^1], it must be
GitLab Bot's avatar
GitLab Bot включено в состав коммита
73
   **approved by a [UX lead](https://about.gitlab.com/company/team/)**.
Marcel Amirault's avatar
Marcel Amirault включено в состав коммита
74
1. If your merge request includes a new dependency or a filesystem change, it must be
GitLab Bot's avatar
GitLab Bot включено в состав коммита
75
   **approved by a [Distribution team member](https://about.gitlab.com/company/team/)**. See how to work with the [Distribution team](https://about.gitlab.com/handbook/engineering/development/enablement/distribution/#how-to-work-with-distribution) for more details.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
76

Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
77
#### Security requirements
Douwe Maan's avatar
Douwe Maan включено в состав коммита
78

James Ritchey's avatar
James Ritchey включено в состав коммита
79
View the updated documentation regarding [internal application security reviews](https://about.gitlab.com/handbook/engineering/security/index.html#internal-application-security-reviews) for **when** and **how** to request a security review.
Sean McGivern's avatar
Sean McGivern включено в состав коммита
80

Douwe Maan's avatar
Douwe Maan включено в состав коммита
81
### The responsibility of the merge request author
Douwe Maan's avatar
Douwe Maan включено в состав коммита
82

Douwe Maan's avatar
Douwe Maan включено в состав коммита
83
The responsibility to find the best solution and implement it lies with the
Evan Read's avatar
Evan Read включено в состав коммита
84
merge request author.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
85

Evan Read's avatar
Evan Read включено в состав коммита
86
87
88
Before assigning a merge request to a maintainer for approval and merge, they
should be confident that it actually solves the problem it was meant to solve,
that it does so in the most appropriate way, that it satisfies all requirements,
Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
89
and that there are no remaining bugs, logical problems, uncovered edge cases,
GitLab Bot's avatar
GitLab Bot включено в состав коммита
90
91
or known vulnerabilities. The best way to do this, and to avoid unnecessary
back-and-forth with reviewers, is to perform a self-review of your own merge
GitLab Bot's avatar
GitLab Bot включено в состав коммита
92
request, following the [Code Review](#reviewing-a-merge-request) guidelines.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
93

Douwe Maan's avatar
Douwe Maan включено в состав коммита
94
To reach the required level of confidence in their solution, an author is expected
Evan Read's avatar
Evan Read включено в состав коммита
95
to involve other people in the investigation and implementation processes as
Douwe Maan's avatar
Douwe Maan включено в состав коммита
96
appropriate.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
97

Evan Read's avatar
Evan Read включено в состав коммита
98
99
100
They are encouraged to reach out to domain experts to discuss different solutions
or get an implementation reviewed, to product managers and UX designers to clear
up confusion or verify that the end result matches what they had in mind, to
Douwe Maan's avatar
Douwe Maan включено в состав коммита
101
102
103
database specialists to get input on the data model or specific queries, or to
any other developer to get an in-depth review of the solution.

Douwe Maan's avatar
Douwe Maan включено в состав коммита
104
If an author is unsure if a merge request needs a domain expert's opinion, that's
Evan Read's avatar
Evan Read включено в состав коммита
105
usually a pretty good sign that it does, since without it the required level of
Douwe Maan's avatar
Douwe Maan включено в состав коммита
106
107
confidence in their solution will not have been reached.

Michael Kozono's avatar
Michael Kozono включено в состав коммита
108
109
Before the review, the author is requested to submit comments on the merge
request diff alerting the reviewer to anything important as well as for anything
GitLab Bot's avatar
GitLab Bot включено в состав коммита
110
that demands further explanation or attention. Examples of content that may
Michael Kozono's avatar
Michael Kozono включено в состав коммита
111
112
113
114
115
116
117
118
warrant a comment could be:

- The addition of a linting rule (Rubocop, JS etc)
- The addition of a library (Ruby gem, JS lib etc)
- Where not obvious, a link to the parent class or method
- Any benchmarking performed to complement the change
- Potentially insecure code

Marin Jankovski's avatar
Marin Jankovski включено в состав коммита
119
120
121
122
123
124
125
Avoid:

- Adding comments (referenced above, or TODO items) directly to the source code unless the reviewer requires you to do so. If the comments are added due to an actionable task,
a link to an issue must be included.
- Assigning merge requests with failed tests to maintainers. If the tests are failing and you have to assign, ensure you leave a comment with an explanation.
- Excessively mentioning maintainers through email or Slack (if the maintainer is reachable
through Slack). If you can't assign a merge request, `@` mentioning a maintainer in a comment is acceptable and in all other cases assigning the merge request is sufficient.
Michael Kozono's avatar
Michael Kozono включено в состав коммита
126
127
128
129

This
[saves reviewers time and helps authors catch mistakes earlier](https://www.ibm.com/developerworks/rational/library/11-proven-practices-for-peer-review/index.html#__RefHeading__97_174136755).

GitLab Bot's avatar
GitLab Bot включено в состав коммита
130
131
### The responsibility of the reviewer

GitLab Bot's avatar
GitLab Bot включено в состав коммита
132
[Review the merge request](#reviewing-a-merge-request) thoroughly. When you are confident
GitLab Bot's avatar
GitLab Bot включено в состав коммита
133
134
135
136
137
138
139
140
that it meets all requirements, you should:

- Click the Approve button.
- Advise the author their merge request has been reviewed and approved.
- Assign the merge request to a maintainer. [Reviewer roulette](#reviewer-roulette)
should have made a suggestion, but feel free to override if someone else is a
better choice.

Douwe Maan's avatar
Douwe Maan включено в состав коммита
141
142
143
### The responsibility of the maintainer

Maintainers are responsible for the overall health, quality, and consistency of
Evan Read's avatar
Evan Read включено в состав коммита
144
the GitLab codebase, across domains and product areas.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
145

Evan Read's avatar
Evan Read включено в состав коммита
146
147
Consequently, their reviews will focus primarily on things like overall
architecture, code organization, separation of concerns, tests, DRYness,
Douwe Maan's avatar
Douwe Maan включено в состав коммита
148
149
150
consistency, and readability.

Since a maintainer's job only depends on their knowledge of the overall GitLab
GitLab Bot's avatar
GitLab Bot включено в состав коммита
151
codebase, and not that of any specific domain, they can review, approve, and merge
Douwe Maan's avatar
Douwe Maan включено в состав коммита
152
153
merge requests from any team and in any product area.

Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
154
155
In fact, authors are encouraged to get their merge requests merged by maintainers
from teams other than their own, to ensure that all code across GitLab is consistent
Evan Read's avatar
Evan Read включено в состав коммита
156
and can be easily understood by all contributors, from both inside and outside the
Douwe Maan's avatar
Douwe Maan включено в состав коммита
157
158
159
160
company, without requiring team-specific expertise.

Maintainers will do their best to also review the specifics of the chosen solution
before merging, but as they are not necessarily domain experts, they may be poorly
Evan Read's avatar
Evan Read включено в состав коммита
161
placed to do so without an unreasonable investment of time. In those cases, they
Douwe Maan's avatar
Douwe Maan включено в состав коммита
162
163
164
165
166
167
will defer to the judgment of the author and earlier reviewers and involved domain
experts, in favor of focusing on their primary responsibilities.

If a developer who happens to also be a maintainer was involved in a merge request
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.
Douwe Maan's avatar
Douwe Maan включено в состав коммита
168

Evan Read's avatar
Evan Read включено в состав коммита
169
Maintainers should check before merging if the merge request is approved by the
Dimitrie Hoekstra's avatar
Dimitrie Hoekstra включено в состав коммита
170
171
required approvers.

Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
172
Maintainers must check before merging if the merge request is introducing new
GitLab Bot's avatar
GitLab Bot включено в состав коммита
173
174
vulnerabilities, by inspecting the list in the Merge Request
[Security Widget](../user/application_security/index.md).
GitLab Bot's avatar
GitLab Bot включено в состав коммита
175
When in doubt, a [Security Engineer](https://about.gitlab.com/company/team/) can be involved. The list of detected
Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
176
177
178
179
180
181
182
183
vulnerabilities must be either empty or containing:

- dismissed vulnerabilities in case of false positives
- vulnerabilities converted to issues

Maintainers should **never** dismiss vulnerabilities to "empty" the list,
without duly verifying them.

GitLab Bot's avatar
GitLab Bot включено в состав коммита
184
185
Note that certain Merge Requests may target a stable branch. These are rare
events. These types of Merge Requests cannot be merged by the Maintainer.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
186
187
Instead these should be sent to the [Release Manager](https://about.gitlab.com/community/release-managers/).

Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
188
189
190
## Best practices

### Everyone
Robert Speicher's avatar
Robert Speicher включено в состав коммита
191

GitLab Bot's avatar
GitLab Bot включено в состав коммита
192
- Be kind.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
193
194
195
196
197
198
199
200
201
202
203
- Accept that many programming decisions are opinions. Discuss tradeoffs, which
  you prefer, and reach a resolution quickly.
- Ask questions; don't make demands. ("What do you think about naming this
  `:user_id`?")
- Ask for clarification. ("I didn't understand. Can you clarify?")
- Avoid selective ownership of code. ("mine", "not mine", "yours")
- Avoid using terms that could be seen as referring to personal traits. ("dumb",
  "stupid"). Assume everyone is attractive, intelligent, and well-meaning.
- Be explicit. Remember people don't always understand your intentions online.
- Be humble. ("I'm not sure - let's look it up.")
- Don't use hyperbole. ("always", "never", "endlessly", "nothing")
Robert Speicher's avatar
Robert Speicher включено в состав коммита
204
205
206
- Be careful about the use of sarcasm. Everything we do is public; what seems
  like good-natured ribbing to you and a long-time colleague might come off as
  mean and unwelcoming to a person new to the project.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
207
208
209
- Consider one-on-one chats or video calls if there are too many "I didn't
  understand" or "Alternative solution:" comments. Post a follow-up comment
  summarizing one-on-one discussion.
Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
210
211
212
- If you ask a question to a specific person, always start the comment by
  mentioning them; this will ensure they see it if their notification level is
  set to "mentioned" and other people will understand they don't have to respond.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
213

GitLab Bot's avatar
GitLab Bot включено в состав коммита
214
### Having your merge request reviewed
Robert Speicher's avatar
Robert Speicher включено в состав коммита
215

Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
216
Please keep in mind that code review is a process that can take multiple
Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
217
iterations, and reviewers may spot things later that they may not have seen the
Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
218
219
first time.

Robert Speicher's avatar
Robert Speicher включено в состав коммита
220
221
222
223
224
225
226
227
228
229
230
231
- The first reviewer of your code is _you_. Before you perform that first push
  of your shiny new branch, read through the entire diff. Does it make sense?
  Did you include something unrelated to the overall purpose of the changes? Did
  you forget to remove any debugging code?
- Be grateful for the reviewer's suggestions. ("Good call. I'll make that
  change.")
- Don't take it personally. The review is of the code, not of you.
- Explain why the code exists. ("It's like that because of these reasons. Would
  it be more clear if I rename this class/file/method/variable?")
- Extract unrelated changes and refactorings into future merge requests/issues.
- Seek to understand the reviewer's perspective.
- Try to respond to every comment.
Michel Engelen's avatar
Michel Engelen включено в состав коммита
232
233
234
- The merge request author resolves only the threads they have fully
  addressed. If there's an open reply, an open thread, a suggestion,
  a question, or anything else, the thread should be left to be resolved
Marcia Ramos's avatar
Marcia Ramos включено в состав коммита
235
  by the reviewer.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
236
237
238
- Push commits based on earlier rounds of feedback as isolated commits to the
  branch. Do not squash until the branch is ready to merge. Reviewers should be
  able to read individual updates based on their earlier feedback.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
239
240
241
- Assign the merge request back to the reviewer once you are ready for another round of
  review. If you do not have the ability to assign merge requests, `@`
  mention the reviewer instead.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
242

Jarka Kadlecová's avatar
Jarka Kadlecová включено в состав коммита
243
244
### Assigning a merge request for a review

Philippe Lafoucrière's avatar
Philippe Lafoucrière включено в состав коммита
245
If you want to have your merge request reviewed, you can assign it to any reviewer. The list of reviewers can be found on [Engineering projects](https://about.gitlab.com/handbook/engineering/projects/) page.
Jarka Kadlecová's avatar
Jarka Kadlecová включено в состав коммита
246

GitLab Bot's avatar
GitLab Bot включено в состав коммита
247
You can also use `workflow::ready for review` label. That means that your merge request is ready to be reviewed and any reviewer can pick it. It is recommended to use that label only if there isn't time pressure and make sure the merge request is assigned to a reviewer.
Jarka Kadlecová's avatar
Jarka Kadlecová включено в состав коммита
248
249
250
251
252

When your merge request was reviewed and can be passed to a maintainer you can either pick a specific maintainer or use a label `ready for merge`.

It is responsibility of the author of a merge request that the merge request is reviewed. If it stays in `ready for review` state too long it is recommended to assign it to a specific reviewer.

GitLab Bot's avatar
GitLab Bot включено в состав коммита
253
#### List of merge requests ready for review
Jarka Kadlecová's avatar
Jarka Kadlecová включено в состав коммита
254

GitLab Bot's avatar
GitLab Bot включено в состав коммита
255
Developers who have capacity can regularly check the list of [merge requests to review](https://gitlab.com/groups/gitlab-org/-/merge_requests?state=opened&label_name%5B%5D=workflow%3A%3Aready%20for%20review) and assign any merge request they want to review.
Jarka Kadlecová's avatar
Jarka Kadlecová включено в состав коммита
256

GitLab Bot's avatar
GitLab Bot включено в состав коммита
257
### Reviewing a merge request
Robert Speicher's avatar
Robert Speicher включено в состав коммита
258
259
260
261

Understand why the change is necessary (fixes a bug, improves the user
experience, refactors the existing code). Then:

Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
262
- Try to be thorough in your reviews to reduce the number of iterations.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
263
264
265
266
267
268
269
- Communicate which ideas you feel strongly about and those you don't.
- Identify ways to simplify the code while still solving the problem.
- Offer alternative implementations, but assume the author already considered
  them. ("What do you think about using a custom validator here?")
- Seek to understand the author's perspective.
- If you don't understand a piece of code, _say so_. There's a good chance
  someone else would be confused by it as well.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
270
271
272
273
- Do prefix your comment with "Not blocking:" if you have a small,
  non-mandatory improvement you wish to suggest. This lets the author
  know that they can optionally resolve this issue in this merge request
  or follow-up at a later stage.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
274
275
- After a round of line notes, it can be helpful to post a summary note such as
  "LGTM :thumbsup:", or "Just a couple things to address."
Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
276
277
- Assign the merge request to the author if changes are required following your
  review.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
278
279
280
281
282
283

### Merging a merge request

Before taking the decision to merge:

- Set the milestone.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
284
- Consider warnings and errors from danger bot, code quality, and other reports.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
285
286
287
288
289
  Unless a strong case can be made for the violation, these should be resolved
  before merge. A comment must to be posted if the MR is merged with any failed job.

When ready to merge:

Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
290
- Consider using the [Squash and
GitLab Bot's avatar
GitLab Bot включено в состав коммита
291
292
  merge](../user/project/merge_requests/squash_and_merge.md#squash-and-merge)
  feature when the merge request has a lot of commits.
Dylan Griffith's avatar
Dylan Griffith включено в состав коммита
293
294
295
  When merging code a maintainer should only use the squash feature if the
  author has already set this option or if the merge request clearly contains a
  messy commit history that is intended to be squashed.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
296
297
298
299
300
301
302
303
304
305
306
307
308
309
- **Start a new merge request pipeline with the `Run Pipeline` button in the merge
  request's "Pipelines" tab, and enable "Merge When Pipeline Succeeds" (MWPS).** Note that:
  - If the **latest [Pipeline for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/#pipelines-for-merged-results-premium)** finished less than 2 hours ago, you
    might merge without starting a new pipeline as the merge request is close
    enough to `master`.
  - If the merge request is from a fork, check how far behind `master` the
    source branch is. If it's more than 100 commits behind, ask the author to
    rebase it before merging.
  - If [master is broken](https://about.gitlab.com/handbook/engineering/workflow/#broken-master),
    in addition to the two above rules, check that any failure also happens
    in `master` and post a link to the ~"master:broken" issue before clicking the
    red "Merge" button.
- When you set the MR to "Merge When Pipeline Succeeds", you should take over
  subsequent revisions for anything that would be spotted after that.
Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
310

GitLab Bot's avatar
GitLab Bot включено в состав коммита
311
312
313
314
315
316
317
318
NOTE: **Note:**
Thanks to "Pipeline for Merged Results", authors won't have to rebase their
branch as frequently anymore (only when there are conflicts) since the Merge
Results Pipeline will already incorporate the latest changes from `master`.
This results in faster review/merge cycles since maintainers don't have to ask
for a final rebase: instead, they only have to start a MR pipeline and set MWPS.
This step brings us very close to the actual Merge Trains feature by testing the
Merge Results against the latest `master` at the time of the pipeline creation.
Robert Speicher's avatar
Robert Speicher включено в состав коммита
319

Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
320
### The right balance
Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
321

Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
322
One of the most difficult things during code review is finding the right
Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
323
324
325
balance in how deep the reviewer can interfere with the code created by a
reviewee.

Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
326
- Learning how to find the right balance takes time; that is why we have
Sean McGivern's avatar
Sean McGivern включено в состав коммита
327
328
  reviewers that become maintainers after some time spent on reviewing merge
  requests.
Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
329
330
- Finding bugs and improving code style is important, but thinking about good
  design is important as well. Building abstractions and good design is what
Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
331
332
  makes it possible to hide complexity and makes future changes easier.
- Asking the reviewee to change the design sometimes means the complete rewrite
Sean McGivern's avatar
Sean McGivern включено в состав коммита
333
334
335
  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.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
336
- In the interest of [Iteration](https://about.gitlab.com/handbook/values/#iteration),
GitLab Bot's avatar
GitLab Bot включено в состав коммита
337
  if your review suggestions are non-blocking changes, or personal preference
GitLab Bot's avatar
GitLab Bot включено в состав коммита
338
339
340
341
  (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.
Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
342
343
- 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
Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
344
345
346
  well. A good example is a security fix which should be released as soon as
  possible. Asking the reviewee to do the major refactoring in the merge
  request that is an urgent fix should be avoided.
Grzegorz Bizon's avatar
Grzegorz Bizon включено в состав коммита
347
348
349
350
351
- Doing things well today is usually better than doing something perfectly
  tomorrow. Shipping a kludge today is usually worse than doing something well
  tomorrow. When you are not able to find the right balance, ask other people
  about their opinion.

Sean McGivern's avatar
Sean McGivern включено в состав коммита
352
353
354
### GitLab-specific concerns

GitLab is used in a lot of places. Many users use
Cindy Pallares's avatar
Cindy Pallares включено в состав коммита
355
our [Omnibus packages](https://about.gitlab.com/install/), but some use
Sean McGivern's avatar
Sean McGivern включено в состав коммита
356
the [Docker images](https://docs.gitlab.com/omnibus/docker/), some are
Achilleas Pipinellis's avatar
Achilleas Pipinellis включено в состав коммита
357
[installed from source](../install/installation.md),
Sean McGivern's avatar
Sean McGivern включено в состав коммита
358
359
360
361
362
and there are other installation methods available. GitLab.com itself is a large
Enterprise Edition instance. This has some implications:

1. **Query changes** should be tested to ensure that they don't result in worse
   performance at the scale of GitLab.com:
Brett Walker's avatar
Brett Walker включено в состав коммита
363
   1. Generating large quantities of data locally can help.
Evan Read's avatar
Evan Read включено в состав коммита
364
   1. Asking for query plans from GitLab.com is the most reliable way to validate
Brett Walker's avatar
Brett Walker включено в состав коммита
365
      these.
Evan Read's avatar
Evan Read включено в состав коммита
366
1. **Database migrations** must be:
Brett Walker's avatar
Brett Walker включено в состав коммита
367
   1. Reversible.
Evan Read's avatar
Evan Read включено в состав коммита
368
   1. Performant at the scale of GitLab.com - ask a maintainer to test the
Brett Walker's avatar
Brett Walker включено в состав коммита
369
      migration on the staging environment if you aren't sure.
Evan Read's avatar
Evan Read включено в состав коммита
370
   1. Categorised correctly:
Brett Walker's avatar
Brett Walker включено в состав коммита
371
372
373
374
375
376
      - Regular migrations run before the new code is running on the instance.
      - [Post-deployment migrations](post_deployment_migrations.md) run _after_
        the new code is deployed, when the instance is configured to do that.
      - [Background migrations](background_migrations.md) run in Sidekiq, and
        should only be done for migrations that would take an extreme amount of
        time at GitLab.com scale.
GitLab Bot's avatar
GitLab Bot включено в состав коммита
377
1. **Sidekiq workers** [cannot change in a backwards-incompatible way](sidekiq_style_guide.md#sidekiq-compatibility-across-updates):
Brett Walker's avatar
Brett Walker включено в состав коммита
378
379
   1. Sidekiq queues are not drained before a deploy happens, so there will be
      workers in the queue from the previous version of GitLab.
Evan Read's avatar
Evan Read включено в состав коммита
380
   1. If you need to change a method signature, try to do so across two releases,
Brett Walker's avatar
Brett Walker включено в состав коммита
381
      and accept both the old and new arguments in the first of those.
Evan Read's avatar
Evan Read включено в состав коммита
382
   1. Similarly, if you need to remove a worker, stop it from being scheduled in
Brett Walker's avatar
Brett Walker включено в состав коммита
383
384
      one release, then remove it in the next. This will allow existing jobs to
      execute.
Evan Read's avatar
Evan Read включено в состав коммита
385
   1. Don't forget, not every instance will upgrade to every intermediate version
Brett Walker's avatar
Brett Walker включено в состав коммита
386
387
      (some people may go from X.1.0 to X.10.0, or even try bigger upgrades!), so
      try to be liberal in accepting the old format if it is cheap to do so.
Evan Read's avatar
Evan Read включено в состав коммита
388
1. **Cached values** may persist across releases. If you are changing the type a
Sean McGivern's avatar
Sean McGivern включено в состав коммита
389
390
   cached value returns (say, from a string or nil to an array), change the
   cache key at the same time.
Evan Read's avatar
Evan Read включено в состав коммита
391
1. **Settings** should be added as a
Sean McGivern's avatar
Sean McGivern включено в состав коммита
392
393
   [last resort](https://about.gitlab.com/handbook/product/#convention-over-configuration).
   If you're adding a new setting in `gitlab.yml`:
Brett Walker's avatar
Brett Walker включено в состав коммита
394
   1. Try to avoid that, and add to `ApplicationSetting` instead.
Evan Read's avatar
Evan Read включено в состав коммита
395
   1. Ensure that it is also
Brett Walker's avatar
Brett Walker включено в состав коммита
396
      [added to Omnibus](https://docs.gitlab.com/omnibus/settings/gitlab.yml.html#adding-a-new-setting-to-gitlab-yml).
Evan Read's avatar
Evan Read включено в состав коммита
397
1. **Filesystem access** can be slow, so try to avoid
Sean McGivern's avatar
Sean McGivern включено в состав коммита
398
399
   [shared files](shared_files.md) when an alternative solution is available.

GitLab Bot's avatar
GitLab Bot включено в состав коммита
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
### Review turnaround time

Since [unblocking others is always a top priority](https://about.gitlab.com/handbook/values/#global-optimization),
reviewers are expected to review assigned merge requests in a timely manner,
even when this may negatively impact their other tasks and priorities.

Doing so allows everyone involved in the merge request to iterate faster as the
context is fresh in memory, and improves contributors' experience significantly.

#### Review-response SLO

To ensure swift feedback to ready-to-review code, we maintain a `Review-response` Service-level Objective (SLO). The SLO is defined as:

> - review-response SLO = (time when first review response is provided) - (time MR is assigned to reviewer) < 2 business days

If you don't think you'll be able to review a merge request within the `Review-response` SLO
time frame, let the author know as soon as possible and try to help them find
another reviewer or maintainer who will be able to, so that they can be unblocked
and get on with their work quickly.

If you think you are at capacity and are unable to accept any more reviews until
some have been completed, communicate this through your GitLab status by setting
the `:red_circle:` emoji and mentioning that you are at capacity in the status
text. This will guide contributors to pick a different reviewer, helping us to
meet the SLO.

Of course, if you are out of office and have
[communicated](https://about.gitlab.com/handbook/paid-time-off/#communicating-your-time-off)
this through your GitLab.com Status, authors are expected to realize this and
find a different reviewer themselves.

When a merge request author has been blocked for longer than
the `Review-response` SLO, they are free to remind the reviewer through Slack or assign
another reviewer.

Kerri Miller's avatar
Kerri Miller включено в состав коммита
435
436
437
438
## Examples

How code reviews are conducted can surprise new contributors. Here are some examples of code reviews that should help to orient you as to what to expect.

GitLab Bot's avatar
GitLab Bot включено в состав коммита
439
**["Modify `DiffNote` to reuse it for Designs"](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13703):**
Kerri Miller's avatar
Kerri Miller включено в состав коммита
440
441
442
443
444
It contained everything from nitpicks around newlines to reasoning
about what versions for designs are, how we should compare them
if there was no previous version of a certain file (parent vs.
blank `sha` vs empty tree).

GitLab Bot's avatar
GitLab Bot включено в состав коммита
445
**["Support multi-line suggestions"](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25211)**:
Kerri Miller's avatar
Kerri Miller включено в состав коммита
446
447
448
449
450
The MR itself consists of a collaboration between FE and BE,
and documenting comments from the author for the reviewer.
There's some nitpicks, some questions for information, and
towards the end, a security vulnerability.

GitLab Bot's avatar
GitLab Bot включено в состав коммита
451
**["Allow multiple repositories per project"](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/10251)**:
Kerri Miller's avatar
Kerri Miller включено в состав коммита
452
453
454
455
456
ZJ referred to the other projects (workhorse) this might impact,
suggested some improvements for consistency. And James' comments
helped us with overall code quality (using delegation, `&.` those
types of things), and making the code more robust.

GitLab Bot's avatar
GitLab Bot включено в состав коммита
457
**["Support multiple assignees for merge requests"](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/10161)**:
GitLab Bot's avatar
GitLab Bot включено в состав коммита
458
A good example of collaboration on an MR touching multiple parts of the codebase. Nick pointed out interesting edge cases, James Lopes also joined in raising concerns on import/export feature.
Kerri Miller's avatar
Kerri Miller включено в состав коммита
459

Rémy Coutable's avatar
Rémy Coutable включено в состав коммита
460
### Credits
Robert Speicher's avatar
Robert Speicher включено в состав коммита
461
462
463
464
465
466
467
468

Largely based on the [thoughtbot code review guide].

[thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review

---

[Return to Development documentation](README.md)
Sean McGivern's avatar
Sean McGivern включено в состав коммита
469
470

[projects]: https://about.gitlab.com/handbook/engineering/projects/
Marin Jankovski's avatar
Marin Jankovski включено в состав коммита
471
[build handbook]: https://about.gitlab.com/handbook/build/handbook/build#how-to-work-with-build
Robert Speicher's avatar
Robert Speicher включено в состав коммита
472
[^1]: Please note that specs other than JavaScript specs are considered backend code.
Andreas Brandl's avatar
Andreas Brandl включено в состав коммита
473
[^2]: We encourage you to seek guidance from a database maintainer if your merge request is potentially introducing expensive queries. It is most efficient to comment on the line of code in question with the SQL queries so they can give their advice.