Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 19 deletions

diff --git a/app/assets/javascripts/blob_edit/edit_blob.js b/app/assets/javascripts/blob_edit/edit_blob.js
index 8561f650e8f..011898a5e7a 100644
--- a/app/assets/javascripts/blob_edit/edit_blob.js
+++ b/app/assets/javascripts/blob_edit/edit_blob.js
@@ -4,8 +4,7 @@ import $ from 'jquery';
 import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import { __ } from '~/locale';
-import { blobLinkRegex } from '~/blob/blob_utils';
-import TemplateSelectorMediator from '~/blob/file_template_mediator';
+import TemplateSelectorMediator from '../blob/file_template_mediator';
 import getModeByFileExtension from '~/lib/utils/ace_utils';
 import { addEditorMarkdownListeners } from '~/lib/utils/text_markdown';
 
@@ -18,7 +17,6 @@ export default class EditBlob {
     this.initModePanesAndLinks();
     this.initSoftWrap();
     this.initFileSelectors();
-    this.initBlobContentLinkClickability();
   }
 
   configureAceEditor() {
@@ -91,22 +89,6 @@ export default class EditBlob {
     return this.editor.focus();
   }
 
-  initBlobContentLinkClickability() {
-    this.editor.renderer.on('afterRender', () => {
-      document.querySelectorAll('.ace_text-layer .ace_line > *').forEach(token => {
-        if (token.dataset.linkified || !token.textContent.includes('http')) return;
-
-        // eslint-disable-next-line no-param-reassign
-        token.innerHTML = token.innerHTML.replace(
-          blobLinkRegex,
-          '<a target="_blank" href="$&">$&</a>',
-        );
-        // eslint-disable-next-line no-param-reassign
-        token.dataset.linkified = true;
-      });
-    });
-  }
-
   initSoftWrap() {
     this.isSoftWrapped = false;
     this.$toggleButton = $('.soft-wrap-toggle');