1 files changed, 31 insertions, 3 deletions
diff --git a/app/models/state_note.rb b/app/models/state_note.rb
index cbcb1c2b49d..5e35f15aac4 100644
--- a/app/models/state_note.rb
+++ b/app/models/state_note.rb
@@ -1,19 +1,47 @@
 # frozen_string_literal: true
 
 class StateNote < SyntheticNote
+  include Gitlab::Utils::StrongMemoize
+
   def self.from_event(event, resource: nil, resource_parent: nil)
-    attrs = note_attributes(event.state, event, resource, resource_parent)
+    attrs = note_attributes(action_by(event), event, resource, resource_parent)
 
     StateNote.new(attrs)
   end
 
   def note_html
-    @note_html ||= "<p dir=\"auto\">#{note_text(html: true)}</p>"
+    @note_html ||= Banzai::Renderer.cacheless_render_field(self, :note, { group: group, project: project })
   end
 
   private
 
   def note_text(html: false)
-    event.state
+    if event.state == 'closed'
+      if event.close_after_error_tracking_resolve
+        return 'resolved the corresponding error and closed the issue.'
+      end
+
+      if event.close_auto_resolve_prometheus_alert
+        return 'automatically closed this issue because the alert resolved.'
+      end
+    end
+
+    body = event.state.dup
+    body << " via #{event_source.gfm_reference(project)}" if event_source
+    body
+  end
+
+  def event_source
+    strong_memoize(:event_source) do
+      if event.source_commit
+        project&.commit(event.source_commit)
+      else
+        event.source_merge_request
+      end
+    end
+  end
+
+  def self.action_by(event)
+    event.state == 'reopened' ? 'opened' : event.state
   end
 end