Merge branch '229968-remove-milesone-incidents' into 'master'

Remove milestone and iterations from Incidents

See merge request gitlab-org/gitlab!40283

app/models/concerns/milestoneable.rb

@@ -51,7 +51,7 @@ module Milestoneable
   # Overridden on EE module
   #
   def supports_milestone?
-    respond_to?(:milestone_id)
+    respond_to?(:milestone_id) && !incident?
   end
 end
 

app/serializers/issuable_sidebar_basic_entity.rb

@@ -104,6 +104,7 @@ class IssuableSidebarBasicEntity < Grape::Entity
   end
 
   expose :supports_time_tracking?, as: :supports_time_tracking
+  expose :supports_milestone?, as: :supports_milestone
 
   private
 

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

@@ -29,6 +29,7 @@
 
         = render_if_exists 'shared/issuable/sidebar_item_epic', issuable_sidebar: issuable_sidebar
 
+        - if issuable_sidebar[:supports_milestone]
           - milestone = issuable_sidebar[:milestone] || {}
           .block.milestone{ data: { qa_selector: 'milestone_block' } }
             .sidebar-collapsed-icon.has-tooltip{ title: sidebar_milestone_tooltip_label(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }

changelogs/unreleased/229968-remove-milesone-incidents.yml

+---
+title: "Remove milestone and iteration feature from Incidents sidebar"
+merge_request: 40283
+author:
+type: other

spec/fixtures/api/schemas/entities/issue_sidebar.json

@@ -43,6 +43,7 @@
     "toggle_subscription_path": { "type": "string" },
     "move_issue_path": { "type": "string" },
     "projects_autocomplete_path": { "type": "string" },
-    "supports_time_tracking": { "type": "boolean" }
+    "supports_time_tracking": { "type": "boolean" },
+    "supports_milestone": { "type": "boolean" }
   }
 }

spec/fixtures/api/schemas/entities/merge_request_sidebar.json

@@ -52,6 +52,7 @@
     "toggle_subscription_path": { "type": "string" },
     "move_issue_path": { "type": "string" },
     "projects_autocomplete_path": { "type": "string" },
-    "supports_time_tracking": { "type": "boolean" }
+    "supports_time_tracking": { "type": "boolean" },
+    "supports_milestone": { "type": "boolean" }
   }
 }

spec/models/concerns/milestoneable_spec.rb

@@ -100,6 +100,14 @@ RSpec.describe Milestoneable do
         expect(merge_request.supports_milestone?).to be_truthy
       end
     end
+
+    context "for incidents" do
+      let(:incident) { build(:incident) }
+
+      it 'returns false' do
+        expect(incident.supports_milestone?).to be_falsy
+      end
+    end
   end
 
   describe 'release scopes' do