diff --git a/doc/development/documentation/feature_flags.md b/doc/development/documentation/feature_flags.md index c5ad28645d822e229728a6aec505c64784a3546d..d64ee94c423ef7377ea8dfc0805448ed65d433a0 100644 --- a/doc/development/documentation/feature_flags.md +++ b/doc/development/documentation/feature_flags.md @@ -149,6 +149,12 @@ Combine entries if they happened in the same release: > - [Enabled on GitLab.com, self-managed, and GitLab Dedicated](https://issue-link) in GitLab 14.3. ``` +If the feature flag is introduced and enabled in the same release, combine the entries: + +```markdown +> - [Introduced](https://issue-link) in GitLab 13.7 [with a flag](../../administration/feature_flags.md) named `forti_token_cloud`. Enabled by default. +``` + Delete `Enabled on GitLab.com` entries only when the feature is enabled by default for all offerings and the flag is removed: - Before: