From f5567940bcd45a774c06ea1169311e01df7238f5 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Wed, 24 Mar 2021 10:24:37 +0000
Subject: [PATCH] Docs: Reveting a feature flag must have a changelog entry as
 well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t control if users enable a feature flag on their instance, so
for maximum visibility/transparency it’s good to have a changelog in
those cases.
---
 doc/development/changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 2cabb44778111..5d2833902a491 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -57,7 +57,7 @@ the `author` field. GitLab team members **should not**.
 - 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.
+- A change that [removes a feature flag, or removes a feature and its feature flag](feature_flags/index.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.
-- 
GitLab