Merge branch '6145-extract-app-views-shared-issuable-ee' into 'master'

Part of "Extract EE specific files/lines for app/views/shared/issuable"

See merge request gitlab-org/gitlab-ee!5823

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

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

@@ -18,7 +18,9 @@
           = render "shared/issuable/sidebar_todo", todo: todo, issuable: issuable, is_collapsed: true
       .block.assignee
         = render "shared/issuable/sidebar_assignees", issuable: issuable, can_edit_issuable: can_edit_issuable, signed_in: current_user.present?
-      = render_sidebar_epic(issuable)
+
+      = render_if_exists 'shared/issuable/sidebar_item_epic', issuable: issuable
+
       .block.milestone
         .sidebar-collapsed-icon.has-tooltip{ title: milestone_tooltip_title(issuable.milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }
           = icon('clock-o', 'aria-hidden': 'true')
@@ -116,10 +118,7 @@
                 - if can? current_user, :admin_label, @project and @project
                   = render partial: "shared/issuable/label_page_create"
 
-      - if issuable.supports_weight?
-        .js-sidebar-weight-entry-point
-
-      = render 'shared/promotions/promote_issue_weights'
+      = render_if_exists 'shared/issuable/sidebar_weight', issuable: issuable
 
       - if issuable.has_attribute?(:confidential)
         -# haml-lint:disable InlineJavaScript

ee/app/helpers/ee/issuables_helper.rb

@@ -9,13 +9,5 @@ module EE
         weightNoneValue: ::Issue::WEIGHT_NONE
       )
     end
-
-    def render_sidebar_epic(issuable)
-      if issuable.project.feature_available?(:epics)
-        render 'shared/issuable/sidebar_item_epic', issuable: issuable
-      else
-        render 'shared/promotions/promote_epics'
-      end
-    end
   end
 end

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

ee/app/views/shared/issuable/_sidebar_item_epic.haml

-- if issuable.is_a?(Issue)
-  .block.epic
-    #js-vue-sidebar-item-epic
-      .title.hide-collapsed
-        Epic
-        = icon('spinner spin')
+- if issuable.project.feature_available?(:epics)
+  - if issuable.is_a?(Issue)
+    .block.epic
+      #js-vue-sidebar-item-epic
+        .title.hide-collapsed
+          Epic
+          = icon('spinner spin')
+- else
+  = render 'shared/promotions/promote_epics'

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

+- if local_assigns.fetch(:issuable).supports_weight?
+  .js-sidebar-weight-entry-point
+
+= render 'shared/promotions/promote_issue_weights'