diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue index 8f2e4eb2131..074758e33b2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue @@ -26,30 +26,30 @@ export default { <template> <state-container :mr="mr" status="failed"> <span - class="gl-ml-3 gl-font-weight-bold gl-w-100 gl-flex-grow-1 gl-md-mr-3 gl-ml-0! gl-text-body!" + class="gl-ml-3 gl-font-weight-bold gl-w-100 gl-flex-grow-1 gl-md-mr-3 gl-ml-0! gl-text-body! gl-align-self-start" > {{ s__('mrWidget|Merge blocked: all threads must be resolved.') }} </span> <template #actions> <gl-button - v-if="mr.createIssueToResolveDiscussionsPath" - :href="mr.createIssueToResolveDiscussionsPath" - class="js-create-issue gl-align-self-start gl-vertical-align-top gl-mr-2" + data-testid="jump-to-first" + class="gl-align-self-start gl-vertical-align-top" size="small" variant="confirm" - category="secondary" + category="primary" + @click="jumpToFirstUnresolvedDiscussion" > - {{ s__('mrWidget|Create issue to resolve all threads') }} + {{ s__('mrWidget|Jump to first unresolved thread') }} </gl-button> <gl-button - data-testid="jump-to-first" - class="gl-mb-2 gl-md-mb-0 gl-align-self-start gl-vertical-align-top" + v-if="mr.createIssueToResolveDiscussionsPath" + :href="mr.createIssueToResolveDiscussionsPath" + class="js-create-issue gl-align-self-start gl-vertical-align-top" size="small" variant="confirm" - category="primary" - @click="jumpToFirstUnresolvedDiscussion" + category="secondary" > - {{ s__('mrWidget|Jump to first unresolved thread') }} + {{ s__('mrWidget|Create issue to resolve all threads') }} </gl-button> </template> </state-container> |