summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-03-20 14:52:58 +0100
committerlain <lain@soykaf.club>2020-03-20 14:52:58 +0100
commit1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2 (patch)
treef69f8dbf3a012bab253fe267daf967616eefcc0a /.gitlab
parent9b9d67bbec537df6f7c5729e81da6deeaf896bd9 (diff)
parentd63dca8d99196c91dc3e20e2d27f61ea753b84af (diff)
downloadpleroma-1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2.tar.gz
pleroma-1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/issue_templates/Bug.md20
-rw-r--r--.gitlab/merge_request_templates/Release.md5
2 files changed, 25 insertions, 0 deletions
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