diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-21 12:03:29 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-21 12:03:29 +0000 |
| commit | ab3f03a04a34f2e267bef649ea7d055df583e43e (patch) | |
| tree | 41c555d32f0805a45f553ae348b9bf42158e9426 /.gitlab | |
| parent | a5f64ffd0cba5e183744cf46506656ba61d36eda (diff) | |
| parent | 548434f85ccaa4a77c460fb5bda37153ea6e9c39 (diff) | |
| download | pleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.tar.gz pleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.zip | |
Merge branch 'develop' into 'public-polls'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/merge_request_templates/Default.md | 2 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Release.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md index fdf219f99..641d9cfd8 100644 --- a/.gitlab/merge_request_templates/Default.md +++ b/.gitlab/merge_request_templates/Default.md @@ -3,7 +3,7 @@ `<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`, `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. + `<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. diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md index 9638d6d11..e57556e6c 100644 --- a/.gitlab/merge_request_templates/Release.md +++ b/.gitlab/merge_request_templates/Release.md @@ -1,6 +1,6 @@ ### Release checklist * [ ] Bump version in `mix.exs` -* [ ] Compile a changelog +* [ ] 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 |