Code-Approval-Procedure.md

@@ -25,11 +25,11 @@ graph TD;
 
   X0[Creating new Issue] --> X1[Discuss on gitlab, and/or in meetings, and/or on slack];
   X1 --> X2[Make sure all relevant parts of the discussion are conserved on/copied to the gitlab Issue];
-  X2 --> A000;
   end
 
   subgraph "Code contributor"
 
+  X2 --> A000;
   A000[Creating new MR] ==> A001[Via existing gitlab Issue];
   A000 -.-> A002[Via MR/Create new MR];
   A000 -.-> A003[From existing branch, or fork];
@@ -46,8 +46,8 @@ graph TD;
 
   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 --> 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];
+  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. Trigger job to check, if needed.];
   end
 
   A4 --> B0[Suited developers picked for code review];
@@ -57,9 +57,12 @@ graph TD;
 
   subgraph "Code reviewer"
   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];
+  C2 --> C2c[Reviewer checks each item on task list];
+  C2c --> C3[Reviewer discusses with contributor];
+  C1 -.-> C2b;
+  C2 -.-> C2b[NOTE: this will also trigger the `optional` jobs on gitlab-CI. Make sure the CI jobs still succeed.];
+  C2c -.-> C2b;
+  C3 -.-> C2b;
   C3 --> C4[Final check mark means REVIEW IS FINISHED];
   C4 --> C5[Add label `Approved for merging`];
   end