diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 21:12:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 21:12:13 +0300 |
| commit | 23f57fb31fe83ea8666753f94118f6d834517dfb (patch) | |
| tree | 0055fc79e5fe1bbb43afcbbce71c745df01f3f6c /doc/development/documentation | |
| parent | 125c8a6a81c1c09911c09183c66768571cfd95b4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/documentation')
| -rw-r--r-- | doc/development/documentation/feature_flags.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/development/documentation/feature_flags.md b/doc/development/documentation/feature_flags.md index 78cc4314d4f..f234ec6f2e2 100644 --- a/doc/development/documentation/feature_flags.md +++ b/doc/development/documentation/feature_flags.md @@ -74,6 +74,13 @@ Possible version history entries are: > - [Generally available](issue-link) in GitLab X.Y. [Feature flag <flag name>](issue-link) removed. ``` +You can combine entries if they happened in the same release: + +```markdown +> - Introduced in GitLab 14.2 [with a flag](../../administration/feature_flags.md) named `ci_include_rules`. Disabled by default. +> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) in GitLab 14.3. +``` + ## Feature flag documentation examples The following examples show the progression of a feature flag. |