summaryrefslogtreecommitdiff
path: root/doc/development/changelog.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/development/changelog.md')
-rw-r--r--doc/development/changelog.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 8aaf4056384..f57e666540c 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -30,7 +30,8 @@ the `author` field. GitLab team members **should not**.
## What warrants a changelog entry?
- Any change that introduces a database migration, whether it's regular, post,
- or data migration, **must** have a changelog entry.
+ or data migration, **must** have a changelog entry, even if it is behind a
+ disabled feature flag.
- [Security fixes](https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md)
**must** have a changelog entry, without `merge_request` value
and with `type` set to `security`.
@@ -113,6 +114,11 @@ the `--ee` option:
bin/changelog --ee 'Hey DZ, I added a feature to GitLab!'
```
+NOTE: **Note:**
+All entries in the `CHANGELOG.md` file apply to all editions of GitLab.
+Changelog updates are based on a common [GitLab codebase](https://gitlab.com/gitlab-org/gitlab/),
+and are mirrored without proprietary code to [GitLab FOSS](https://gitlab.com/gitlab-org/gitlab-foss/) (also known as GitLab Community Edition).
+
At this point the script would ask you to select the category of the change (mapped to the `type` field in the entry):
```plaintext