diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:54:44 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:54:44 +0100 |
| commit | 9fc6676d8c080dbd630434275363cc6536a35116 (patch) | |
| tree | 6b628db0cacdd28332a3ce8e3a3e85d5fd070ad2 /.gitlab | |
| parent | 6b8c5e12dfe759ac1286e81e72ad7f8727e01386 (diff) | |
| parent | 5f1d70736711275ac9f0c95e5ada4cb2f1a96e11 (diff) | |
| download | pleroma-9fc6676d8c080dbd630434275363cc6536a35116.tar.gz pleroma-9fc6676d8c080dbd630434275363cc6536a35116.zip | |
Merge remote-tracking branch 'origin/develop' into instance-contact-account
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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 |