2019-07-31 22:56:46 +05:30
|
|
|
- form = local_assigns.fetch(:form)
|
|
|
|
|
|
2021-03-11 19:13:27 +05:30
|
|
|
.form-group#project-merge-options{ data: { project_full_path: @project.full_path } }
|
2019-07-31 22:56:46 +05:30
|
|
|
%b= s_('ProjectSettings|Merge options')
|
2021-04-17 20:07:23 +05:30
|
|
|
%p.text-secondary= s_('ProjectSettings|Additional settings that influence how and when merges are done.')
|
2019-07-31 22:56:46 +05:30
|
|
|
= render_if_exists 'projects/merge_pipelines_settings', form: form
|
2021-01-29 00:20:46 +05:30
|
|
|
= render_if_exists 'projects/merge_trains_settings', form: form
|
2019-07-31 22:56:46 +05:30
|
|
|
.form-check.mb-2
|
|
|
|
|
= form.check_box :resolve_outdated_diff_discussions, class: 'form-check-input'
|
|
|
|
|
= form.label :resolve_outdated_diff_discussions, class: 'form-check-label' do
|
|
|
|
|
= s_('ProjectSettings|Automatically resolve merge request diff discussions when they become outdated')
|
|
|
|
|
.form-check.mb-2
|
|
|
|
|
= form.check_box :printing_merge_request_link_enabled, class: 'form-check-input'
|
|
|
|
|
= form.label :printing_merge_request_link_enabled, class: 'form-check-label' do
|
2021-04-17 20:07:23 +05:30
|
|
|
= s_('ProjectSettings|Show link to create or view a merge request when pushing from the command line')
|
2019-12-26 22:10:19 +05:30
|
|
|
.form-check.mb-2
|
|
|
|
|
= form.check_box :remove_source_branch_after_merge, class: 'form-check-input'
|
|
|
|
|
= form.label :remove_source_branch_after_merge, class: 'form-check-label' do
|
2021-04-17 20:07:23 +05:30
|
|
|
= s_('ProjectSettings|Enable "Delete source branch" option by default')
|
2019-12-26 22:10:19 +05:30
|
|
|
.descr.text-secondary
|
2021-04-17 20:07:23 +05:30
|
|
|
= s_('ProjectSettings|Existing merge requests and protected branches are not affected.')
|
