Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 1 insertions, 13 deletions

diff --git a/app/services/issuable/common_system_notes_service.rb b/app/services/issuable/common_system_notes_service.rb
index 84024cca68c..fbc72dc867a 100644
--- a/app/services/issuable/common_system_notes_service.rb
+++ b/app/services/issuable/common_system_notes_service.rb
@@ -22,7 +22,7 @@ module Issuable
         end
 
         create_due_date_note if issuable.previous_changes.include?('due_date')
-        create_milestone_note(old_milestone) if issuable.previous_changes.include?('milestone_id')
+        create_milestone_change_event(old_milestone) if issuable.previous_changes.include?('milestone_id')
         create_labels_note(old_labels) if old_labels && issuable.labels != old_labels
       end
     end
@@ -94,23 +94,11 @@ module Issuable
       SystemNoteService.change_time_spent(issuable, issuable.project, issuable.time_spent_user)
     end
 
-    def create_milestone_note(old_milestone)
-      if milestone_changes_tracking_enabled?
-        create_milestone_change_event(old_milestone)
-      else
-        SystemNoteService.change_milestone(issuable, issuable.project, current_user, issuable.milestone)
-      end
-    end
-
     def create_milestone_change_event(old_milestone)
       ResourceEvents::ChangeMilestoneService.new(issuable, current_user, old_milestone: old_milestone)
         .execute
     end
 
-    def milestone_changes_tracking_enabled?
-      ::Feature.enabled?(:track_resource_milestone_change_events, issuable.project, default_enabled: true)
-    end
-
     def create_due_date_note
       SystemNoteService.change_due_date(issuable, issuable.project, current_user, issuable.due_date)
     end