summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-26 05:50:41 +0000
committerlain <lain@soykaf.club>2020-08-26 05:50:41 +0000
commit797535155051e75227fca611c3486c02c01a98b3 (patch)
tree5b309048bfd83a7c6b2b8dcc290ea8e068e74da2
parentfd04137e182468d519db078d1d309043946652ca (diff)
parentdcd06488e02408f7e9b459d1da4be2669db0969d (diff)
Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'
release MR template: add a note about merging stable changes back to develop See merge request pleroma/pleroma!2920
-rw-r--r--.gitlab/merge_request_templates/Release.md1
1 files changed, 1 insertions, 0 deletions
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)