Commit 034b2b92 authored by Diana Logan's avatar Diana Logan

Merge branch 'sselhorn-master-patch-78622' into 'master'

Combined guidance for GA/feature flag removed

See merge request gitlab-org/gitlab!73225
parents 12631b29 4b1febda
......@@ -71,8 +71,7 @@ Possible version history entries are:
> - [Enabled on GitLab.com](issue-link) in GitLab X.X.
> - [Enabled on GitLab.com](issue-link) in GitLab X.X. Available to GitLab.com administrators only.
> - [Enabled on self-managed](issue-link) in GitLab X.X.
> - [Feature flag <flag name> removed](issue-link) in GitLab X.X.
> - [Generally available](issue-link) in GitLab X.X.
> - [Generally available](issue-link) in GitLab X.Y. [Feature flag <flag name> removed](issue-link) removed.
```
## Feature flag documentation examples
......@@ -105,6 +104,5 @@ And, when the feature is done and fully available to all users:
> - Introduced in GitLab 13.7 [with a flag](../../administration/feature_flags.md) named `forti_token_cloud`. Disabled by default.
> - [Enabled on self-managed](https://gitlab.com/issue/etc) GitLab 13.8.
> - [Enabled on GitLab.com](https://gitlab.com/issue/etc) in GitLab 13.9.
> - [Feature flag removed](https://gitlab.com/issue/etc) in GitLab 14.0.
> - [Generally available](issue-link) in GitLab 14.0.
> - [Generally available](issue-link) in GitLab 14.0. [Feature flag <flag name> removed](issue-link) removed.
```
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment