Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 15 insertions, 6 deletions

diff --git a/app/assets/javascripts/issue_show/components/locked_warning.vue b/app/assets/javascripts/issue_show/components/locked_warning.vue
index 2f3e611e089..19c7a11d87b 100644
--- a/app/assets/javascripts/issue_show/components/locked_warning.vue
+++ b/app/assets/javascripts/issue_show/components/locked_warning.vue
@@ -1,18 +1,27 @@
 <script>
+import { __, sprintf } from '~/locale';
+
 export default {
   computed: {
     currentPath() {
       return window.location.pathname;
     },
+    alertMessage() {
+      return sprintf(
+        __(
+          'Someone edited the issue at the same time you did. Please check out %{linkStart}the issue%{linkEnd} and make sure your changes will not unintentionally remove theirs.',
+        ),
+        {
+          linkStart: `<a href="${this.currentPath}" target="_blank" rel="nofollow">`,
+          linkEnd: `</a>`,
+        },
+        false,
+      );
+    },
   },
 };
 </script>
 
 <template>
-  <div class="alert alert-danger">
-    {{ sprintf(__("Someone edited the issue at the same time you did. Please check out
-    %{linkStart}%the issue%{linkEnd} and make sure your changes will not unintentionally remove
-    theirs."), { linkStart: `<a href="${currentPath}" target="_blank" rel="nofollow">` linkEnd: '</a
-    >', }) }}
-  </div>
+  <div class="alert alert-danger" v-html="alertMessage"></div>
 </template>