diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-15 16:23:03 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | ccdf687baa82dd0e0f809cfb24dc892db756bad7 (patch) | |
| tree | a9f6d748c4648a00d4f2880bb480fefb62cb4068 /app/views/projects/_merge_request_settings.html.haml | |
| parent | 08db378269ec622d7216295b0e304d84400a0cc3 (diff) | |
| download | gitlab-ce-ccdf687baa82dd0e0f809cfb24dc892db756bad7.tar.gz | |
Port fast-forward merge request setting from EE
Diffstat (limited to 'app/views/projects/_merge_request_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_settings.html.haml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml index cc5afa943cf..939750ed1e5 100644 --- a/app/views/projects/_merge_request_settings.html.haml +++ b/app/views/projects/_merge_request_settings.html.haml @@ -1,3 +1,16 @@ - form = local_assigns.fetch(:form) +.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. + + = render 'merge_request_fast_forward_settings', project: @project, form: form + = render 'projects/merge_request_merge_settings', form: form |