From 7829de6da4b2782a4ae2124ff05787d500bbb990 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Mon, 16 Mar 2020 17:26:28 +0300
Subject: gitlab: create templates for bug reports and release MRs

---
 .gitlab/issue_templates/Bug.md             | 20 ++++++++++++++++++++
 .gitlab/merge_request_templates/Release.md |  5 +++++
 2 files changed, 25 insertions(+)
 create mode 100644 .gitlab/issue_templates/Bug.md
 create mode 100644 .gitlab/merge_request_templates/Release.md

(limited to '.gitlab')

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 000000000..66fbc510e
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,20 @@
+<!--
+### Precheck
+
+* For support use https://git.pleroma.social/pleroma/pleroma-support or [community channels](https://git.pleroma.social/pleroma/pleroma#community-channels).
+* Please do a quick search to ensure no similar bug has been reported before. If the bug has not been addressed after 2 weeks, it's fine to bump it.
+* Try to ensure that the bug is actually related to the Pleroma backend. For example, if a bug happens in Pleroma-FE but not in Mastodon-FE or mobile clients, it's likely that the bug should be filed in [Pleroma-FE](https://git.pleroma.social/pleroma/pleroma-fe/issues/new) repository.
+-->
+
+### Environment
+
+* Installation type:
+  - [ ] OTP
+  - [ ] From source
+* Pleroma version (could be found in the "Version" tab of settings in Pleroma-FE): 
+* Elixir version (`elixir -v` for from source installations, N/A for OTP):
+* Operating system:
+* PostgreSQL version (`postgres -V`):
+
+
+### Bug description
diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md
new file mode 100644
index 000000000..237f74e00
--- /dev/null
+++ b/.gitlab/merge_request_templates/Release.md
@@ -0,0 +1,5 @@
+### Release checklist
+* [ ]  Bump version in `mix.exs`
+* [ ]  Compile a changelog
+* [ ]  Create an MR with an announcement to pleroma.social
+* [ ]  Tag the release
-- 
cgit v1.2.3


From 27542f19c60589d8deb5d9d7a59d2019b75026fa Mon Sep 17 00:00:00 2001
From: normandy <normandy@firemail.cc>
Date: Tue, 30 Jun 2020 03:12:30 +0000
Subject: Use correct PostgreSQL version command in bug template

---
 .gitlab/issue_templates/Bug.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitlab')

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 66fbc510e..9ce9b6918 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -14,7 +14,7 @@
 * Pleroma version (could be found in the "Version" tab of settings in Pleroma-FE): 
 * Elixir version (`elixir -v` for from source installations, N/A for OTP):
 * Operating system:
-* PostgreSQL version (`postgres -V`):
+* PostgreSQL version (`psql -V`):
 
 
 ### Bug description
-- 
cgit v1.2.3


From 2a3bb23091fcc857ff8e678f81107186e0aeb3fe Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 17 Jul 2020 11:03:47 +0300
Subject: Bug issue template: remove choice in "Installation type"

It made gitlab display "1 of 2 tasks completed" when one is chosen,
which is totally not what this was used for.
---
 .gitlab/issue_templates/Bug.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to '.gitlab')

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 9ce9b6918..dd0d6eb24 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -8,9 +8,7 @@
 
 ### Environment
 
-* Installation type:
-  - [ ] OTP
-  - [ ] From source
+* Installation type (OTP or From Source):
 * Pleroma version (could be found in the "Version" tab of settings in Pleroma-FE): 
 * Elixir version (`elixir -v` for from source installations, N/A for OTP):
 * Operating system:
-- 
cgit v1.2.3


From dcd06488e02408f7e9b459d1da4be2669db0969d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 26 Aug 2020 07:08:02 +0300
Subject: release MR template: add a note about merging stable changes back to
 develop

---
 .gitlab/merge_request_templates/Release.md | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitlab')

diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md
index 237f74e00..b2c772696 100644
--- a/.gitlab/merge_request_templates/Release.md
+++ b/.gitlab/merge_request_templates/Release.md
@@ -3,3 +3,4 @@
 * [ ]  Compile a changelog
 * [ ]  Create an MR with an announcement to pleroma.social
 * [ ]  Tag the release
+* [ ] Merge `stable` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)
-- 
cgit v1.2.3