Update EE-specific files for project MR settings UI

This commit updates the EE-specific files that reorganizes the project
merge request settings UI.

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

@@ -3,8 +3,10 @@
 .form-check.builds-feature
   = form.check_box :merge_pipelines_enabled, class: 'form-check-input'
   = form.label :merge_pipelines_enabled, class: 'form-check-label' do
-    %p.mb-0
-      = _('Merge pipelines will try to validate the post-merge result prior to merging')
-    .text-secondary.mb-3
-      = _('Pipelines need to be configured to enable this feature.')
-      = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank'
+    = s_('ProjectSettings|Merge pipelines will try to validate the post-merge result prior to merging')
+    .descr.text-secondary.mb-2
+      = s_('ProjectSettings|Pipelines need to be configured to enable this feature.')
+      = link_to icon('question-circle'),
+        help_page_path('ci/merge_request_pipelines/index.md',
+        anchor: 'pipelines-for-merge-requests'),
+        target: '_blank'

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

@@ -2,6 +2,10 @@
 
 = render_ce 'projects/merge_request_merge_method_settings', project: @project, form: form
 
+= render_ce 'projects/merge_request_merge_options_settings', project: @project, form: form
+
+= render_ce 'projects/merge_request_merge_checks_settings', project: @project, form: form
+
 - if @project.feature_available?(:issuable_default_templates)
   .form-group
     = form.label :merge_requests_template, class: 'label-bold' do
@@ -11,6 +15,3 @@
     .text-secondary
       - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/markdown') }
       = _('Description parsed with %{link_start}GitLab Flavored Markdown%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
-
-
-= render_ce 'projects/merge_request_merge_settings', form: form