2019-04-12 14:41:31 +00:00
|
|
|
- form = local_assigns.fetch(:form)
|
|
|
|
|
|
|
|
.form-group
|
|
|
|
%b= s_('ProjectSettings|Merge checks')
|
2021-03-12 09:09:06 +00:00
|
|
|
%p.text-secondary= s_('ProjectSettings|These checks must pass before merge requests can be merged.')
|
2019-06-06 09:29:05 +00:00
|
|
|
.form-check.mb-2.builds-feature
|
2019-04-12 14:41:31 +00:00
|
|
|
= 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')
|
2019-08-28 07:16:29 +00:00
|
|
|
.text-secondary
|
2022-02-01 18:17:05 +00:00
|
|
|
= s_("ProjectSettings|Merge requests can't be merged if the latest pipeline did not succeed or is still running.")
|
2020-06-10 21:09:29 +00:00
|
|
|
.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
|
2021-03-12 09:09:06 +00:00
|
|
|
= s_('ProjectSettings|Introduces the risk of merging changes that do not pass the pipeline.')
|
2019-04-12 14:41:31 +00:00
|
|
|
.form-check.mb-2
|
2020-09-18 09:09:32 +00:00
|
|
|
= 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' }
|
2019-04-12 14:41:31 +00:00
|
|
|
= form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do
|
|
|
|
= s_('ProjectSettings|All discussions must be resolved')
|
2021-03-15 18:09:05 +00:00
|
|
|
= render_if_exists 'projects/merge_request_merge_checks_jira_enforcement', form: form, project: @project
|