Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 6 deletions

diff --git a/app/assets/javascripts/notes/components/discussion_actions.vue b/app/assets/javascripts/notes/components/discussion_actions.vue
index 878a748e99a..3d6c9e6b297 100644
--- a/app/assets/javascripts/notes/components/discussion_actions.vue
+++ b/app/assets/javascripts/notes/components/discussion_actions.vue
@@ -55,7 +55,7 @@ export default {
   <div class="discussion-with-resolve-btn clearfix">
     <reply-placeholder
       data-qa-selector="discussion_reply_tab"
-      :button-text="s__('MergeRequests|Reply...')"
+      :button-text="s__('MergeRequests|Reply')"
       @onClick="$emit('showReplyForm')"
     />
 
diff --git a/app/assets/javascripts/notes/components/discussion_reply_placeholder.vue b/app/assets/javascripts/notes/components/discussion_reply_placeholder.vue
index 0204169214b..ab00ccdc09b 100644
--- a/app/assets/javascripts/notes/components/discussion_reply_placeholder.vue
+++ b/app/assets/javascripts/notes/components/discussion_reply_placeholder.vue
@@ -1,6 +1,11 @@
 <script>
+import { GlButton } from '@gitlab/ui';
+
 export default {
   name: 'ReplyPlaceholder',
+  components: {
+    GlButton,
+  },
   props: {
     buttonText: {
       type: String,
@@ -11,13 +16,13 @@ export default {
 </script>
 
 <template>
-  <button
-    ref="button"
-    type="button"
-    class="js-vue-discussion-reply btn btn-text-field"
+  <gl-button
+    category="primary"
+    variant="success"
+    class="js-vue-discussion-reply"
     :title="s__('MergeRequests|Add a reply')"
     @click="$emit('onClick')"
   >
     {{ buttonText }}
-  </button>
+  </gl-button>
 </template>