diff options
| author | feld <feld@feld.me> | 2023-11-08 14:39:00 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2023-11-08 14:39:00 +0000 |
| commit | 17524865e528e69ee92ab3e3911782d79b4b3be0 (patch) | |
| tree | 5cac2c1cbc1371de2c556fdb0a9f9d4fc72de1f0 | |
| parent | 0f56304f09b5cc43e7c8cf37aab629aed30abfda (diff) | |
| parent | 1810b2f47757b3f136a10f5211b6fffc816b838a (diff) | |
| download | pleroma-17524865e528e69ee92ab3e3911782d79b4b3be0.tar.gz pleroma-17524865e528e69ee92ab3e3911782d79b4b3be0.zip | |
Merge branch 'update_mr_template' into 'develop'
Update MR template to include the type 'change'
See merge request pleroma/pleroma!3971
| -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. |