Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 5 deletions

diff --git a/app/services/incident_management/timeline_events/create_service.rb b/app/services/incident_management/timeline_events/create_service.rb
index 40ce9097c88..5422b4ad6d2 100644
--- a/app/services/incident_management/timeline_events/create_service.rb
+++ b/app/services/incident_management/timeline_events/create_service.rb
@@ -109,7 +109,6 @@ module IncidentManagement
 
       def add_system_note(timeline_event)
         return if auto_created
-        return unless Feature.enabled?(:incident_timeline, project)
 
         SystemNoteService.add_timeline_event(timeline_event)
       end
diff --git a/app/services/incident_management/timeline_events/destroy_service.rb b/app/services/incident_management/timeline_events/destroy_service.rb
index 90e95ae8869..e1c6bbbdb85 100644
--- a/app/services/incident_management/timeline_events/destroy_service.rb
+++ b/app/services/incident_management/timeline_events/destroy_service.rb
@@ -30,8 +30,6 @@ module IncidentManagement
       attr_reader :project, :timeline_event, :user, :incident
 
       def add_system_note(incident, user)
-        return unless Feature.enabled?(:incident_timeline, project)
-
         SystemNoteService.delete_timeline_event(incident, user)
       end
     end
diff --git a/app/services/incident_management/timeline_events/update_service.rb b/app/services/incident_management/timeline_events/update_service.rb
index 5c5de4717bc..012e2f0e260 100644
--- a/app/services/incident_management/timeline_events/update_service.rb
+++ b/app/services/incident_management/timeline_events/update_service.rb
@@ -38,8 +38,6 @@ module IncidentManagement
       end
 
       def add_system_note(timeline_event)
-        return unless Feature.enabled?(:incident_timeline, incident.project)
-
         changes = was_changed(timeline_event)
         return if changes == :none