diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 19:46:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 19:46:51 +0300 |
commit | 04ac4180cb5ba0df460034c7e64862056fd498b3 (patch) | |
tree | ca5267d12fa2aab80c1c35593b96c8cfceaa747b /app/assets/javascripts/admin | |
parent | 4e9ceea7f8ff3e097ad45f6f54c1b7165248e848 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
-rw-r--r-- | app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue b/app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue index 2e8ecbd3a5d..c95d4c96ea9 100644 --- a/app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue +++ b/app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue @@ -1,5 +1,5 @@ <script> -import { GlButton, GlTableLite } from '@gitlab/ui'; +import { GlBroadcastMessage, GlButton, GlTableLite } from '@gitlab/ui'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { __ } from '~/locale'; import { formatDate } from '~/lib/utils/datetime/date_format_utility'; @@ -9,6 +9,7 @@ const DEFAULT_TD_CLASSES = 'gl-vertical-align-middle!'; export default { name: 'MessagesTable', components: { + GlBroadcastMessage, GlButton, GlTableLite, }, @@ -68,9 +69,6 @@ export default { tdClass: `${DEFAULT_TD_CLASSES} gl-white-space-nowrap`, }, ], - safeHtmlConfig: { - ADD_TAGS: ['use'], - }, methods: { formatDate(dateString) { return formatDate(new Date(dateString)); @@ -85,8 +83,10 @@ export default { :tbody-tr-attr="{ 'data-testid': 'message-row' }" stacked="md" > - <template #cell(preview)="{ item: { preview } }"> - <div v-safe-html:[$options.safeHtmlConfig]="preview"></div> + <template #cell(preview)="{ item: { message, theme, broadcast_type, dismissable } }"> + <gl-broadcast-message :theme="theme" :type="broadcast_type" :dismissible="dismissable"> + {{ message }} + </gl-broadcast-message> </template> <template #cell(starts_at)="{ item: { starts_at } }"> |