From 71188d4578e5c69199bf3d715cb8513bec2f49aa Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 11 Mar 2019 15:22:35 +0100
Subject: [PATCH] Merge branch 'develop' into 'coc'

# Conflicts:
#   README.rst
---
 .gitlab/issue_templates/Bug.md             | 3 +++
 .gitlab/issue_templates/Feature request.md | 4 ++++
 README.rst                                 | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index aa8893527..1570482a6 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,6 +1,9 @@
 <!--
 Hi there! You are reporting a bug on this project, and we want to thank you!
 
+If it's the first time you post here, please take a moment to read our Code of Conduct
+(https://funkwhale.audio/code-of-conduct/) and ensure your issue respect our guidelines.
+
 To ensure your bug report is as useful as possible, please try to stick
 to the following structure. You can leave the parts text between `<!- ->`
 markers untouched, they won't be displayed in your final message.
diff --git a/.gitlab/issue_templates/Feature request.md b/.gitlab/issue_templates/Feature request.md
index 404f9c9de..355f9a19c 100644
--- a/.gitlab/issue_templates/Feature request.md	
+++ b/.gitlab/issue_templates/Feature request.md	
@@ -1,6 +1,10 @@
 <!--
 Hi there! You are about to share feature request or an idea, and we want to thank you!
 
+
+If it's the first time you post here, please take a moment to read our Code of Conduct
+(https://funkwhale.audio/code-of-conduct/) and ensure your issue respect our guidelines.
+
 To ensure we can deal with your idea or request, please try to stick
 to the following structure. You can leave the parts text between `<!- ->`
 markers untouched, they won't be displayed in your final message.
diff --git a/README.rst b/README.rst
index e26175318..12fe29175 100644
--- a/README.rst
+++ b/README.rst
@@ -32,3 +32,8 @@ Translate
 ^^^^^^^^^
 
 Translators willing to help can refer to `TRANSLATORS <TRANSLATORS.rst>`_ for instructions.
+
+Code of Conduct
+---------------
+
+`Our Code of Conduct <https://funkwhale.audio/code-of-conduct/>`_ applies to all the community spaces, including our GitLab instance. Please, take a moment to read it.