summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/development/changelog.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 97f86171b61..45b3d5a23a1 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -35,6 +35,7 @@ the `author` field. GitLab team members **should not**.
- Any user-facing change **should** have a changelog entry. Example: "GitLab now
uses system fonts for all text."
+- Any change behind a feature flag **should not** have a changelog entry. The entry should be added [in the merge request removing the feature flags](https://docs.gitlab.com/ee/development/feature_flags.html#developing-with-feature-flags).
- A fix for a regression introduced and then fixed in the same release (i.e.,
fixing a bug introduced during a monthly release candidate) **should not**
have a changelog entry.
@@ -47,7 +48,6 @@ the `author` field. GitLab team members **should not**.
- Performance improvements **should** have a changelog entry.
- Any change that introduces a database migration **must** have a
changelog entry.
-- Any change behind a feature flag **should not** have a changelog entry. The entry should be added in the merge request removing the feature flags.
## Writing good changelog entries