Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 4 deletions

diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js
index 9f4e12a3010..48be8af3ff6 100644
--- a/app/assets/javascripts/lib/utils/text_markdown.js
+++ b/app/assets/javascripts/lib/utils/text_markdown.js
@@ -263,10 +263,12 @@ export function insertMarkdownText({
   if (tag === LINK_TAG_PATTERN) {
     if (URL) {
       try {
-        new URL(selected); // eslint-disable-line no-new
-        // valid url
-        tag = '[text]({text})';
-        select = 'text';
+        const url = new URL(selected);
+
+        if (url.origin !== 'null' || url.origin === null) {
+          tag = '[text]({text})';
+          select = 'text';
+        }
       } catch (e) {
         // ignore - no valid url
       }