CE port of "Move merge request approval settings"ce-1979-move-mr-approval-settings

This is for the upcoming feature for MR approval rules (https://gitlab.com/gitlab-org/gitlab-ee/issues/1979)

2 files changed, 5 insertions, 3 deletions

diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index de768696fe9..f376df29878 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -95,6 +95,8 @@
         = render 'projects/merge_request_settings', form: f
         = f.submit 'Save changes', class: "btn btn-success qa-save-merge-request-changes"
 
+  = render_if_exists 'projects/merge_request_approvals_settings', expanded: expanded
+
   = render_if_exists 'projects/service_desk_settings'
 
   %section.settings.no-animate{ class: ('expanded' if expanded) }
diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
index b6e65fcbda1..84de6858d5f 100644
--- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
@@ -10,19 +10,19 @@ describe 'Projects > Settings > User manages merge request settings' do
   end
 
   it 'shows "Merge commit" strategy' do
-    page.within '.merge-requests-feature' do
+    page.within '#js-merge-request-settings' do
       expect(page).to have_content 'Merge commit'
     end
   end
 
   it 'shows "Merge commit with semi-linear history " strategy' do
-    page.within '.merge-requests-feature' do
+    page.within '#js-merge-request-settings' do
       expect(page).to have_content 'Merge commit with semi-linear history'
     end
   end
 
   it 'shows "Fast-forward merge" strategy' do
-    page.within '.merge-requests-feature' do
+    page.within '#js-merge-request-settings' do
       expect(page).to have_content 'Fast-forward merge'
     end
   end