Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 39 insertions, 21 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 0138c0ad20f..1eb30e88f16 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -74,6 +74,7 @@ module Issuable
     end
 
     has_many :note_authors, -> { distinct }, through: :notes, source: :author
+    has_many :user_note_authors, -> { distinct.where("notes.system = false") }, through: :notes, source: :author
 
     has_many :label_links, as: :target, inverse_of: :target
     has_many :labels, through: :label_links
@@ -464,37 +465,54 @@ module Issuable
     false
   end
 
-  def to_hook_data(user, old_associations: {})
-    changes = previous_changes
+  def hook_association_changes(old_associations)
+    changes = {}
 
-    if old_associations
-      old_labels = old_associations.fetch(:labels, labels)
-      old_assignees = old_associations.fetch(:assignees, assignees)
-      old_severity = old_associations.fetch(:severity, severity)
+    old_labels = old_associations.fetch(:labels, labels)
+    old_assignees = old_associations.fetch(:assignees, assignees)
+    old_severity = old_associations.fetch(:severity, severity)
 
-      if old_labels != labels
-        changes[:labels] = [old_labels.map(&:hook_attrs), labels.map(&:hook_attrs)]
-      end
+    if old_labels != labels
+      changes[:labels] = [old_labels.map(&:hook_attrs), labels.map(&:hook_attrs)]
+    end
 
-      if old_assignees != assignees
-        changes[:assignees] = [old_assignees.map(&:hook_attrs), assignees.map(&:hook_attrs)]
-      end
+    if old_assignees != assignees
+      changes[:assignees] = [old_assignees.map(&:hook_attrs), assignees.map(&:hook_attrs)]
+    end
+
+    if supports_severity? && old_severity != severity
+      changes[:severity] = [old_severity, severity]
+    end
+
+    if supports_escalation? && escalation_status
+      current_escalation_status = escalation_status.status_name
+      old_escalation_status = old_associations.fetch(:escalation_status, current_escalation_status)
 
-      if supports_severity? && old_severity != severity
-        changes[:severity] = [old_severity, severity]
+      if old_escalation_status != current_escalation_status
+        changes[:escalation_status] = [old_escalation_status, current_escalation_status]
       end
+    end
 
-      if self.respond_to?(:total_time_spent)
-        old_total_time_spent = old_associations.fetch(:total_time_spent, total_time_spent)
-        old_time_change = old_associations.fetch(:time_change, time_change)
+    if self.respond_to?(:total_time_spent)
+      old_total_time_spent = old_associations.fetch(:total_time_spent, total_time_spent)
+      old_time_change = old_associations.fetch(:time_change, time_change)
 
-        if old_total_time_spent != total_time_spent
-          changes[:total_time_spent] = [old_total_time_spent, total_time_spent]
-          changes[:time_change] = [old_time_change, time_change]
-        end
+      if old_total_time_spent != total_time_spent
+        changes[:total_time_spent] = [old_total_time_spent, total_time_spent]
+        changes[:time_change] = [old_time_change, time_change]
       end
     end
 
+    changes
+  end
+
+  def to_hook_data(user, old_associations: {})
+    changes = previous_changes
+
+    if old_associations.present?
+      changes.merge!(hook_association_changes(old_associations))
+    end
+
     Gitlab::HookData::IssuableBuilder.new(self).build(user: user, changes: changes)
   end