diff options
author | Fatih Acet <acetfatih@gmail.com> | 2019-07-19 20:43:03 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-07-19 20:43:03 +0300 |
commit | fbfba6f1b433512b91c6244746ff064f2d790e3f (patch) | |
tree | 1200cdb8144a234d8b9ba90b0d209cf2e0b06b3f /app | |
parent | b8dc4c0e410252a9268ec175277c1cfe986bff4d (diff) | |
parent | 1810feae966e0074b7156148eb40587766a7ec32 (diff) |
Merge branch '64160-fix-duplicate-buttons' into 'master'
Remove duplicate buttons
Closes #64160
See merge request gitlab-org/gitlab-ce!30757
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/notes/components/discussion_actions.vue | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_actions.vue b/app/assets/javascripts/notes/components/discussion_actions.vue index f4570c1292c..7aa8580d794 100644 --- a/app/assets/javascripts/notes/components/discussion_actions.vue +++ b/app/assets/javascripts/notes/components/discussion_actions.vue @@ -39,30 +39,27 @@ export default { </script> <template> - <div class="discussion-with-resolve-btn"> + <div class="discussion-with-resolve-btn clearfix"> <reply-placeholder :button-text="s__('MergeRequests|Reply...')" class="qa-discussion-reply" @onClick="$emit('showReplyForm')" /> - <resolve-discussion-button - v-if="discussion.resolvable" - :is-resolving="isResolving" - :button-title="resolveButtonTitle" - @onClick="$emit('resolve')" - /> - <div v-if="discussion.resolvable" class="btn-group discussion-actions ml-sm-2" role="group"> - <resolve-with-issue-button v-if="resolveWithIssuePath" :url="resolveWithIssuePath" /> - <jump-to-next-discussion-button - v-if="shouldShowJumpToNextDiscussion" - @onClick="$emit('jumpToNextDiscussion')" - /> + + <div class="btn-group discussion-actions" role="group"> + <div class="btn-group"> + <resolve-discussion-button + v-if="discussion.resolvable" + :is-resolving="isResolving" + :button-title="resolveButtonTitle" + @onClick="$emit('resolve')" + /> + </div> <resolve-with-issue-button v-if="discussion.resolvable && resolveWithIssuePath" :url="resolveWithIssuePath" /> </div> - <div v-if="discussion.resolvable && shouldShowJumpToNextDiscussion" class="btn-group discussion-actions ml-sm-2" |