Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 6 insertions, 5 deletions

diff --git a/app/assets/javascripts/notebook/cells/output/html.vue b/app/assets/javascripts/notebook/cells/output/html.vue
index a3d7ddd5bad..dc5b2b66348 100644
--- a/app/assets/javascripts/notebook/cells/output/html.vue
+++ b/app/assets/javascripts/notebook/cells/output/html.vue
@@ -1,5 +1,5 @@
 <script>
-/* eslint-disable vue/no-v-html */
+import { GlSafeHtmlDirective } from '@gitlab/ui';
 import { sanitize } from '~/lib/dompurify';
 import Prompt from '../prompt.vue';
 
@@ -7,6 +7,9 @@ export default {
   components: {
     Prompt,
   },
+  directives: {
+    SafeHtml: GlSafeHtmlDirective,
+  },
   props: {
     count: {
       type: Number,
@@ -23,9 +26,7 @@ export default {
   },
   computed: {
     sanitizedOutput() {
-      return sanitize(this.rawCode, {
-        ALLOWED_ATTR: ['src'],
-      });
+      return sanitize(this.rawCode);
     },
     showOutput() {
       return this.index === 0;
@@ -37,6 +38,6 @@ export default {
 <template>
   <div class="output">
     <prompt type="Out" :count="count" :show-output="showOutput" />
-    <div class="gl-overflow-auto" v-html="sanitizedOutput"></div>
+    <div v-safe-html="sanitizedOutput" class="gl-overflow-auto"></div>
   </div>
 </template>