Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 9 deletions

diff --git a/app/assets/javascripts/serverless/components/functions.vue b/app/assets/javascripts/serverless/components/functions.vue
index b5b1c004590..308bc4a2ddd 100644
--- a/app/assets/javascripts/serverless/components/functions.vue
+++ b/app/assets/javascripts/serverless/components/functions.vue
@@ -44,12 +44,14 @@ export default {
           'Serverless|Your repository does not have a corresponding %{startTag}serverless.yml%{endTag} file.',
         ),
         { startTag: '<code>', endTag: '</code>' },
+        false,
       );
     },
     noGitlabYamlConfigured() {
       return sprintf(
         s__('Serverless|Your %{startTag}.gitlab-ci.yml%{endTag} file is not properly configured.'),
         { startTag: '<code>', endTag: '</code>' },
+        false,
       );
     },
     mismatchedServerlessFunctions() {
@@ -58,6 +60,7 @@ export default {
           "Serverless|The functions listed in the %{startTag}serverless.yml%{endTag} file don't match the namespace of your cluster.",
         ),
         { startTag: '<code>', endTag: '</code>' },
+        false,
       );
     },
   },
@@ -111,15 +114,9 @@ export default {
             }}
           </p>
           <ul>
-            <li>
-              {{ noServerlessConfigFile }}
-            </li>
-            <li>
-              {{ noGitlabYamlConfigured }}
-            </li>
-            <li>
-              {{ mismatchedServerlessFunctions }}
-            </li>
+            <li v-html="noServerlessConfigFile"></li>
+            <li v-html="noGitlabYamlConfigured"></li>
+            <li v-html="mismatchedServerlessFunctions"></li>
             <li>{{ s__('Serverless|The deploy job has not finished.') }}</li>
           </ul>