Skip to content

Commit 87565c7

Browse files
Trotttargos
authored andcommitted
doc: require two approvals to land changes
Currently, changes require approval by one Collaborator in most cases. However there are situations where two approvals are required. For example, breaking changes require two approvals from TSC members. And fast-tracking a request requires two approvals. Additionally, although only one approval is strictly required, in practice, we nearly always seek a second approval when there is only one. Lastly, concerns have been raised about (perhaps unintentionally) gaming the one-approval system by suggesting a change to someone else, and then approving that change when the user submits a pull request. This resolves (or at least mitigates) that concern. Fixes: #19564 PR-URL: #22255 Refs: #19564 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Сковорода Никита Андреевич <[email protected]> Reviewed-By: Matheus Marchini <[email protected]> Reviewed-By: Bryan English <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: John-David Dalton <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Jon Moss <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Roman Reiss <[email protected]> Reviewed-By: George Adams <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
1 parent 90f1200 commit 87565c7

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

COLLABORATOR_GUIDE.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,11 @@ comment that explains why the PR does not require a CI run.
112112

113113
### Code Reviews
114114

115-
All pull requests must be reviewed and accepted by a Collaborator with
116-
sufficient expertise who is able to take full responsibility for the
117-
change. In the case of pull requests proposed by an existing
118-
Collaborator, an additional Collaborator is required for sign-off.
115+
At least two Collaborators must approve a pull request before the pull request
116+
lands. (One Collaborator approval is enough if the pull request has been open
117+
for more than 7 days.) Approving a pull request indicates that the Collaborator
118+
accepts responsibility for the change. Approval must be from Collaborators who
119+
are not authors of the change.
119120

120121
In some cases, it may be necessary to summon a GitHub team to a pull request for
121122
review by @-mention.

GOVERNANCE.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ Their privileges include but are not limited to:
3232
Modifications of the contents of the nodejs/node repository are made on
3333
a collaborative basis. Anybody with a GitHub account may propose a
3434
modification via pull request and it will be considered by the project
35-
Collaborators. All pull requests must be reviewed and accepted by a
36-
Collaborator with sufficient expertise who is able to take full
37-
responsibility for the change. In the case of pull requests proposed
38-
by an existing Collaborator, an additional Collaborator is required
39-
for sign-off.
35+
Collaborators.
36+
37+
At least two Collaborators must approve a pull request before the pull request
38+
lands. (One Collaborator approval is enough if the pull request has been open
39+
for more than 7 days.) Approving a pull request indicates that the Collaborator
40+
accepts responsibility for the change. Approval must be from Collaborators who
41+
are not authors of the change.
4042

4143
If one or more Collaborators oppose a proposed change, then the change cannot
4244
be accepted unless:

0 commit comments

Comments
 (0)