diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-07 15:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-07 15:09:12 +0300 |
commit | cf37ae7acd7e3868f632c37a508fe9c5a220a9ba (patch) | |
tree | b1ca4075bc89c4981ece17681993d5bf52e5ce25 /app/assets/javascripts/notes | |
parent | 419f9c0ac3ae842964cc191932cab795463b259c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r-- | app/assets/javascripts/notes/components/discussion_actions.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/notes/components/discussion_reply_placeholder.vue | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_actions.vue b/app/assets/javascripts/notes/components/discussion_actions.vue index 3d6c9e6b297..878a748e99a 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 ab00ccdc09b..0204169214b 100644 --- a/app/assets/javascripts/notes/components/discussion_reply_placeholder.vue +++ b/app/assets/javascripts/notes/components/discussion_reply_placeholder.vue @@ -1,11 +1,6 @@ <script> -import { GlButton } from '@gitlab/ui'; - export default { name: 'ReplyPlaceholder', - components: { - GlButton, - }, props: { buttonText: { type: String, @@ -16,13 +11,13 @@ export default { </script> <template> - <gl-button - category="primary" - variant="success" - class="js-vue-discussion-reply" + <button + ref="button" + type="button" + class="js-vue-discussion-reply btn btn-text-field" :title="s__('MergeRequests|Add a reply')" @click="$emit('onClick')" > {{ buttonText }} - </gl-button> + </button> </template> |