summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2018-08-10 14:49:21 -0700
committerRich Trott <rtrott@gmail.com>2018-09-24 22:14:55 -0700
commitb01e617dcc4cf3f38f2b4516545aaf14d352f6e4 (patch)
tree9e1ce1ae696ab6089bc914ff0880fabcde4e295e
parentead5c4c054863cbc82bd2c2a8ddb31860f9e51f7 (diff)
downloadandroid-node-v8-b01e617dcc4cf3f38f2b4516545aaf14d352f6e4.tar.gz
android-node-v8-b01e617dcc4cf3f38f2b4516545aaf14d352f6e4.tar.bz2
android-node-v8-b01e617dcc4cf3f38f2b4516545aaf14d352f6e4.zip
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: https://github.com/nodejs/node/issues/19564 PR-URL: https://github.com/nodejs/node/pull/22255 Refs: https://github.com/nodejs/node/issues/19564 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: Matheus Marchini <mat@mmarchini.me> Reviewed-By: Bryan English <bryan@bryanenglish.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: John-David Dalton <john.david.dalton@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Roman Reiss <me@silverwind.io> Reviewed-By: George Adams <george.adams@uk.ibm.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
-rw-r--r--COLLABORATOR_GUIDE.md9
-rw-r--r--GOVERNANCE.md12
2 files changed, 12 insertions, 9 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
index 0c03e89a07..1315e4a265 100644
--- a/COLLABORATOR_GUIDE.md
+++ b/COLLABORATOR_GUIDE.md
@@ -112,10 +112,11 @@ comment that explains why the PR does not require a CI run.
### Code Reviews
-All pull requests must be reviewed and accepted by a Collaborator with
-sufficient expertise who is able to take full responsibility for the
-change. In the case of pull requests proposed by an existing
-Collaborator, an additional Collaborator is required for sign-off.
+At least two Collaborators must approve a pull request before the pull request
+lands. (One Collaborator approval is enough if the pull request has been open
+for more than 7 days.) Approving a pull request indicates that the Collaborator
+accepts responsibility for the change. Approval must be from Collaborators who
+are not authors of the change.
In some cases, it may be necessary to summon a GitHub team to a pull request for
review by @-mention.
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 83d4d9b50a..40ef6e7bbe 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -32,11 +32,13 @@ Their privileges include but are not limited to:
Modifications of the contents of the nodejs/node repository are made on
a collaborative basis. Anybody with a GitHub account may propose a
modification via pull request and it will be considered by the project
-Collaborators. All pull requests must be reviewed and accepted by a
-Collaborator with sufficient expertise who is able to take full
-responsibility for the change. In the case of pull requests proposed
-by an existing Collaborator, an additional Collaborator is required
-for sign-off.
+Collaborators.
+
+At least two Collaborators must approve a pull request before the pull request
+lands. (One Collaborator approval is enough if the pull request has been open
+for more than 7 days.) Approving a pull request indicates that the Collaborator
+accepts responsibility for the change. Approval must be from Collaborators who
+are not authors of the change.
If one or more Collaborators oppose a proposed change, then the change cannot
be accepted unless: