summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-30 09:10:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-30 09:10:26 +0000
commite820415ceab5819ea8a29174543f9246b608b5fd (patch)
tree61b09e0bb6132ca630972f35a862b1a857387669 /app/views/admin
parent488c34c7ebb40740a7f15f26acfb4de9b12462a4 (diff)
downloadgitlab-ce-e820415ceab5819ea8a29174543f9246b608b5fd.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/broadcast_messages/edit.html.haml2
-rw-r--r--app/views/admin/broadcast_messages/index.html.haml2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/admin/broadcast_messages/edit.html.haml b/app/views/admin/broadcast_messages/edit.html.haml
index 212cc437d3d..a85702f562a 100644
--- a/app/views/admin/broadcast_messages/edit.html.haml
+++ b/app/views/admin/broadcast_messages/edit.html.haml
@@ -9,6 +9,8 @@
theme: @broadcast_message.theme,
dismissable: @broadcast_message.dismissable.to_s,
target_access_levels: @broadcast_message.target_access_levels,
+ messages_path: admin_broadcast_messages_path,
+ preview_path: preview_admin_broadcast_messages_path,
target_path: @broadcast_message.target_path,
starts_at: @broadcast_message.starts_at,
ends_at: @broadcast_message.ends_at,
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 010cc493ddf..fb63e761f69 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -9,5 +9,7 @@
#js-broadcast-messages{ data: {
page: params[:page] || 1,
target_access_level_options: target_access_level_options.to_json,
+ messages_path: admin_broadcast_messages_path,
+ preview_path: preview_admin_broadcast_messages_path,
messages_count: @broadcast_messages.total_count,
messages: admin_broadcast_messages_data(@broadcast_messages) } }