Skip to content

Commit 48e41c6

Browse files
authored
chore(contributing): updated fast-tracking rules (#5206)
1 parent 5f0053a commit 48e41c6

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

CONTRIBUTING.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,19 @@ Commits should be signed. You can read more about [Commit Signing][] here.
116116

117117
### Before merging
118118

119-
- Pull Requests must be open for at least 48 hours.
119+
We recommend a read on our [Collaborator Guide](COLLABORATOR_GUIDE.md#accepting-modifications) for in-depth details on how we accept contributions into this repository. The list below describes some of the merging and approval rules adopted in this repository.
120+
121+
- Pull Requests must be open for at least 48 hours (Or 72 hours if the PR was authored on the weekend).
120122
- Pull requests might be immediately merged if they contain critical bug fixes, short erratas (e.g. typos from previous PRs) or any critical change that is considered a "showstopper" for the operation of the website.
121123
- These kind of PRs should only be done by existing collaborators that have write-access and/or signed-off by administrators/maintainers.
122-
- There must be no objections after a 48 hour period
124+
- This rule cannot be used for updates on the COLLABORATOR_GUIDE, CONTRIBUTING guide, CODEOWNERS, GitHub Actions or any security-impacting file or document that changes the governing policies of this repository.
125+
- Pull requests might be "fast-tracked", which means, they can be merged before the usual 48 hours notice if a "fast-track" label is added.
126+
- The person that is fast-tracking the PR (adding the label) must also comment on the PR that they're requesting the PR to be fast-tracked
127+
- The comment must mention `@nodejs/website` and must have at least one 👍 (or any other sort of approval reaction) if the person fast-tracking the PR is the author of the PR.
128+
- Fast-tracking is only allowed for small bug fixes, small feature changes, localisation changes, or other sort of non-critical/highly-impacting changes that are not covered by the previous rule that allows PRs to be merged immediately.
129+
- Fast-tracking cannot be used for updates on the COLLABORATOR_GUIDE, CONTRIBUTING guide, CODEOWNERS, GitHub Actions or any security-impacting file or document that changes the governing policies of this repository.
130+
- There must be no objections after a 48 hour period (Or 72 hours if the PR was authored on the weekend).
131+
- At least two approvals are required if the target branch is `main`
123132
- Tests must be included in Pull Requests for new features or bug fixes. If any test(s) are failing, you are responsible for fixing them.
124133

125134
Each contribution is accepted only if there is no objection to it by a collaborator. During the review, collaborators may request that a specific contributor who is an expert in a particular area give an "LGTM" before the PR can be merged.

0 commit comments

Comments
 (0)