diff options
| author | lain <lain@soykaf.club> | 2024-08-01 08:53:29 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-08-01 08:53:29 +0000 |
| commit | 36d469cf022ea66947a73ee4c762d7f459aceee4 (patch) | |
| tree | 5f8824d56f10d1c94353afeb77833cd250e67369 /.gitlab | |
| parent | 7566b4a348c66fcea45bcb017979ece9c7b45b3a (diff) | |
| parent | a5d32aab50abf725196fa782775a38907b4b2afa (diff) | |
| download | pleroma-36d469cf022ea66947a73ee4c762d7f459aceee4.tar.gz pleroma-36d469cf022ea66947a73ee4c762d7f459aceee4.zip | |
Merge branch 'release/2.7.0' into 'stable'
v2.7.0
See merge request pleroma/pleroma!4179
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/merge_request_templates/Default.md | 2 |
1 files changed, 1 insertions, 1 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. |