diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
| commit | 1b9c1ac3adb3d65e51f38e37c4705d46c5618f88 (patch) | |
| tree | b724afd0596dd658f7ef7baddf9411ff3e599f7d /doc/development/changelog.md | |
| parent | 392c411bdc16386ef42c86afaf8c4d8e4cddb955 (diff) | |
| parent | 2e00c1a72afc4b7388bb46bd6d58608e2ae61899 (diff) | |
| download | gitlab-ce-1b9c1ac3adb3d65e51f38e37c4705d46c5618f88.tar.gz | |
Merge branch 'master' into 10244-add-project-ci-cd-settings
Diffstat (limited to 'doc/development/changelog.md')
| -rw-r--r-- | doc/development/changelog.md | 2 |
1 files changed, 1 insertions, 1 deletions
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**. |