summaryrefslogtreecommitdiff
path: root/doc/development/changelog.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-21 18:10:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-21 18:10:24 +0000
commit77d6584e99881088ada2078703e1501c629aea54 (patch)
tree2c4fbeab4746e8f01e33264a80f681dad61fc150 /doc/development/changelog.md
parentd5098d9fe3a5f05d9b90996851ab753f8b40cf65 (diff)
downloadgitlab-ce-77d6584e99881088ada2078703e1501c629aea54.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 d96d46ba389..105ec60487b 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -45,7 +45,7 @@ the `author` field. GitLab team members **should not**.
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** should 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.,