2016-12-05 10:00:26 -05:00
|
|
|
- form = local_assigns.fetch(:form)
|
|
|
|
|
|
2017-09-15 17:23:03 -04:00
|
|
|
.form-group
|
|
|
|
|
= label_tag :merge_method_merge, class: 'label-light' do
|
|
|
|
|
Merge method
|
|
|
|
|
.radio
|
|
|
|
|
= label_tag :project_merge_method_merge do
|
|
|
|
|
= form.radio_button :merge_method, :merge, class: "js-merge-method-radio"
|
|
|
|
|
%strong Merge commit
|
|
|
|
|
%br
|
|
|
|
|
%span.descr
|
|
|
|
|
A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
|
|
|
|
|
|
2017-09-29 15:13:35 -04:00
|
|
|
= render 'merge_request_rebase_settings', form: form
|
|
|
|
|
|
2017-09-15 17:23:03 -04:00
|
|
|
= render 'merge_request_fast_forward_settings', project: @project, form: form
|
|
|
|
|
|
2017-07-12 17:32:04 -04:00
|
|
|
= render 'projects/merge_request_merge_settings', form: form
|
