summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortusooa <tusooa@kazv.moe>2022-12-06 20:41:22 +0000
committertusooa <tusooa@kazv.moe>2022-12-06 20:41:22 +0000
commit1036acb6ae33d2bdc2afa4abfe8f9e9f8864137a (patch)
tree3936f3ebf2c1f6459d19a9226345d381a0d36fda
parent633a76b5b3b9f8edfa7f342e00a992016e3284c0 (diff)
parent1eb3ce956b35871aa472b52e67eeae27cb91d7b0 (diff)
Merge branch 'release-template' into 'develop'
Add Gitlab Releaseā„¢ into Release MR template See merge request pleroma/pleroma!3797
-rw-r--r--.gitlab/merge_request_templates/Release.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md
index b2c772696..9638d6d11 100644
--- a/.gitlab/merge_request_templates/Release.md
+++ b/.gitlab/merge_request_templates/Release.md
@@ -1,6 +1,8 @@
### Release checklist
-* [ ] Bump version in `mix.exs`
-* [ ] Compile a changelog
-* [ ] Create an MR with an announcement to pleroma.social
-* [ ] Tag the release
+* [ ] Bump version in `mix.exs`
+* [ ] Compile a changelog
+* [ ] Create an MR with an announcement to pleroma.social
+#### post-merge
+* [ ] Tag the release on the merge commit
+* [ ] Make the tag into a Gitlab 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)