diff options
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 | 7 |
1 files changed, 7 insertions, 0 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 d3fcb52422b..9cebb191346 100644 --- a/app/views/projects/_merge_request_merge_checks_settings.html.haml +++ b/app/views/projects/_merge_request_merge_checks_settings.html.haml @@ -14,6 +14,13 @@ anchor: 'pipelines-for-merge-requests'), target: '_blank' .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.') + .form-check.mb-2 = form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input' = form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do = s_('ProjectSettings|All discussions must be resolved') |