Commit 6478c89e authored by Illya Klymov's avatar Illya Klymov

Merge branch '340034-replace-v-html' into 'master'

Replaces v-html with v-safe-html

See merge request gitlab-org/gitlab!69862
parents fb2d7b3e 5959b2c1
<script> <script>
import { GlAlert, GlBadge, GlPagination, GlTab, GlTabs } from '@gitlab/ui'; import {
GlAlert,
GlBadge,
GlPagination,
GlTab,
GlTabs,
GlSafeHtmlDirective as SafeHtml,
} from '@gitlab/ui';
import Api from '~/api'; import Api from '~/api';
import { updateHistory, setUrlParams } from '~/lib/utils/url_utility'; import { updateHistory, setUrlParams } from '~/lib/utils/url_utility';
import { __ } from '~/locale'; import { __ } from '~/locale';
...@@ -20,6 +27,9 @@ export default { ...@@ -20,6 +27,9 @@ export default {
GlTab, GlTab,
FilteredSearchBar, FilteredSearchBar,
}, },
directives: {
SafeHtml,
},
inject: { inject: {
projectPath: { projectPath: {
default: '', default: '',
...@@ -265,7 +275,7 @@ export default { ...@@ -265,7 +275,7 @@ export default {
<template> <template>
<div class="incident-management-list"> <div class="incident-management-list">
<gl-alert v-if="showErrorMsg" variant="danger" @dismiss="$emit('error-alert-dismissed')"> <gl-alert v-if="showErrorMsg" variant="danger" @dismiss="$emit('error-alert-dismissed')">
<p v-html="serverErrorMessage || i18n.errorMsg /* eslint-disable-line vue/no-v-html */"></p> <p v-safe-html="serverErrorMessage || i18n.errorMsg"></p>
</gl-alert> </gl-alert>
<div <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