Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 15 insertions, 14 deletions

diff --git a/app/assets/javascripts/notes/components/note_actions/reply_button.vue b/app/assets/javascripts/notes/components/note_actions/reply_button.vue
index acbbee13a6d..5ce03091504 100644
--- a/app/assets/javascripts/notes/components/note_actions/reply_button.vue
+++ b/app/assets/javascripts/notes/components/note_actions/reply_button.vue
@@ -1,7 +1,11 @@
 <script>
 import { GlTooltipDirective, GlButton } from '@gitlab/ui';
+import { __ } from '~/locale';
 
 export default {
+  i18n: {
+    buttonText: __('Reply to comment'),
+  },
   name: 'ReplyButton',
   components: {
     GlButton,
@@ -13,18 +17,15 @@ export default {
 </script>
 
 <template>
-  <div class="gl-ml-2">
-    <gl-button
-      ref="button"
-      v-gl-tooltip
-      data-track-event="click_button"
-      data-track-label="reply_comment_button"
-      category="tertiary"
-      size="small"
-      icon="comment"
-      :title="__('Reply to comment')"
-      :aria-label="__('Reply to comment')"
-      @click="$emit('startReplying')"
-    />
-  </div>
+  <gl-button
+    v-gl-tooltip
+    data-track-event="click_button"
+    data-track-label="reply_comment_button"
+    category="tertiary"
+    size="small"
+    icon="comment"
+    :title="$options.i18n.buttonText"
+    :aria-label="$options.i18n.buttonText"
+    @click="$emit('startReplying')"
+  />
 </template>