Move fast-forward merge request settings around for CE port

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272

Conflicts:
	ee/app/views/projects/ee/_merge_request_settings.html.haml

app/views/projects/_merge_request_fast_forward_settings.html.haml

+- form = local_assigns.fetch(:form)
+- project = local_assigns.fetch(:project)
+
+.radio
+  = label_tag :project_merge_method_ff do
+    = form.radio_button :merge_method, :ff, class: "js-merge-method-radio"
+    %strong Fast-forward merge
+    %br
+    %span.descr
+      No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
+    %br
+    %span.descr
+      When fast-forward merge is not possible, the user must first rebase locally.

app/views/projects/_merge_request_settings.html.haml

 - form = local_assigns.fetch(:form)
 
-= render 'projects/ee/merge_request_settings', form: form, project: @project
+.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

app/views/projects/edit.html.haml

@@ -97,7 +97,7 @@
       = render 'shared/promotions/promote_mr_features'
 
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f|
-        = render 'merge_request_settings', form: f
+        = render 'projects/ee/merge_request_settings', form: f
         = f.submit 'Save changes', class: "btn btn-save"
 
   = render 'projects/ee/service_desk_settings'

ee/app/views/projects/ee/_merge_request_fast_forward_settings.html.haml

+- form = local_assigns.fetch(:form)
+- project = local_assigns.fetch(:project)
+
+.radio
+  = label_tag :project_merge_method_ff do
+    = form.radio_button :merge_method, :ff, class: "js-merge-method-radio"
+    %strong Fast-forward merge
+    %br
+    %span.descr
+      No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
+    - if project.feature_available?(:merge_request_rebase)
+      %br
+      %span.descr
+        When fast-forward merge is not possible, the user is given the option to rebase.

ee/app/views/projects/ee/_merge_request_rebase_settings.html.haml

+- form = local_assigns.fetch(:form)
+
+.radio
+  = label_tag :project_merge_method_rebase_merge do
+    = form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio"
+    %strong Merge commit with semi-linear history
+    %br
+    %span.descr
+      A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible.
+      This way you could make sure that if this merge request would build, after merging to target branch it would also build.
+    %br
+    %span.descr
+      When fast-forward merge is not possible, the user is given the option to rebase.

ee/app/views/projects/ee/_merge_request_settings.html.haml

 - form = local_assigns.fetch(:form)
-- project = local_assigns.fetch(:project)
 
 .form-group
   = label_tag :merge_method_merge, class: 'label-light' do
@@ -12,30 +11,11 @@
       %span.descr
         A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
 
-  - if project.feature_available?(:merge_request_rebase)
-    .radio
-      = label_tag :project_merge_method_rebase_merge do
-        = form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio"
-        %strong Merge commit with semi-linear history
-        %br
-        %span.descr
-          A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible.
-          This way you could make sure that if this merge request would build, after merging to target branch it would also build.
-        %br
-        %span.descr
-          When fast-forward merge is not possible, the user is given the option to rebase.
+  - if @project.feature_available?(:merge_request_rebase)
+    = render 'projects/ee/merge_request_rebase_settings', project: @project, form: form
+
+  = render 'projects/ee/merge_request_fast_forward_settings', project: @project, form: form
 
-  .radio
-    = label_tag :project_merge_method_ff do
-      = form.radio_button :merge_method, :ff, class: "js-merge-method-radio"
-      %strong Fast-forward merge
-      %br
-      %span.descr
-        No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
-      - if project.feature_available?(:merge_request_rebase)
-        %br
-        %span.descr
-          When fast-forward merge is not possible, the user is given the option to rebase.
 
 - if @project.feature_available?(:issuable_default_templates)
   .form-group
@@ -46,4 +26,6 @@
     .hint
       Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}.
 
-= render 'projects/ee/merge_request_approvals_settings', project: project, form: form
+= render 'projects/ee/merge_request_approvals_settings', project: @project, form: form
+
+= render 'projects/merge_request_merge_settings', form: form