Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

1 files changed, 4 insertions, 5 deletions

diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb
index 13610d37a74..d5c839724d4 100644
--- a/app/models/resource_label_event.rb
+++ b/app/models/resource_label_event.rb
@@ -13,8 +13,7 @@ class ResourceLabelEvent < ResourceEvent
   validates :label, presence: { unless: :importing? }, on: :create
   validate :exactly_one_issuable, unless: :importing?
 
-  after_destroy :expire_etag_cache
-  after_save :expire_etag_cache
+  after_commit :broadcast_notes_changed, unless: :importing?
 
   enum action: {
     add: 1,
@@ -22,7 +21,7 @@ class ResourceLabelEvent < ResourceEvent
   }
 
   def self.issuable_attrs
-    %i(issue merge_request).freeze
+    %i[issue merge_request].freeze
   end
 
   def self.preload_label_subjects(events)
@@ -97,8 +96,8 @@ class ResourceLabelEvent < ResourceEvent
     issuable.is_a?(MergeRequest) ? :project_merge_requests_url : :project_issues_url
   end
 
-  def expire_etag_cache
-    issuable.expire_note_etag_cache
+  def broadcast_notes_changed
+    issuable.broadcast_notes_changed
   end
 
   def local_label?