Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/app/models/alert_management/alert.rb b/app/models/alert_management/alert.rb
index 0eb277a24fe..35fae370e4a 100644
--- a/app/models/alert_management/alert.rb
+++ b/app/models/alert_management/alert.rb
@@ -4,6 +4,7 @@ require_dependency 'alert_management'
 
 module AlertManagement
   class Alert < ApplicationRecord
+    include IidRoutes
     include AtomicInternalId
     include ShaAttribute
     include Sortable
@@ -143,6 +144,12 @@ module AlertManagement
       increment!(:events)
     end
 
+    # required for todos (typically contains an identifier like issue iid)
+    #  no-op; we could use iid, but we don't have a reference prefix
+    def to_reference(_from = nil, full: false)
+      ''
+    end
+
     private
 
     def hosts_length