Changes between Version 16 and Version 17 of WorkingConventions/GitLabSPJ

Timestamp:

Feb 26, 2019 4:20:41 PM (6 months ago)

Author:

simonpj

Comment:

--

WorkingConventions/GitLabSPJ

@@ -67 +67 @@
 == Merge requests ==
 
-* The title and description of a MR do not form part of the Git repo's history.  Only the commit messages in the patches do.  So make sure that each patch has a good commit message!  The title and description of the MR signpost the readers through the review process.
+* '''The title and description of a MR''' do not form part of the Git repo's history.  Only the commit messages in the patches do.  So make sure that each patch has a good commit message!  The title and description of the MR signpost the readers through the review process.
 
 * To see all merge requests, click on "Merge requests" ''in the left-hand nav column''.  The similar icon in the black menu bar at the top doesn't seem to do anything useful.
@@ -77 +77 @@
   * The "merge" button is disabled for WIP MRs, so they can't be accidentally merged.
   Details [https://docs.gitlab.com/ee/user/project/merge_requests/work_in_progress_merge_requests.html here]
+
+* '''Approvers'''. A MR requires at least one approver to press the "Approve" button before a MR will be merged.   The approvers for a MR are drawn from three sources:
+   * A small per-project list of super-developers.
+   * The [https://gitlab.haskell.org/ghc/ghc/blob/master/CODEOWNERS code owners file]: if your patch touches code listed in this file, the corresponding users become approvers for that MR.
+   * Per-MR approvers, which you as MR author can add.  ''From what list?'''
+Per MR approvers: chosen from developer.
+
 
 == Gitlab tips ==