From afea1a74c9e76112e62e09f73f3d520472626f2f Mon Sep 17 00:00:00 2001 From: Werner <1331699+Arrow768@users.noreply.github.com> Date: Sun, 7 Nov 2021 21:28:03 +0100 Subject: [PATCH] Update contributing guidelines to reflect recent changes to the peer review system. (#12727) Co-authored-by: Werner --- .github/CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0dd0bd0ac02..5bd8fe9c896 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -46,11 +46,13 @@ license permits the intended use of the content in the appropriate manner. All pull requests are subject to peer review prior to being merged. After said reviews, they are given a final once-over by a maintainer and then merged if good. -A **feature** pull request will require *two* reviews, with one of them being a community developer's. There is also a minimum time out of -*three days* before a feature pull request can be merged. This is to ensure that there is enough time to review and discuss new additions -from the game. +A **feature** pull request will require **two** reviews, with one of them being a community developer's. +The other review can come from a "trusted reviewer" or a developer. +Contributors who have shown that they are capable of properly reviewing pull requests can request the "trusted reviewer" role. +There is also a minimum time-out of **three days** before a feature pull request can be merged. +This is to ensure that there is enough time to review and discuss new additionsfrom the game. -A **bug fix** pull request will require *two* reviews, if it is to be merged in the first 24 hours, or *one* following the first 24 hours. +A **bug fix** pull request will require **two** reviews, if it is to be merged in the first 24 hours, or **one** following the first 24 hours. ### Prefer Atomic Pull-Requests Pull requests should do **one** thing.