summaryrefslogtreecommitdiff
path: root/doc/development/changelog.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-24 12:10:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-24 12:10:54 +0000
commit35c5f0c35c83f3c5f8d33fb61713495e29bdec4d (patch)
treef9715095538242308c5ff04a92a2ff47557d7dfd /doc/development/changelog.md
parent91e247b531c89342faed387c0d312622eb8a9c93 (diff)
downloadgitlab-ce-35c5f0c35c83f3c5f8d33fb61713495e29bdec4d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/changelog.md')
-rw-r--r--doc/development/changelog.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index f2c8aa4db62..44be6e9548b 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -57,8 +57,7 @@ the `author` field. GitLab team members **should not**.
- Any change behind an enabled feature flag **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/development.md) **should** have a changelog entry -
- only if the feature flag did not default to true already.
+- A change that [removes a feature flag](feature_flags/development.md) **must** have a changelog entry.
- 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.