Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/app/presenters/alert_management/alert_presenter.rb b/app/presenters/alert_management/alert_presenter.rb
index 2daa3bd09bf..8017bc3e0cd 100644
--- a/app/presenters/alert_management/alert_presenter.rb
+++ b/app/presenters/alert_management/alert_presenter.rb
@@ -42,6 +42,10 @@ module AlertManagement
       details_project_alert_management_url(project, alert.iid)
     end
 
+    def details
+      Gitlab::Utils::InlineHash.merge_keys(payload)
+    end
+
     private
 
     attr_reader :alert, :project
@@ -81,7 +85,7 @@ module AlertManagement
     end
 
     def details_list
-      alert.details
+      details
         .map { |label, value| list_item(label, value) }
         .join(MARKDOWN_LINE_BREAK)
     end
diff --git a/app/presenters/alert_management/prometheus_alert_presenter.rb b/app/presenters/alert_management/prometheus_alert_presenter.rb
index 3bcc98e6784..0e939a65d42 100644
--- a/app/presenters/alert_management/prometheus_alert_presenter.rb
+++ b/app/presenters/alert_management/prometheus_alert_presenter.rb
@@ -12,10 +12,6 @@ module AlertManagement
       alerting_alert.alert_markdown
     end
 
-    def details_list
-      alerting_alert.annotation_list
-    end
-
     def metric_embed_for_alert
       alerting_alert.metric_embed_for_alert
     end