Merge branch '254250-add-time-tracking-to-incidents' into 'master'

Allow time tracking in incidents

See merge request gitlab-org/gitlab!42965

app/models/concerns/issuable.rb

@@ -182,7 +182,7 @@ module Issuable
     end
 
     def supports_time_tracking?
-      is_a?(TimeTrackable) && !incident?
+      is_a?(TimeTrackable)
     end
 
     def supports_severity?

changelogs/unreleased/254250-add-time-tracking-to-incidents.yml

+---
+title: Allow time tracking in incidents
+merge_request: 42965
+author:
+type: changed

spec/models/concerns/issuable_spec.rb

@@ -824,7 +824,7 @@ RSpec.describe Issuable do
 
     where(:issuable_type, :supports_time_tracking) do
       :issue         | true
-      :incident      | false
+      :incident      | true
       :merge_request | true
     end