Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 3 deletions

diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue
index bbe72a2b122..631263e1ef1 100644
--- a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue
@@ -1,6 +1,5 @@
 <script>
-/* eslint-disable vue/no-v-html */
-import { GlIcon } from '@gitlab/ui';
+import { GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
 import ViewerMixin from './mixins';
 import { HIGHLIGHT_CLASS_NAME } from './constants';
 
@@ -8,6 +7,9 @@ export default {
   components: {
     GlIcon,
   },
+  directives: {
+    SafeHtml,
+  },
   mixins: [ViewerMixin],
   data() {
     return {
@@ -64,7 +66,7 @@ export default {
       </a>
     </div>
     <div class="blob-content">
-      <pre class="code highlight"><code id="blob-code-content" v-html="content"></code></pre>
+      <pre class="code highlight"><code id="blob-code-content" v-safe-html="content"></code></pre>
     </div>
   </div>
 </template>