Add latest changes from gitlab-org/gitlab@15-9-stable-ee

1 files changed, 1 insertions, 13 deletions

diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 2fb59570231..010cc493ddf 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -10,16 +10,4 @@
   page: params[:page] || 1,
   target_access_level_options: target_access_level_options.to_json,
   messages_count: @broadcast_messages.total_count,
-  messages: @broadcast_messages.map { |message| {
-    id: message.id,
-    status: broadcast_message_status(message),
-    preview: broadcast_message(message, preview: true),
-    starts_at: message.starts_at.to_s,
-    ends_at: message.ends_at.to_s,
-    target_roles: target_access_levels_display(message.target_access_levels),
-    target_path: message.target_path,
-    type: message.broadcast_type.capitalize,
-    edit_path: edit_admin_broadcast_message_path(message),
-    delete_path: admin_broadcast_message_path(message) + '.js'
-  } }.to_json
-} }
+  messages: admin_broadcast_messages_data(@broadcast_messages) } }