diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-12-18 22:03:48 -0700 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-12-18 22:03:48 -0700 |
| commit | 60df2d8a97325367a1ad40a30fd072f5dc1e805c (patch) | |
| tree | 500d7ffb3b7c3359b486011085d8fb1a56a2ca5d /.gitlab | |
| parent | 2d7ea263a1f7dba8e0a7667a95ea8af110e9be27 (diff) | |
| parent | 8db82932a7998d411fa86d53b66f540714f465f3 (diff) | |
| download | pleroma-60df2d8a97325367a1ad40a30fd072f5dc1e805c.tar.gz pleroma-60df2d8a97325367a1ad40a30fd072f5dc1e805c.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
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) |