summaryrefslogtreecommitdiff
path: root/doc/development/changelog.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-29 00:08:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-29 00:08:58 +0000
commit79216161b305b8d23b34226d45aa92dbae316cfe (patch)
treefbedafc415fcfb9970968ac17e94a443ce7ce477 /doc/development/changelog.md
parentc1924b863ad66503edbaa3325949bce6b023b737 (diff)
downloadgitlab-ce-79216161b305b8d23b34226d45aa92dbae316cfe.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/changelog.md')
-rw-r--r--doc/development/changelog.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index f693267b554..8db3346d1f1 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -35,6 +35,8 @@ the `author` field. GitLab team members **should not**.
- Any change that introduces a database migration, whether it's regular, post,
or data migration, **must** have a changelog entry.
+- [Security fixes] **must** have a changelog entry, without `merge_request` value
+ and with `type` set to `security`.
- Any user-facing change **should** have a changelog entry. Example: "GitLab now
uses system fonts for all text."
- Performance improvements **should** have a changelog entry.
@@ -289,6 +291,7 @@ and then compiling the entries into the overall `CHANGELOG.md` file during the
[release managers]: https://gitlab.com/gitlab-org/release/docs/blob/master/quickstart/release-manager.md
[started brainstorming]: https://gitlab.com/gitlab-org/gitlab-foss/issues/17826
[release process]: https://gitlab.com/gitlab-org/release-tools
+[Security fixes]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md
---