Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2017-07-25 13:03:15 +0300
committerAndrew Newdigate <andrew@gitlab.com>2017-07-25 13:03:15 +0300
commit9820e3b573b269ab153fc0e535b84f5d9069e29e (patch)
tree25f482a2e442e3644fd7d1c2c3dbc08f3f1cb345 /CONTRIBUTING.md
parent454e246ba5e4ba9d55790a9ca7370eab583b71d6 (diff)
Extra information about review cycles
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md16
1 files changed, 15 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4310511ec..dba537054 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -83,7 +83,7 @@ spawn it's own issue. These issues should generally not stay open for more than
- ~Conversations are ongoing work-streams while ~"Infrastructure Deliverable" issues should be closed by the upcoming milestone.
1. To keep track of slipping issues, items which we have been unable to complete by the infrastructure deliverable milestone should be moved over to the next milestone and marked with ~"Moved:x1", ~"Moved:x2", ~"Moved:x3" etc
-## Reviews
+## Reviews and Approvals
Merge requests need to **approval by at least two [Gitaly team members](https://gitlab.com/groups/gl-gitaly/group_members)**.
@@ -102,6 +102,20 @@ Examples of code that **does not require maintainer approval** include:
Additionally, if you feel that the change you are making is sufficiently complicated or just for your own confidence,
please feel free to assign a maintainer.
+### Review Process
+
+The Gitaly team uses the following process:
+
+- When you merge request is ready for review, select two approvers from the Merge Request edit view.
+- Assign the first reviewer
+- When the first reviewer is done, they assign the second reviewer
+- When the second reviewer is done
+ - If there are no discussions, they are free to merge
+ - Otherwise assign back to the author for next round of review.
+
+**Note**: the author-reviewer 1-reviewer 2-author cycle works best with small changes. With larger changes feel free to use
+the traditional author-reviewer 1-author-reviewer 1-reviewer 2-author-reviewer 2-cycle.
+
## Gitaly Developer Quick-start Guide
- Check the [README.md](README.md) file to ensure that you have the correct version of Go installed.