summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-26 14:32:16 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-26 14:32:16 +0000
commitc8fb2e6a3942330079bde06d919cd33c6bc7600e (patch)
tree05779c4012efee4733aa1c797d5ec3698b4ebd93 /doc/development
parentd54b96a3079a9ee9ac834291995e81f4ab75b95a (diff)
downloadgitlab-ce-c8fb2e6a3942330079bde06d919cd33c6bc7600e.tar.gz
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/changelog.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index e83ce40ef60..8aaf4056384 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -43,8 +43,8 @@ the `author` field. GitLab team members **should not**.
a changelog entry regardless of these guidelines if the contributor wants one.
Example: "Fixed a typo on the search results page."
- Any docs-only changes **should not** have a changelog entry.
-- Any change behind a feature flag **should not** have a changelog entry - unless
- the feature flag has been defaulted to true.
+- Any change behind a disabled feature flag **should not** have a changelog entry.
+- Any change behind an enabled feature flag **should** have a changelog entry.
- A change that [removes a feature flag](feature_flags/development.md) **should** have a changelog entry -
only if the feature flag did not default to true already.
- A fix for a regression introduced and then fixed in the same release (i.e.,