summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2023-02-19 22:02:03 +0100
committermarcin mikołajczak <git@mkljczk.pl>2023-02-19 22:02:03 +0100
commit92592c25c219f44ab6454762f5a5a97e800f5b1d (patch)
treef1db48a9b222d875841c43b9c5f9b6d2c810a500 /.gitlab
parent3ed39e310939d90ddbad7bd7ffa1ebd8aca6e74c (diff)
parent8a0162cd9694a1c5bf131fefb6e6a8d3dcb68fae (diff)
downloadpleroma-92592c25c219f44ab6454762f5a5a97e800f5b1d.tar.gz
pleroma-92592c25c219f44ab6454762f5a5a97e800f5b1d.zip
Merge remote-tracking branch 'pleroma/develop' into status-notification-type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to '.gitlab')
-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)