Code-Approval-Procedure.md

@@ -25,29 +25,32 @@ graph TD;
   A000[Creating new MR] ==> A001[Via existing gitlab Issue];
   A000 -.-> A002[Via MR/Create new MR];
   A000 -.-> A003[From existing branch, or fork];
-  A002 ==> A004[Make sure the MR title starts with `WIP:` to mark it as 'work in progress'];
+  A002 -.-> A004[Make sure the MR title starts with `WIP:` to mark it as 'work in progress'];
   A003 -.-> A004;
-  A001 -.-> A004;
+  A001 ==> A004;
   style A001 stroke-width:4px;
 
   A004 --> A005[Use the MR template `New Merge Request`];
-  A005 --> A006[If not automatic but possible: create link to Issue];
-  A006 --> A007[Assign labels. Check wiki here.];
+  A005 --> A006[If not automatic but possible: create link to Issue `Closes issue #...`];
+  A006 --> A007[Assign labels. Check wiki!];
 
   A007 --> A0
 
   A0[Working on MR/branch] -- Finished main work --> A2[Make sure all conditions for code review and approval are met];
   A2 -- Ok --> A3[Remove 'WIP' status];
-  A3 --> A4[Inform developers/corsika-devel that code review can proceed];
+  A3 --> A3b[NOTE: this will trigger further scrutiny on gitlab-CI. Make sure your CI jobs still succeed.];
+  A3b --> A4[Inform developers/corsika-devel that code review can proceed];
   end
 
   A4 --> B0[Suited developers picked for code review];
   B0 --> B1[Reviewers are attached to the MR with their name tags];
 
-  B1 --> C1[Reviewer copies task list from below into MR];
+  B1 --> C1[Reviewer copies task list from below into MR, if not there yet];
 
   subgraph "Code reviewer"
-  C1 --> C2[Reviewer checks each item on task list];
+  C1 --> C2[Set `read for code review` label in MR];
+  C2 --> C2b[NOTE: this will also trigger the `optional` jobs on gitlab-CI. Make sure the CI jobs still succeed.];
+  C2b --> C2[Reviewer checks each item on task list];
   C2 --> C3[Reviewer discusses with contributor];
   C3 --> C4[Final check mark means REVIEW IS FINISHED];
   C4 --> C5[Add label `Approved for merging`];
@@ -55,8 +58,8 @@ graph TD;
 
   subgraph "Project owner"
   C5 --> D1[Checks the MR and the review] 
-  D1 --> D2[Rediscusses with contributor and reviewer]
-  D1 --> D3[Put MR on agenda of next meeting]
+  D1 --> D2[Rediscuss with contributor and reviewer, if needed]
+  D1 --> D3[Put MR on agenda of next meeting, if usefull]
   D1 --> D4[MR is merged into master, and MR is closed]
   D2 --> D4
   D3 --> D4