projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
[akkoma]
/
.gitlab
/
merge_request_templates
/
Release.md
diff --git
a/.gitlab/merge_request_templates/Release.md
b/.gitlab/merge_request_templates/Release.md
index 237f74e00c1e5223e774fa90da965c3a3f344d3d..b2c772696f6ef77b58d5d7c9254b121d042c53dc 100644
(file)
--- 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
* [ ] 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)