Merge branch 'backport-merge_params-conflict-message-to-ee-master' into 'master'

Backport merge_params.html.haml conflict comment

See merge request !2120

app/views/shared/issuable/form/_merge_params.html.haml

@@ -3,9 +3,6 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?
 
--# This check is duplicated below, to avoid conflicts with EE.
-- return unless issuable.can_remove_source_branch?(current_user)
-
 - if issuable.can_remove_source_branch?(current_user)
   .form-group
     .col-sm-10.col-sm-offset-2
@@ -16,11 +13,4 @@
           = check_box_tag 'merge_request[force_remove_source_branch]', '1', initial_checkbox_value
           Remove source branch when merge request is accepted.
 
-.form-group
-  .col-sm-10.col-sm-offset-2
-    .checkbox
-      = label_tag 'merge_request[squash]' do
-        = hidden_field_tag 'merge_request[squash]', '0', id: nil
-        = check_box_tag 'merge_request[squash]', '1', issuable.squash
-        Squash commits when merge request is accepted.
-        = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')
+= render 'shared/issuable/form/ee/squash_merge_param', issuable: issuable

app/views/shared/issuable/form/ee/_squash_merge_param.html.haml

+.form-group
+  .col-sm-10.col-sm-offset-2
+    .checkbox
+      = label_tag 'merge_request[squash]' do
+        = hidden_field_tag 'merge_request[squash]', '0', id: nil
+        = check_box_tag 'merge_request[squash]', '1', issuable.squash
+        Squash commits when merge request is accepted.
+        = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')