Commit 8dec52d0 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'imrishabh18-#241859' into 'master'

refactor: replacing v-html with v-safe-html

See merge request gitlab-org/gitlab!70829
parents 72536fab b48a1828
<script> <script>
import '~/commons/bootstrap'; import '~/commons/bootstrap';
import { GlIcon, GlTooltip, GlTooltipDirective, GlButton } from '@gitlab/ui'; import {
GlIcon,
GlTooltip,
GlTooltipDirective,
GlButton,
GlSafeHtmlDirective as SafeHtml,
} from '@gitlab/ui';
import IssueDueDate from '~/boards/components/issue_due_date.vue'; import IssueDueDate from '~/boards/components/issue_due_date.vue';
import { sprintf } from '~/locale'; import { sprintf } from '~/locale';
import relatedIssuableMixin from '../../mixins/related_issuable_mixin'; import relatedIssuableMixin from '../../mixins/related_issuable_mixin';
...@@ -22,6 +28,7 @@ export default { ...@@ -22,6 +28,7 @@ export default {
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
SafeHtml,
}, },
mixins: [relatedIssuableMixin], mixins: [relatedIssuableMixin],
props: { props: {
...@@ -84,7 +91,7 @@ export default { ...@@ -84,7 +91,7 @@ export default {
/> />
</div> </div>
<gl-tooltip :target="() => $refs.iconElementXL"> <gl-tooltip :target="() => $refs.iconElementXL">
<span v-html="stateTitle /* eslint-disable-line vue/no-v-html */"></span> <span v-safe-html="stateTitle"></span>
</gl-tooltip> </gl-tooltip>
<gl-icon <gl-icon
v-if="confidential" v-if="confidential"
...@@ -110,7 +117,7 @@ export default { ...@@ -110,7 +117,7 @@ export default {
class="item-path-area item-path-id d-flex align-items-center mr-2 mt-2 mt-xl-0 ml-xl-2" class="item-path-area item-path-id d-flex align-items-center mr-2 mt-2 mt-xl-0 ml-xl-2"
> >
<gl-tooltip :target="() => this.$refs.iconElement"> <gl-tooltip :target="() => this.$refs.iconElement">
<span v-html="stateTitle /* eslint-disable-line vue/no-v-html */"></span> <span v-safe-html="stateTitle"></span>
</gl-tooltip> </gl-tooltip>
<span v-gl-tooltip :title="itemPath" class="path-id-text d-inline-block">{{ <span v-gl-tooltip :title="itemPath" class="path-id-text d-inline-block">{{
itemPath itemPath
......
...@@ -87,8 +87,7 @@ export default { ...@@ -87,8 +87,7 @@ export default {
data-testid="month-dropdown-item" data-testid="month-dropdown-item"
@click="changeSelectedMonth(monthName)" @click="changeSelectedMonth(monthName)"
> >
<!-- eslint-disable-next-line @gitlab/vue-require-string-literal-i18n-helpers --> {{ monthName }}
{{ __(monthName) }}
</gl-dropdown-item> </gl-dropdown-item>
</gl-dropdown> </gl-dropdown>
</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