diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2022-12-27 16:41:16 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2022-12-27 16:41:16 +0100 |
| commit | 6e51845d44cd0cee89d9ad17faee4754435d582e (patch) | |
| tree | 0140eb251556159213c811fe4d472bd178d00eef /.gitlab | |
| parent | c899af1d6acad1895240a0247e9b91eca5db08df (diff) | |
| parent | b367f22256edaa3536a7b2d6dea41fd472870181 (diff) | |
| download | pleroma-6e51845d44cd0cee89d9ad17faee4754435d582e.tar.gz pleroma-6e51845d44cd0cee89d9ad17faee4754435d582e.zip | |
Merge remote-tracking branch 'pleroma/develop' into secure-mode
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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) |