diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 06:08:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 06:08:25 +0300 |
commit | 8a902a9508717f7a107221b37d894e4682fc27c3 (patch) | |
tree | 9f01ce7ab957d48135fc87f87f3320d3fa9f38ab /app/assets/javascripts/notes | |
parent | 255fd0f72c842af763ecd85128491db4c281d73d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r-- | app/assets/javascripts/notes/components/toggle_replies_widget.vue | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes/components/toggle_replies_widget.vue b/app/assets/javascripts/notes/components/toggle_replies_widget.vue index f49fd2c3fa3..0628e1d8647 100644 --- a/app/assets/javascripts/notes/components/toggle_replies_widget.vue +++ b/app/assets/javascripts/notes/components/toggle_replies_widget.vue @@ -1,11 +1,12 @@ <script> import { uniqBy } from 'lodash'; -import { GlIcon } from '@gitlab/ui'; +import { GlButton, GlIcon } from '@gitlab/ui'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { components: { + GlButton, GlIcon, UserAvatarLink, TimeAgoTooltip, @@ -57,14 +58,15 @@ export default { tooltip-placement="bottom" /> </div> - <button - class="btn btn-link js-replies-text" + <gl-button + class="js-replies-text" + category="tertiary" + variant="link" data-qa-selector="expand_replies_button" - type="button" @click="toggle" > {{ replies.length }} {{ n__('reply', 'replies', replies.length) }} - </button> + </gl-button> {{ __('Last reply by') }} <a :href="lastReply.author.path" class="btn btn-link author-link"> {{ lastReply.author.name }} |