summaryrefslogtreecommitdiff
path: root/doc/development/code_review.md
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-04-10 22:54:32 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-04-10 22:54:44 -0400
commit0c6923e2d13b6648c8e08017450a01e7068edfb9 (patch)
tree3329ad66ffeb9e5cfa8d64162204c03b94ceb175 /doc/development/code_review.md
parentc7ec5929b1f580e7078d11774df2e8c0d1abbe03 (diff)
downloadgitlab-ce-0c6923e2d13b6648c8e08017450a01e7068edfb9.tar.gz
Re-add a note about sarcasm to the Code Review guiders-code-review-guide
[ci skip]
Diffstat (limited to 'doc/development/code_review.md')
-rw-r--r--doc/development/code_review.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index ab4236404c6..40ae55ab905 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -25,6 +25,9 @@ request is up to one of our merge request "endbosses", denoted on the
- Be explicit. Remember people don't always understand your intentions online.
- Be humble. ("I'm not sure - let's look it up.")
- Don't use hyperbole. ("always", "never", "endlessly", "nothing")
+- Be careful about the use of sarcasm. Everything we do is public; what seems
+ like good-natured ribbing to you and a long-time colleague might come off as
+ mean and unwelcoming to a person new to the project.
- Consider one-on-one chats or video calls if there are too many "I didn't
understand" or "Alternative solution:" comments. Post a follow-up comment
summarizing one-on-one discussion.