summaryrefslogtreecommitdiff
path: root/app/views/projects/_merge_request_merge_checks_settings.html.haml
diff options
context:
space:
mode:
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.haml12
1 files changed, 5 insertions, 7 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 b099eb6800e..694d192d079 100644
--- a/app/views/projects/_merge_request_merge_checks_settings.html.haml
+++ b/app/views/projects/_merge_request_merge_checks_settings.html.haml
@@ -2,24 +2,22 @@
.form-group
%b= s_('ProjectSettings|Merge checks')
- %p.text-secondary= s_('ProjectSettings|These checks must pass before merge requests can be merged')
+ %p.text-secondary= s_('ProjectSettings|These checks must pass before merge requests can be merged.')
.form-check.mb-2.builds-feature
= form.check_box :only_allow_merge_if_pipeline_succeeds, class: 'form-check-input'
= form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do
= s_('ProjectSettings|Pipelines must succeed')
.text-secondary
- = s_('ProjectSettings|Pipelines need to be configured to enable this feature.')
- = link_to sprite_icon('question-o'),
- help_page_path('ci/merge_request_pipelines/index.md',
- anchor: 'pipelines-for-merge-requests'),
- target: '_blank'
+ - configuring_pipelines_for_merge_requests_help_link_url = help_page_path('ci/merge_request_pipelines/index.md', anchor: 'configuring-pipelines-for-merge-requests')
+ - 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 pipelines for merge requests?%{link_end}').html_safe % { link_start: configuring_pipelines_for_merge_requests_help_link_start, link_end: '</a>'.html_safe }
.form-check.mb-2
.gl-pl-6
= form.check_box :allow_merge_on_skipped_pipeline, class: 'form-check-input'
= form.label :allow_merge_on_skipped_pipeline, class: 'form-check-label' do
= s_('ProjectSettings|Skipped pipelines are considered successful')
.text-secondary
- = s_('ProjectSettings|This introduces the risk of merging changes that will not pass the pipeline.')
+ = s_('ProjectSettings|Introduces the risk of merging changes that do not pass the pipeline.')
.form-check.mb-2
= form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input', data: { qa_selector: 'allow_merge_if_all_discussions_are_resolved_checkbox' }
= form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do