diff options
| author | Lain Soykaf <lain@lain.com> | 2022-12-15 17:17:49 -0500 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2022-12-15 17:19:36 -0500 |
| commit | 63d00f8123ddc5a8d9917e48216775f98ceac713 (patch) | |
| tree | d65a76433291d1383f56bb8d55ce6eb29d69cfd6 /.gitlab | |
| parent | 2186e9b62b9c88812a616a7ad0d80f4b10a2deb1 (diff) | |
| parent | 204fd6faae8c39706a5ded42c7cc4fbc71a733bc (diff) | |
| download | pleroma-63d00f8123ddc5a8d9917e48216775f98ceac713.tar.gz pleroma-63d00f8123ddc5a8d9917e48216775f98ceac713.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/merge_request_templates/Release.md | 10 |
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) |
