... | @@ -65,10 +65,11 @@ graph TD; |
... | @@ -65,10 +65,11 @@ graph TD; |
|
C3 -.-> C2b;
|
|
C3 -.-> C2b;
|
|
C3 --> C4[If all check marks are done: this means REVIEW IS FINISHED];
|
|
C3 --> C4[If all check marks are done: this means REVIEW IS FINISHED];
|
|
C4 --> C5[Add label `Code review finished`];
|
|
C4 --> C5[Add label `Code review finished`];
|
|
|
|
C5 --> C6[Rebase, if needed]
|
|
end
|
|
end
|
|
|
|
|
|
subgraph "Project owner"
|
|
subgraph "Project owner"
|
|
C5 --> D1[Checks the MR and the review]
|
|
C6 --> D1[Checks the MR and the review]
|
|
D1 --> D2[Re-discuss with contributor and reviewer, if needed]
|
|
D1 --> D2[Re-discuss with contributor and reviewer, if needed]
|
|
D1 --> D3[Put MR on agenda of next meeting, if useful]
|
|
D1 --> D3[Put MR on agenda of next meeting, if useful]
|
|
D1 ==> D4[MR is merged into master, and MR is closed]
|
|
D1 ==> D4[MR is merged into master, and MR is closed]
|
... | @@ -98,4 +99,7 @@ The code approval procedure is described in the wiki: [Code approval procedure w |
... | @@ -98,4 +99,7 @@ The code approval procedure is described in the wiki: [Code approval procedure w |
|
- [ ] Check all changes for coding rules and guidelines
|
|
- [ ] Check all changes for coding rules and guidelines
|
|
- When all above is done:
|
|
- When all above is done:
|
|
- **Add MR label "Code Review Finished"**
|
|
- **Add MR label "Code Review Finished"**
|
|
|
|
- Rebase, if needed. If unclear: discuss!
|
|
|
|
- [ ] rebased
|
|
|
|
- [ ] not rebased
|
|
``` |
|
``` |