From 4a45f0eff2a25c64bdd83926e35a8894a4f0469f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 11 Nov 2019 09:06:38 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/blob/blob_utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/blob')

diff --git a/app/assets/javascripts/blob/blob_utils.js b/app/assets/javascripts/blob/blob_utils.js
index cc9c621c679..27fcc7f7b79 100644
--- a/app/assets/javascripts/blob/blob_utils.js
+++ b/app/assets/javascripts/blob/blob_utils.js
@@ -1,5 +1,5 @@
-// capture anything starting with http:// or https:// which is not already part of a html link
+// capture anything starting with http:// or https://
 // up until a disallowed character or whitespace
-export const blobLinkRegex = /(?<!<a href=")https?:\/\/[^"<>\\^`{|}\s]+/g;
+export const blobLinkRegex = /https?:\/\/[^"<>\\^`{|}\s]+/g;
 
 export default { blobLinkRegex };
-- 
cgit v1.2.1