From d8a7223a9ae47971ee3ed3070f5d42f7d9aa2690 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 22 Oct 2020 18:00:36 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee

---
 .../javascripts/jobs/components/log/line.vue       | 32 ++++------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/jobs/components/log/line.vue b/app/assets/javascripts/jobs/components/log/line.vue
index 791664c05d9..e68d5b8eda4 100644
--- a/app/assets/javascripts/jobs/components/log/line.vue
+++ b/app/assets/javascripts/jobs/components/log/line.vue
@@ -1,24 +1,6 @@
 <script>
-import linkifyHtml from 'linkifyjs/html';
-import { sanitize } from '~/lib/dompurify';
-import { isAbsolute } from '~/lib/utils/url_utility';
 import LineNumber from './line_number.vue';
 
-const linkifyOptions = {
-  attributes: {
-    // eslint-disable-next-line @gitlab/require-i18n-strings
-    rel: 'nofollow noopener',
-  },
-  className: 'gl-reset-color!',
-  defaultProtocol: 'https',
-  validate: {
-    email: false,
-    url(value) {
-      return isAbsolute(value);
-    },
-  },
-};
-
 export default {
   functional: true,
   props: {
@@ -35,15 +17,13 @@ export default {
     const { line, path } = props;
 
     const chars = line.content.map(content => {
-      const linkfied = linkifyHtml(content.text, linkifyOptions);
-      return h('span', {
-        class: ['gl-white-space-pre-wrap', content.style],
-        domProps: {
-          innerHTML: sanitize(linkfied, {
-            ALLOWED_TAGS: ['a'],
-          }),
+      return h(
+        'span',
+        {
+          class: ['gl-white-space-pre-wrap', content.style],
         },
-      });
+        content.text,
+      );
     });
 
     return h('div', { class: 'js-line log-line' }, [
-- 
cgit v1.2.3