diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-27 17:49:31 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-27 17:49:31 +0400 |
| commit | 4325b1aec34734d8efbc7701d6bfdcf157e7cb0d (patch) | |
| tree | 7995ee0c521da831709f1198ca7154fad0885306 /.gitlab | |
| parent | 3a03d9b65f96099e7c7a831469532c2cec7294c6 (diff) | |
| parent | 6757382abec9ca47a9025b8bed61047414cee20f (diff) | |
| download | pleroma-4325b1aec34734d8efbc7701d6bfdcf157e7cb0d.tar.gz pleroma-4325b1aec34734d8efbc7701d6bfdcf157e7cb0d.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into nsfw-api-mrf
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/merge_request_templates/Default.md | 10 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Release.md | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md new file mode 100644 index 000000000..641d9cfd8 --- /dev/null +++ b/.gitlab/merge_request_templates/Default.md @@ -0,0 +1,10 @@ +### Checklist +- [ ] Adding a changelog: In the `changelog.d` directory, create a file named `<code>.<type>`. + + `<code>` can be anything, but we recommend using a more or less unique identifier to avoid collisions, such as the branch name. + + `<type>` can be `add`, `change`, `remove`, `fix`, `security` or `skip`. `skip` is only used if there is no user-visible change in the MR (for example, only editing comments in the code). Otherwise, choose a type that corresponds to your change. + + In the file, write the changelog entry. For example, if an MR adds group functionality, we can create a file named `group.add` and write `Add group functionality` in it. + + If one changelog entry is not enough, you may add more. But that might mean you can split it into two MRs. Only use more than one changelog entry if you really need to (for example, when one change in the code fix two different bugs, or when refactoring). diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md index b2c772696..e57556e6c 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 with the `tools/collect-changelog` script +* [ ] 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) |