summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-05-21 15:55:58 +0000
committerDouwe Maan <douwe@gitlab.com>2019-05-21 15:55:58 +0000
commitb6f193d1087e93f02b3c7b8ea097d2a47dfad657 (patch)
treefb5890441619dc6f27ab5c383c83c68da336f9e9 /doc/development
parent4a24f44c360133ea78151a4a1c45978747ffaed9 (diff)
parente35c28bb377a6910b667e5b7959cb903e29f260b (diff)
downloadgitlab-ce-b6f193d1087e93f02b3c7b8ea097d2a47dfad657.tar.gz
Merge branch 'patch-59' into 'master'
Clarify case for feature flags See merge request gitlab-org/gitlab-ce!28424
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/changelog.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 273a7fceaf5..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.