diff --git a/app/assets/javascripts/merge_requests/list/queries/merge_request.fragment.graphql b/app/assets/javascripts/merge_requests/list/queries/merge_request.fragment.graphql index e800b37f9a2ced19cc58075efcb03164fb2a4375..abdf06db3c672f1979b3d6effd0d88edc94d79cb 100644 --- a/app/assets/javascripts/merge_requests/list/queries/merge_request.fragment.graphql +++ b/app/assets/javascripts/merge_requests/list/queries/merge_request.fragment.graphql @@ -9,6 +9,7 @@ fragment MergeRequestFragment on MergeRequest { state title updatedAt + mergedAt upvotes resolvedDiscussionsCount @include(if: $isSignedIn) resolvableDiscussionsCount @include(if: $isSignedIn) diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue index 2bc692d7b630282e04fb01c670bbfdb359447829..1cb9ac53453911deb0adf0c741d9255183676c7e 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue +++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue @@ -166,6 +166,9 @@ export default { isClosed() { return [STATUS_CLOSED, STATE_CLOSED].includes(this.issuable.state); }, + statusTooltip() { + return this.issuable.mergedAt ? this.tooltipTitle(this.issuable.mergedAt) : ''; + }, timestamp() { return this.isClosed && this.issuable.closedAt ? this.issuable.closedAt @@ -495,7 +498,12 @@ export default {