Commit 6a3e7516 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'djadmin-safehtml-glemoji-4' into 'master'

Switch to v-safe-html in performance_bar_app.vue

See merge request gitlab-org/gitlab!69937
parents e5529326 d6b85a6e
<script>
import { GlSafeHtmlDirective } from '@gitlab/ui';
import { glEmojiTag } from '~/emoji';
import { s__ } from '~/locale';
......@@ -12,6 +13,9 @@ export default {
DetailedMetric,
RequestSelector,
},
directives: {
SafeHtml: GlSafeHtmlDirective,
},
props: {
store: {
type: Object,
......@@ -128,6 +132,7 @@ export default {
this.currentRequest = newRequestId;
},
},
safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
};
</script>
<template>
......@@ -143,7 +148,7 @@ export default {
class="current-host"
:class="{ canary: currentRequest.details.host.canary }"
>
<span v-html="birdEmoji /* eslint-disable-line vue/no-v-html */"></span>
<span v-safe-html:[$options.safeHtmlConfig]="birdEmoji"></span>
{{ currentRequest.details.host.hostname }}
</span>
</div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment