summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 21:11:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 21:11:29 +0000
commita0b4a462b0c6f333651ae9e0c0ca1e5794e7b4e1 (patch)
tree37dce5303162eaf08841616347de9f65ba8dabf7 /doc/development
parente388691e4a5b5b69be903c7eceb606b853719cd5 (diff)
downloadgitlab-ce-a0b4a462b0c6f333651ae9e0c0ca1e5794e7b4e1.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 98a3e75bb3c..2cabb447781 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -53,8 +53,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 disabled feature flag **should not** have a changelog entry.
-- Any change behind an enabled feature flag **should** have a changelog entry.
+- Any change behind a feature flag **disabled** by default **should not** have a changelog entry.
+- Any change behind a feature flag that is **enabled** by default **should** have a changelog entry.
- Any change that adds new usage data metrics and changes that needs to be documented in Product Intelligence [Event Dictionary](https://about.gitlab.com/handbook/product/product-intelligence-guide/#event-dictionary) **should** have a changelog entry.
- A change that adds snowplow events **should** have a changelog entry -
- A change that [removes a feature flag](feature_flags/index.md) **must** have a changelog entry.