diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 7b815d996e003d4e6510e1a2850e1dca5cc27b2a..4a7aa9a86abc97b061f3d57dad3d7ef1d7eae4b0 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -45,8 +45,10 @@ .issuable-meta %ul.controls.d-flex.align-items-end - if merge_request.merged? + - merged_at = merge_request.merged_at ? l(merge_request.merged_at.to_time) : _("Merge date & time could not be determined") %li.d-none.d-sm-flex - = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info') + %a.has-tooltip{ href: "#{merge_request_path(merge_request)}#widget-state", title: merged_at } + = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info') - elsif merge_request.closed? %li.d-none.d-sm-flex = render Pajamas::BadgeComponent.new(_('Closed'), size: 'sm', variant: 'danger') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e23b2dfb135109ceaaacbb6a54f799872c834777..0ef51b75c0220c16a134488a490254bba9016fe1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -29412,6 +29412,9 @@ msgstr "" msgid "Merge conflicts" msgstr "" +msgid "Merge date & time could not be determined" +msgstr "" + msgid "Merge details" msgstr ""