diff --git a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue
index 42e2d34fa3a0af3d5e2e481f4ed67a37ca874496..9179fe9d075c54f86767420b6e5f651e97409af0 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue
@@ -6,7 +6,7 @@ import SourceEditor from '~/vue_shared/components/source_editor.vue';
export default {
i18n: {
- viewOnlyMessage: s__('Pipelines|Merged YAML is view only'),
+ viewOnlyMessage: s__('Pipelines|Full configuration is view only'),
},
components: {
SourceEditor,
diff --git a/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue b/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue
index fd6547468d97a928878a2cd5a81df056bc28dc1b..e965ac12aa5b8ddb37e226d09d88a67261a9137a 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue
@@ -31,7 +31,7 @@ export default {
tabEdit: s__('Pipelines|Edit'),
tabGraph: s__('Pipelines|Visualize'),
tabLint: s__('Pipelines|Lint'),
- tabMergedYaml: s__('Pipelines|View merged YAML'),
+ tabMergedYaml: s__('Pipelines|Full configuration'),
tabValidate: s__('Pipelines|Validate'),
empty: {
visualization: s__(
@@ -41,12 +41,12 @@ export default {
'PipelineEditor|The CI/CD configuration is continuously validated. Errors and warnings are displayed when the CI/CD configuration file is not empty.',
),
merge: s__(
- 'PipelineEditor|The merged YAML view is displayed when the CI/CD configuration file has valid syntax.',
+ 'PipelineEditor|The full configuration view is displayed when the CI/CD configuration file has valid syntax.',
),
},
},
errorTexts: {
- loadMergedYaml: s__('Pipelines|Could not load merged YAML content'),
+ loadMergedYaml: s__('Pipelines|Could not load full configuration content'),
},
query: {
TAB_QUERY_PARAM,
diff --git a/doc/ci/pipeline_editor/index.md b/doc/ci/pipeline_editor/index.md
index 1a7155c8195b34c1a1f106878e7f7ef1a23acf37..d920c34d90a2c4cf6ded4723d61e66c71cb8a6dc 100644
--- a/doc/ci/pipeline_editor/index.md
+++ b/doc/ci/pipeline_editor/index.md
@@ -21,7 +21,7 @@ From the pipeline editor page you can:
added with the [`include`](../yaml/index.md#include) keyword.
- View a [list of the CI/CD configuration added with the `include` keyword](#view-included-cicd-configuration).
- See a [visualization](#visualize-ci-configuration) of the current configuration.
-- View an [expanded](#view-expanded-configuration) version of your configuration.
+- View the [full configuration](#view-full-configuration), which displays the configuration with any configuration from `include` added.
- [Commit](#commit-changes-to-ci-configuration) the changes to a specific branch.
In GitLab 13.9 and earlier, you must already have [a `.gitlab-ci.yml` file](../quick_start/index.md#create-a-gitlab-ciyml-file)
@@ -95,13 +95,14 @@ Hover over a job to highlight its `needs` relationships:
If the configuration does not have any `needs` relationships, then no lines are drawn because
each job depends only on the previous stage being completed successfully.
-## View expanded configuration
+## View full configuration
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/246801) in GitLab 13.9.
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/301103) in GitLab 13.12.
+> - **View merged YAML** tab [renamed to **Full configuration**](https://gitlab.com/gitlab-org/gitlab/-/issues/377404) in GitLab 16.0.
To view the fully expanded CI/CD configuration as one combined file, go to the
-pipeline editor's **View merged YAML** tab. This tab displays an expanded configuration
+pipeline editor's **Full configuration** tab. This tab displays an expanded configuration
where:
- Configuration imported with [`include`](../yaml/index.md#include) is copied into the view.
@@ -130,7 +131,7 @@ fully expanded version are both valid:
- pyflakes python/
```
-- Expanded configuration in **View merged YAML** tab:
+- Expanded configuration in **Full configuration** tab:
```yaml
".python-req":
@@ -169,7 +170,7 @@ It can happen when:
- The syntax status on the **Edit** tab (valid or invalid).
- The **Visualize** tab.
- The **Lint** tab.
- - The **View merged YAML** tab.
+ - The **Full configuration** tab.
You can still work on your CI/CD configuration and commit the changes you made without
any issues. As soon as the service becomes available again, the syntax validation
diff --git a/doc/ci/troubleshooting.md b/doc/ci/troubleshooting.md
index cf3af8f1810bf8144df58baa2567983059219598..973c6b90fc5440f62157015664742bd9e83c686c 100644
--- a/doc/ci/troubleshooting.md
+++ b/doc/ci/troubleshooting.md
@@ -313,7 +313,7 @@ likely to hit the default memory limit.
To reduce the configuration size, you can:
- Check the length of the expanded CI/CD configuration in the pipeline editor's
- [merged YAML](pipeline_editor/index.md#view-expanded-configuration) tab. Look for
+ [Full configuration](pipeline_editor/index.md#view-full-configuration) tab. Look for
duplicated configuration that can be removed or simplified.
- Move long or repeated `script` sections into standalone scripts in the project.
- Use [parent and child pipelines](pipelines/downstream_pipelines.md#parent-child-pipelines) to move some
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index d6b1d243d823b0e24f19050007eef2ba480bf5ec..27af64cd0e87d0a2902869117ef135d5d881aace 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -279,7 +279,7 @@ use a template from:
The project CI/CD configuration merges into the required pipeline configuration when
a pipeline runs. The merged configuration is the same as if the required pipeline configuration
added the project configuration with the [`include` keyword](../../../ci/yaml/index.md#include).
-To view a project's full merged configuration, [View the merged YAML](../../../ci/pipeline_editor/index.md#view-expanded-configuration)
+To view a project's full merged configuration, [View full configuration](../../../ci/pipeline_editor/index.md#view-full-configuration)
in the pipeline editor.
To select a CI/CD template for the required pipeline configuration:
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 2d97608987ee97e77b065ed0b4792e7a8a7f9a82..d3ce068d3288a06f6bd721bd8023e79c999aa9d7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -32252,7 +32252,7 @@ msgstr ""
msgid "PipelineEditor|The CI/CD configuration is continuously validated. Errors and warnings are displayed when the CI/CD configuration file is not empty."
msgstr ""
-msgid "PipelineEditor|The merged YAML view is displayed when the CI/CD configuration file has valid syntax."
+msgid "PipelineEditor|The full configuration view is displayed when the CI/CD configuration file has valid syntax."
msgstr ""
msgid "PipelineEditor|The pipeline visualization is displayed when the CI/CD configuration file has valid syntax."
@@ -32567,7 +32567,7 @@ msgstr ""
msgid "Pipelines|Could not load artifacts."
msgstr ""
-msgid "Pipelines|Could not load merged YAML content"
+msgid "Pipelines|Could not load full configuration content"
msgstr ""
msgid "Pipelines|Description"
@@ -32585,6 +32585,12 @@ msgstr ""
msgid "Pipelines|Follow these instructions to install GitLab Runner on macOS."
msgstr ""
+msgid "Pipelines|Full configuration"
+msgstr ""
+
+msgid "Pipelines|Full configuration is view only"
+msgstr ""
+
msgid "Pipelines|Get familiar with GitLab CI syntax by setting up a simple pipeline running a \"Hello world\" script to see how it runs, explore how CI/CD works."
msgstr ""
@@ -32627,9 +32633,6 @@ msgstr ""
msgid "Pipelines|Loading pipelines"
msgstr ""
-msgid "Pipelines|Merged YAML is view only"
-msgstr ""
-
msgid "Pipelines|More Information"
msgstr ""
@@ -32750,9 +32753,6 @@ msgstr ""
msgid "Pipelines|Validating GitLab CI configuration…"
msgstr ""
-msgid "Pipelines|View merged YAML"
-msgstr ""
-
msgid "Pipelines|Visualize"
msgstr ""
diff --git a/qa/qa/page/project/pipeline_editor/show.rb b/qa/qa/page/project/pipeline_editor/show.rb
index 0a7a4460d185e7da219627b37b8e7bf54f3ab6ee..bf86a0f5edbeab961fabe94ba8d373c69853f169 100644
--- a/qa/qa/page/project/pipeline_editor/show.rb
+++ b/qa/qa/page/project/pipeline_editor/show.rb
@@ -122,8 +122,8 @@ def go_to_visualize_tab
go_to_tab('Visualize')
end
- def go_to_view_merged_yaml_tab
- go_to_tab('View merged YAML')
+ def go_to_full_configuration_tab
+ go_to_tab('Full configuration')
end
def go_to_validate_tab
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
index dbe24e2a2b25773ed57af1c96d2b31a82b6d4a8e..745879cf12fcc797103f66be0a40f6999e834893 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
@@ -74,7 +74,7 @@ module QA
show.simulate_pipeline
expect(show.tab_alert_title).to have_content('Simulation completed successfully')
- show.go_to_view_merged_yaml_tab
+ show.go_to_full_configuration_tab
expect(show).to have_source_editor
end
end
@@ -101,7 +101,7 @@ module QA
expect(show.ci_syntax_validate_message).to have_content('CI configuration is invalid')
- show.go_to_view_merged_yaml_tab
+ show.go_to_full_configuration_tab
# TODO: remove this retry when
# https://gitlab.com/gitlab-org/gitlab/-/issues/378536 is resolved