summaryrefslogtreecommitdiff
path: root/doc/development/changelog.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 13:37:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 13:37:47 +0000
commitaee0a117a889461ce8ced6fcf73207fe017f1d99 (patch)
tree891d9ef189227a8445d83f35c1b0fc99573f4380 /doc/development/changelog.md
parent8d46af3258650d305f53b819eabf7ab18d22f59e (diff)
downloadgitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'doc/development/changelog.md')
-rw-r--r--doc/development/changelog.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 2753257c941..7c4a600e1fa 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -101,7 +101,7 @@ EE: true
- _Any_ contribution from a community member, no matter how small, **may** have
a changelog entry regardless of these guidelines if the contributor wants one.
- Any [GLEX experiment](experiment_guide/gitlab_experiment.md) changes **should not** have a changelog entry.
-- [Removing](feature_flags/#changelog) a feature flag, when the new code is retained.
+- [Modifying](feature_flags/#changelog) a feature flag (flag removal, default-on setting).
## Writing good changelog entries