diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-01 21:17:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-01 21:17:05 +0300 |
| commit | 143a33345cf3607ad35ec31130cec4922bc1113c (patch) | |
| tree | 33b0a2658928f06d4ab20f8ec7d3aeadfbdd08d9 /app/views/projects/_merge_request_merge_checks_settings.html.haml | |
| parent | 3bdc719293f08ed357ef452f3e2a11a9b29531e7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/_merge_request_merge_checks_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_merge_checks_settings.html.haml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/projects/_merge_request_merge_checks_settings.html.haml b/app/views/projects/_merge_request_merge_checks_settings.html.haml index b9ddb93c664..4f9af40f711 100644 --- a/app/views/projects/_merge_request_merge_checks_settings.html.haml +++ b/app/views/projects/_merge_request_merge_checks_settings.html.haml @@ -8,9 +8,7 @@ = form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do = s_('ProjectSettings|Pipelines must succeed') .text-secondary - - configuring_pipelines_for_merge_requests_help_link_url = help_page_path('ci/pipelines/merge_request_pipelines.md', anchor: 'prerequisites') - - 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 } + = s_("ProjectSettings|Merge requests can't be merged if the latest pipeline did not succeed or is still running.") .form-check.mb-2 .gl-pl-6 = form.check_box :allow_merge_on_skipped_pipeline, class: 'form-check-input' |