From d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Oct 2021 08:43:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-4-stable-ee

---
 .../issue_show/components/locked_warning.vue       | 37 ++++++++++++----------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'app/assets/javascripts/issue_show')

diff --git a/app/assets/javascripts/issue_show/components/locked_warning.vue b/app/assets/javascripts/issue_show/components/locked_warning.vue
index f3c2a31bd5b..4b99888ae73 100644
--- a/app/assets/javascripts/issue_show/components/locked_warning.vue
+++ b/app/assets/javascripts/issue_show/components/locked_warning.vue
@@ -1,30 +1,33 @@
 <script>
-import { __, sprintf } from '~/locale';
+import { GlSprintf, GlLink } from '@gitlab/ui';
+import { __ } from '~/locale';
+
+const alertMessage = __(
+  '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.',
+);
 
 export default {
+  alertMessage,
+  components: {
+    GlSprintf,
+    GlLink,
+  },
   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"
-    v-html="alertMessage /* eslint-disable-line vue/no-v-html */"
-  ></div>
+  <div class="alert alert-danger">
+    <gl-sprintf :message="$options.alertMessage">
+      <template #link="{ content }">
+        <gl-link :href="currentPath" target="_blank" rel="nofollow">
+          {{ content }}
+        </gl-link>
+      </template>
+    </gl-sprintf>
+  </div>
 </template>
-- 
cgit v1.2.3