diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-23 10:03:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-23 10:03:38 +0000 |
| commit | c8129d797548e6b9450b384873e04fa94663e0ce (patch) | |
| tree | 740d50209d54e8b221dbf2e15f82a895ab45f9de | |
| parent | f81b1a24ede28ddcc95c25be113222f9e26e5a6d (diff) | |
| parent | 92acc463818ab3c1321fd62eb63eb1facfd2d14c (diff) | |
| download | gitlab-ce-c8129d797548e6b9450b384873e04fa94663e0ce.tar.gz | |
Merge branch 'blackst0ne-add-missing-changelog-type-to-docs' into 'master'
Add missing changelog type to docs
See merge request gitlab-org/gitlab-ce!18526
| -rw-r--r-- | changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml | 5 | ||||
| -rw-r--r-- | doc/development/changelog.md | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml b/changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml new file mode 100644 index 00000000000..f8790fa45aa --- /dev/null +++ b/changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml @@ -0,0 +1,5 @@ +--- +title: Add missing changelog type to docs +merge_request: 18526 +author: "@blackst0ne" +type: other diff --git a/doc/development/changelog.md b/doc/development/changelog.md index d5a4acff481..a9fa5ae834f 100644 --- a/doc/development/changelog.md +++ b/doc/development/changelog.md @@ -22,7 +22,7 @@ The `merge_request` value is a reference to a merge request that adds this entry, and the `author` key is used to give attribution to community contributors. **Both are optional**. The `type` field maps the category of the change, -valid options are: added, fixed, changed, deprecated, removed, security, other. **Type field is mandatory**. +valid options are: added, fixed, changed, deprecated, removed, security, performance, other. **Type field is mandatory**. Community contributors and core team members are encouraged to add their name to the `author` field. GitLab team members **should not**. |