Commit 9cfcd15a authored by Kushal Pandya's avatar Kushal Pandya

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

Switch to SafeHtml in performance bar's request_selector.vue

See merge request gitlab-org/gitlab!69931
parents 2c1838e7 539a60e1
<script> <script>
import { GlPopover } from '@gitlab/ui'; import { GlPopover, GlSafeHtmlDirective } from '@gitlab/ui';
import { glEmojiTag } from '~/emoji'; import { glEmojiTag } from '~/emoji';
import { n__ } from '~/locale'; import { n__ } from '~/locale';
...@@ -7,6 +7,9 @@ export default { ...@@ -7,6 +7,9 @@ export default {
components: { components: {
GlPopover, GlPopover,
}, },
directives: {
SafeHtml: GlSafeHtmlDirective,
},
props: { props: {
currentRequest: { currentRequest: {
type: Object, type: Object,
...@@ -42,6 +45,7 @@ export default { ...@@ -42,6 +45,7 @@ export default {
methods: { methods: {
glEmojiTag, glEmojiTag,
}, },
safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
}; };
</script> </script>
<template> <template>
...@@ -60,7 +64,7 @@ export default { ...@@ -60,7 +64,7 @@ export default {
<span v-if="requestsWithWarnings.length" class="gl-cursor-default"> <span v-if="requestsWithWarnings.length" class="gl-cursor-default">
<span <span
id="performance-bar-request-selector-warning" id="performance-bar-request-selector-warning"
v-html="glEmojiTag('warning') /* eslint-disable-line vue/no-v-html */" v-safe-html:[$options.safeHtmlConfig]="glEmojiTag('warning')"
></span> ></span>
<gl-popover <gl-popover
placement="bottom" placement="bottom"
......
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