Commit 03ede1b8 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '331391-improve-settings-copy' into 'master'

Change pipeline must succeed settings copy

See merge request gitlab-org/gitlab!79541
parents c908a2fd 7d1f521e
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
= form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do = form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do
= s_('ProjectSettings|Pipelines must succeed') = s_('ProjectSettings|Pipelines must succeed')
.text-secondary .text-secondary
- configuring_pipelines_for_merge_requests_help_link_url = help_page_path('ci/pipelines/merge_request_pipelines.md', anchor: 'prerequisites') = s_("ProjectSettings|Merge requests can't be merged if the latest pipeline did not succeed or is still running.")
- configuring_pipelines_for_merge_requests_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configuring_pipelines_for_merge_requests_help_link_url }
= s_('ProjectSettings|To enable this feature, configure pipelines. %{link_start}How to configure merge request pipelines?%{link_end}').html_safe % { link_start: configuring_pipelines_for_merge_requests_help_link_start, link_end: '</a>'.html_safe }
.form-check.mb-2 .form-check.mb-2
.gl-pl-6 .gl-pl-6
= form.check_box :allow_merge_on_skipped_pipeline, class: 'form-check-input' = form.check_box :allow_merge_on_skipped_pipeline, class: 'form-check-input'
......
...@@ -28213,6 +28213,9 @@ msgstr "" ...@@ -28213,6 +28213,9 @@ msgstr ""
msgid "ProjectSettings|Merge requests approved for merge are queued, and pipelines validate the combined results of the source and target branches before merge. %{link_start}What are merge trains?%{link_end}" msgid "ProjectSettings|Merge requests approved for merge are queued, and pipelines validate the combined results of the source and target branches before merge. %{link_start}What are merge trains?%{link_end}"
msgstr "" msgstr ""
msgid "ProjectSettings|Merge requests can't be merged if the latest pipeline did not succeed or is still running."
msgstr ""
msgid "ProjectSettings|Merge suggestions" msgid "ProjectSettings|Merge suggestions"
msgstr "" msgstr ""
...@@ -28339,9 +28342,6 @@ msgstr "" ...@@ -28339,9 +28342,6 @@ msgstr ""
msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin."
msgstr "" msgstr ""
msgid "ProjectSettings|To enable this feature, configure pipelines. %{link_start}How to configure merge request pipelines?%{link_end}"
msgstr ""
msgid "ProjectSettings|Transfer project" msgid "ProjectSettings|Transfer project"
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