2019-07-31 22:56:46 +05:30
|
|
|
- form = local_assigns.fetch(:form)
|
|
|
|
|
|
|
|
|
|
.form-group
|
|
|
|
|
%b= s_('ProjectSettings|Merge checks')
|
|
|
|
|
%p.text-secondary= s_('ProjectSettings|These checks must pass before merge requests can be merged')
|
2019-09-04 21:01:54 +05:30
|
|
|
.form-check.mb-2.builds-feature
|
2019-07-31 22:56:46 +05:30
|
|
|
= 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-12-04 20:38:33 +05:30
|
|
|
.text-secondary
|
2019-07-31 22:56:46 +05:30
|
|
|
= s_('ProjectSettings|Pipelines need to be configured to enable this feature.')
|
2020-11-24 15:15:51 +05:30
|
|
|
= link_to sprite_icon('question-o'),
|
2019-07-31 22:56:46 +05:30
|
|
|
help_page_path('ci/merge_request_pipelines/index.md',
|
|
|
|
|
anchor: 'pipelines-for-merge-requests'),
|
|
|
|
|
target: '_blank'
|
2020-06-23 00:09:42 +05:30
|
|
|
.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.')
|
2019-07-31 22:56:46 +05:30
|
|
|
.form-check.mb-2
|
2020-11-24 15:15:51 +05:30
|
|
|
= 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-07-31 22:56:46 +05:30
|
|
|
= form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do
|
|
|
|
|
= s_('ProjectSettings|All discussions must be resolved')
|
2021-03-11 19:13:27 +05:30
|
|
|
= render_if_exists 'projects/merge_request_merge_checks_jira_enforcement', form: form, project: @project
|
