Merge branch 'djadmin-v-html-3' into 'master'

Switch to v-safe-html in iteration reports

See merge request gitlab-org/gitlab!70239

ee/app/assets/javascripts/iterations/components/iteration_report.vue

@@ -7,6 +7,7 @@ import {
   GlIcon,
   GlLoadingIcon,
   GlModal,
+  GlSafeHtmlDirective,
 } from '@gitlab/ui';
 import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue';
 import { TYPE_ITERATION } from '~/graphql_shared/constants';
@@ -33,6 +34,9 @@ export default {
     IterationReportTabs,
     TimeboxStatusBadge,
   },
+  directives: {
+    SafeHtml: GlSafeHtmlDirective,
+  },
   apollo: {
     iteration: {
       query,
@@ -117,6 +121,7 @@ export default {
         });
     },
   },
+  safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
 };
 </script>
 
@@ -178,7 +183,7 @@ export default {
       <h3 ref="title" class="page-title">{{ iteration.title }}</h3>
       <div
         ref="description"
-        v-html="iteration.descriptionHtml /* eslint-disable-line vue/no-v-html */"
+        v-safe-html:[$options.safeHtmlConfig]="iteration.descriptionHtml"
       ></div>
       <burn-charts
         :start-date="iteration.startDate"

ee/app/assets/javascripts/iterations/components/iteration_report_without_vue_router.vue

@@ -8,6 +8,7 @@ import {
   GlIcon,
   GlLoadingIcon,
   GlModal,
+  GlSafeHtmlDirective,
 } from '@gitlab/ui';
 import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue';
 import { TYPE_ITERATION } from '~/graphql_shared/constants';
@@ -47,6 +48,9 @@ export default {
     IterationReportTabs,
     GlModal,
   },
+  directives: {
+    SafeHtml: GlSafeHtmlDirective,
+  },
   apollo: {
     iteration: {
       query,
@@ -205,6 +209,7 @@ export default {
         });
     },
   },
+  safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
 };
 </script>
 
@@ -276,7 +281,7 @@ export default {
       <h3 ref="title" class="page-title">{{ iteration.title }}</h3>
       <div
         ref="description"
-        v-html="iteration.descriptionHtml /* eslint-disable-line vue/no-v-html */"
+        v-safe-html:[$options.safeHtmlConfig]="iteration.descriptionHtml"
       ></div>
       <burn-charts
         :start-date="iteration.startDate"