Commit b10758f5 authored by Frederic Caplette's avatar Frederic Caplette

Fix documentation for merged yaml

Merged yaml was enabled by default but the doc
said the opposite. Also, the wrong feature flag name
was used to show how to turn it on and off.
parent c5d09610
...@@ -103,7 +103,7 @@ Feature.enable(:ci_config_visualization_tab) ...@@ -103,7 +103,7 @@ Feature.enable(:ci_config_visualization_tab)
## View expanded configuration ## View expanded configuration
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/246801) in GitLab 13.9. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/246801) in GitLab 13.9.
> - It is [deployed behind a feature flag](../../user/feature_flags.md), disabled by default. > - It is [deployed behind a feature flag](../../user/feature_flags.md), enabled by default.
> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-expanded-configuration). **(FREE SELF)** > - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-expanded-configuration). **(FREE SELF)**
To view the fully expanded CI/CD configuration as one combined file, go to the To view the fully expanded CI/CD configuration as one combined file, go to the
...@@ -118,20 +118,20 @@ where: ...@@ -118,20 +118,20 @@ where:
### Enable or disable expanded configuration **(FREE SELF)** ### Enable or disable expanded configuration **(FREE SELF)**
Expanded CI/CD configuration is under development and not ready for production use. Expanded CI/CD configuration is under development and not ready for production use.
It is deployed behind a feature flag that is **disabled by default**. It is deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md) [GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
can opt to enable it. can opt to enable it.
To enable it: To disable it:
```ruby ```ruby
Feature.enable(:ci_config_visualization_tab) Feature.disable(:ci_config_merged_tab)
``` ```
To disable it: To enable it:
```ruby ```ruby
Feature.disable(:ci_config_visualization_tab) Feature.enable(:ci_config_merged_tab)
``` ```
## Commit changes to CI configuration ## Commit changes to CI configuration
......
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