Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 6 deletions

diff --git a/app/services/resource_events/synthetic_milestone_notes_builder_service.rb b/app/services/resource_events/synthetic_milestone_notes_builder_service.rb
index ad58417834e..cc6383d7083 100644
--- a/app/services/resource_events/synthetic_milestone_notes_builder_service.rb
+++ b/app/services/resource_events/synthetic_milestone_notes_builder_service.rb
@@ -10,8 +10,6 @@ module ResourceEvents
     private
 
     def synthetic_notes
-      return [] unless tracking_enabled?
-
       milestone_change_events.map do |event|
         MilestoneNote.from_event(event, resource: resource, resource_parent: resource_parent)
       end
@@ -23,9 +21,5 @@ module ResourceEvents
       events = resource.resource_milestone_events.includes(user: :status) # rubocop: disable CodeReuse/ActiveRecord
       since_fetch_at(events)
     end
-
-    def tracking_enabled?
-      ::Feature.enabled?(:track_resource_milestone_change_events, resource.project)
-    end
   end
 end