summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/blob
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 09:06:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 09:06:38 +0000
commit4a45f0eff2a25c64bdd83926e35a8894a4f0469f (patch)
tree8068fff1731ccf4182605c2661c25f0a1c936866 /app/assets/javascripts/blob
parentd9c3a63a4394990bcdccbaca73c58278469236b4 (diff)
downloadgitlab-ce-4a45f0eff2a25c64bdd83926e35a8894a4f0469f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob')
-rw-r--r--app/assets/javascripts/blob/blob_utils.js4
1 files changed, 2 insertions, 2 deletions
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 };