Commit fa16dde0 authored by Dheeraj Joshi's avatar Dheeraj Joshi

Switch to v-safe-html in iteration reports

parent d8f7c412
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
GlIcon, GlIcon,
GlLoadingIcon, GlLoadingIcon,
GlModal, GlModal,
GlSafeHtmlDirective,
} from '@gitlab/ui'; } from '@gitlab/ui';
import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue'; import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue';
import { TYPE_ITERATION } from '~/graphql_shared/constants'; import { TYPE_ITERATION } from '~/graphql_shared/constants';
...@@ -33,6 +34,9 @@ export default { ...@@ -33,6 +34,9 @@ export default {
IterationReportTabs, IterationReportTabs,
TimeboxStatusBadge, TimeboxStatusBadge,
}, },
directives: {
SafeHtml: GlSafeHtmlDirective,
},
apollo: { apollo: {
iteration: { iteration: {
query, query,
...@@ -176,10 +180,7 @@ export default { ...@@ -176,10 +180,7 @@ export default {
</gl-modal> </gl-modal>
</div> </div>
<h3 ref="title" class="page-title">{{ iteration.title }}</h3> <h3 ref="title" class="page-title">{{ iteration.title }}</h3>
<div <div ref="description" v-safe-html="iteration.descriptionHtml"></div>
ref="description"
v-html="iteration.descriptionHtml /* eslint-disable-line vue/no-v-html */"
></div>
<burn-charts <burn-charts
:start-date="iteration.startDate" :start-date="iteration.startDate"
:due-date="iteration.dueDate" :due-date="iteration.dueDate"
......
...@@ -8,6 +8,7 @@ import { ...@@ -8,6 +8,7 @@ import {
GlIcon, GlIcon,
GlLoadingIcon, GlLoadingIcon,
GlModal, GlModal,
GlSafeHtmlDirective,
} from '@gitlab/ui'; } from '@gitlab/ui';
import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue'; import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue';
import { TYPE_ITERATION } from '~/graphql_shared/constants'; import { TYPE_ITERATION } from '~/graphql_shared/constants';
...@@ -47,6 +48,9 @@ export default { ...@@ -47,6 +48,9 @@ export default {
IterationReportTabs, IterationReportTabs,
GlModal, GlModal,
}, },
directives: {
SafeHtml: GlSafeHtmlDirective,
},
apollo: { apollo: {
iteration: { iteration: {
query, query,
...@@ -274,10 +278,7 @@ export default { ...@@ -274,10 +278,7 @@ export default {
</gl-modal> </gl-modal>
</div> </div>
<h3 ref="title" class="page-title">{{ iteration.title }}</h3> <h3 ref="title" class="page-title">{{ iteration.title }}</h3>
<div <div ref="description" v-safe-html="iteration.descriptionHtml"></div>
ref="description"
v-html="iteration.descriptionHtml /* eslint-disable-line vue/no-v-html */"
></div>
<burn-charts <burn-charts
:start-date="iteration.startDate" :start-date="iteration.startDate"
:due-date="iteration.dueDate" :due-date="iteration.dueDate"
......
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