Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 10 insertions, 7 deletions

diff --git a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
index 3766c125325..8b747aa08dd 100644
--- a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
+++ b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
@@ -1,13 +1,18 @@
 <script>
+import { GlButton } from '@gitlab/ui';
 import { mapGetters } from 'vuex';
-import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
 import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue';
 
+import { START_THREAD } from '../i18n';
+
 export default {
   name: 'DiffDiscussionReply',
+  i18n: {
+    START_THREAD,
+  },
   components: {
+    GlButton,
     NoteSignedOutWidget,
-    ReplyPlaceholder,
   },
   props: {
     hasForm: {
@@ -34,11 +39,9 @@ export default {
     <template v-if="userCanReply">
       <slot v-if="hasForm" name="form"></slot>
       <template v-else-if="renderReplyPlaceholder">
-        <reply-placeholder
-          :placeholder-text="__('Start a new discussion…')"
-          :label-text="__('New discussion')"
-          @focus="$emit('showNewDiscussionForm')"
-        />
+        <gl-button @click="$emit('showNewDiscussionForm')">
+          {{ $options.i18n.START_THREAD }}
+        </gl-button>
       </template>
     </template>
     <note-signed-out-widget v-else />