Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 11 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js b/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
index 5fba070f79c..cba12507eba 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
@@ -35,9 +35,7 @@ const textStyleTags = {
   [getStartTag('small')]: '<span class="gl-font-sm gl-text-gray-700">',
 };
 
-export const generateText = (text) => {
-  if (typeof text !== 'string') return null;
-
+const createText = (text) => {
   return text
     .replace(
       new RegExp(
@@ -60,3 +58,21 @@ export const generateText = (text) => {
     )
     .replace(/%{([a-z]|_)+}/g, ''); // Filter out any tags we don't know about
 };
+
+export const generateText = (text) => {
+  if (typeof text === 'string') {
+    return createText(text);
+  } else if (
+    typeof text === 'object' &&
+    typeof text.text === 'string' &&
+    typeof text.href === 'string'
+  ) {
+    return createText(
+      `${
+        text.prependText ? `${text.prependText} ` : ''
+      }<a class="gl-text-decoration-underline" href="${text.href}">${text.text}</a>`,
+    );
+  }
+
+  return null;
+};
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
index d32db50874c..cea8df2484b 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
@@ -83,14 +83,11 @@ export default {
       this.collapsedData.newErrors.map((e) => {
         return fullData.push({
           text: `${capitalizeFirstCharacter(e.severity)} - ${e.description}`,
-          subtext: sprintf(
-            s__(`ciReport|in %{open_link}${e.file_path}:${e.line}%{close_link}`),
-            {
-              open_link: `<a class="gl-text-decoration-underline" href="${e.urlPath}">`,
-              close_link: '</a>',
-            },
-            false,
-          ),
+          subtext: {
+            prependText: s__(`ciReport|in`),
+            text: `${e.file_path}:${e.line}`,
+            href: e.urlPath,
+          },
           icon: {
             name: SEVERITY_ICONS_EXTENSION[e.severity],
           },