summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortusooa <tusooa@kazv.moe>2023-04-22 21:02:13 -0400
committertusooa <tusooa@kazv.moe>2023-04-22 21:02:13 -0400
commit30bc37c3cab8ebf7be667fb291f0d99c17d808ef (patch)
treee0664fcf202078463b50f75538c5d0206743a26d
parentc1aa83069daaa7df906f63b3417e14b7edbfae94 (diff)
downloadpleroma-30bc37c3cab8ebf7be667fb291f0d99c17d808ef.tar.gz
pleroma-30bc37c3cab8ebf7be667fb291f0d99c17d808ef.zip
Explain changelog.d in merge request templates
-rw-r--r--.gitlab/merge_request_templates/Default.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md
new file mode 100644
index 000000000..fdf219f99
--- /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`, `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).