From c54b3a88bda753b4a31b6d583ac067550c736dc5 Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Mon, 3 Dec 2018 13:54:45 +0100
Subject: [PATCH] splits review in two sections
code of conduct, your turn
---
basics.html | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/basics.html b/basics.html
index c1a6aa2..47b0ca2 100644
--- a/basics.html
+++ b/basics.html
@@ -920,17 +920,27 @@
- we: review one MR, show line comments in GL, thumbs up
</section>
- <section id="collab-review" data-markdown>
+ <section id="collab-review-coc" data-markdown>
## review
+ ### code of conduct
- code of conduct:
+ 1. be friendly
+ 1. be responsible
+ 1. be open
+ 1. be proactive
- - be friendly
- - be responsible
- - be open
- - be creative
- - be proactive
- - have fun
+ notes:
+ - the discussions are usually public, so be aware of that
+ - decide with your team, write `CONTRIBUTING.md`
+ </section>
+
+ <section id="collab-review-your-turn" data-markdown>
+ ## review
+ ### your turn
+
+ 1. review a merge request
+ 1. discuss / emote
+ 1. comment on code
</section>
<section id="collab-conflicts" data-markdown>
--
GitLab