Unify app/views/shared/issuable/_form.html.haml

app/views/shared/issuable/_form.html.haml

@@ -29,7 +29,7 @@
 
 = render 'shared/issuable/form/metadata', issuable: issuable, form: form
 
-= render 'shared/issuable/approvals', issuable: issuable, form: form
+= render_if_exists 'shared/issuable/approvals', issuable: issuable, form: form
 
 = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form
 
@@ -79,12 +79,6 @@
       %strong= link_to('contribution guidelines', guide_url)
       for this project.
 
-
-%li.unsaved-approvers.hide.approver.approver-template{ id: "user_{user_id}" }
-  = link_to "{approver_name}", "#"
-  .float-right
-    = link_to "#", data: { confirm: "Are you sure you want to remove approver {approver_name}"}, class: "btn-sm btn btn-remove", title: 'Remove approver' do
-      = icon("sign-out")
-      Remove
+= render_if_exists 'shared/issuable/remove_approver'
 
 = form.hidden_field :lock_version

ee/app/views/shared/issuable/_remove_approver.html.haml

+%li.unsaved-approvers.hide.approver.approver-template{ id: "user_{user_id}" }
+  = link_to "{approver_name}", "#"
+  .float-right
+    = link_to "#", data: { confirm: "Are you sure you want to remove approver {approver_name}"}, class: "btn-sm btn btn-remove", title: 'Remove approver' do
+      = icon("sign-out")
+      Remove