Commit ba065e58 authored by Marcel Amirault's avatar Marcel Amirault Committed by Shinya Maeda

Remove links from checkbox text

Links in the checkbox text were complicated
the tests, so I removed them to keep this MR
as an MVC
parent f5fdafc8
...@@ -59,7 +59,7 @@ To enable pipelines for merged results for your project: ...@@ -59,7 +59,7 @@ To enable pipelines for merged results for your project:
1. [Configure your CI/CD configuration file](../index.md#configuring-pipelines-for-merge-requests) 1. [Configure your CI/CD configuration file](../index.md#configuring-pipelines-for-merge-requests)
so that the pipeline or individual jobs run for merge requests. so that the pipeline or individual jobs run for merge requests.
1. Visit your project's **Settings > General** and expand **Merge requests**. 1. Visit your project's **Settings > General** and expand **Merge requests**.
1. Check **Merge pipelines will try to validate the post-merge result prior to merging**. 1. Check **Enable merge trains and pipelines for merged results**.
1. Click **Save changes**. 1. Click **Save changes**.
CAUTION: **Caution:** CAUTION: **Caution:**
......
...@@ -82,7 +82,7 @@ To enable merge trains for your project: ...@@ -82,7 +82,7 @@ To enable merge trains for your project:
1. [Configure your CI/CD configuration file](../../index.md#configuring-pipelines-for-merge-requests) 1. [Configure your CI/CD configuration file](../../index.md#configuring-pipelines-for-merge-requests)
so that the pipeline or individual jobs run for merge requests. so that the pipeline or individual jobs run for merge requests.
1. Visit your project's **Settings > General** and expand **Merge requests**. 1. Visit your project's **Settings > General** and expand **Merge requests**.
1. Check **Merge pipelines will try to validate the post-merge result prior to merging**. 1. Check **Enable merge trains and pipelines for merged results**.
1. Click **Save changes**. 1. Click **Save changes**.
CAUTION: **Caution:** CAUTION: **Caution:**
...@@ -187,7 +187,7 @@ run a new successful pipeline before you can re-add a merge request to a merge t ...@@ -187,7 +187,7 @@ run a new successful pipeline before you can re-add a merge request to a merge t
Merge trains ensure that each pipeline has succeeded before a merge happens, so Merge trains ensure that each pipeline has succeeded before a merge happens, so
you can clear the **Pipelines must succeed** check box and keep you can clear the **Pipelines must succeed** check box and keep
**Merge pipelines will try to validate the post-merge result prior to merging** (merge trains) enabled. **Enable merge trains and pipelines for merged results** (merge trains) enabled.
If you want to keep the **Pipelines must succeed** option enabled along with Merge If you want to keep the **Pipelines must succeed** option enabled along with Merge
Trains, you can create a new pipeline for merged results when this error occurs by Trains, you can create a new pipeline for merged results when this error occurs by
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
.form-check.builds-feature .form-check.builds-feature
= form.check_box :merge_pipelines_enabled, class: 'form-check-input js-merge-options-merge-pipelines', data: { qa_selector: 'merged_results_pipeline_checkbox' } = form.check_box :merge_pipelines_enabled, class: 'form-check-input js-merge-options-merge-pipelines', data: { qa_selector: 'merged_results_pipeline_checkbox' }
= form.label :merge_pipelines_enabled, class: 'form-check-label' do = form.label :merge_pipelines_enabled, class: 'form-check-label' do
= s_('ProjectSettings|Merge pipelines will try to validate the post-merge result prior to merging') = s_('ProjectSettings|Enable merge trains and pipelines for merged results')
.text-secondary.mb-2 .text-secondary.mb-2
= s_('ProjectSettings|Pipelines need to be configured to enable this feature.') = s_('ProjectSettings|Pipelines for merge requests must be enabled in the CI/CD configuration file, or pipelines could be unresolvable or dropped')
= link_to icon('question-circle'), = link_to icon('question-circle'),
help_page_path('ci/merge_request_pipelines/index.md', help_page_path('ci/merge_request_pipelines/index.md',
anchor: 'pipelines-for-merge-requests'), anchor: 'configuring-pipelines-for-merge-requests'),
target: '_blank' target: '_blank'
---
title: Update merge train settings checkbox text
merge_request: 34073
author:
type: changed
...@@ -23,7 +23,7 @@ RSpec.describe 'User manages merge pipelines option', :js do ...@@ -23,7 +23,7 @@ RSpec.describe 'User manages merge pipelines option', :js do
before do before do
visit edit_project_path(project) visit edit_project_path(project)
check('Merge pipelines will try to validate the post-merge result prior to merging') check('Enable merge trains and pipelines for merged results')
end end
it 'sees enabled merge pipeline checkbox' do it 'sees enabled merge pipeline checkbox' do
......
...@@ -17206,6 +17206,9 @@ msgstr "" ...@@ -17206,6 +17206,9 @@ msgstr ""
msgid "ProjectSettings|Enable 'Delete source branch' option by default" msgid "ProjectSettings|Enable 'Delete source branch' option by default"
msgstr "" msgstr ""
msgid "ProjectSettings|Enable merge trains and pipelines for merged results"
msgstr ""
msgid "ProjectSettings|Every merge creates a merge commit" msgid "ProjectSettings|Every merge creates a merge commit"
msgstr "" msgstr ""
...@@ -17272,9 +17275,6 @@ msgstr "" ...@@ -17272,9 +17275,6 @@ msgstr ""
msgid "ProjectSettings|Merge options" msgid "ProjectSettings|Merge options"
msgstr "" msgstr ""
msgid "ProjectSettings|Merge pipelines will try to validate the post-merge result prior to merging"
msgstr ""
msgid "ProjectSettings|Merge requests" msgid "ProjectSettings|Merge requests"
msgstr "" msgstr ""
...@@ -17302,6 +17302,9 @@ msgstr "" ...@@ -17302,6 +17302,9 @@ msgstr ""
msgid "ProjectSettings|Pipelines" msgid "ProjectSettings|Pipelines"
msgstr "" msgstr ""
msgid "ProjectSettings|Pipelines for merge requests must be enabled in the CI/CD configuration file, or pipelines could be unresolvable or dropped"
msgstr ""
msgid "ProjectSettings|Pipelines must succeed" msgid "ProjectSettings|Pipelines must succeed"
msgstr "" msgstr ""
......
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