From eb0bec8970ce3ae7446ab198fcb74292ea2cc37a Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Thu, 24 Aug 2023 14:49:08 -0600 Subject: [PATCH 1/6] Add actual time that the MR was merged to merged MR list Changelog: added --- app/views/projects/merge_requests/_merge_request.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 7b815d996e003d..ba95849fde0387 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -46,7 +46,8 @@ %ul.controls.d-flex.align-items-end - if merge_request.merged? %li.d-none.d-sm-flex - = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info') + %span.has-tooltip{title: l(merge_request.merged_at.to_time, format: "%b %-d, %Y %-l:%M%P %Z")} + = 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') -- GitLab From 7046f529ab53be2517256ba8ae071c15e694b7b9 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Tue, 29 Aug 2023 15:24:44 -0600 Subject: [PATCH 2/6] Haml lint fix --- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index ba95849fde0387..5510e00927a3f9 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -46,7 +46,7 @@ %ul.controls.d-flex.align-items-end - if merge_request.merged? %li.d-none.d-sm-flex - %span.has-tooltip{title: l(merge_request.merged_at.to_time, format: "%b %-d, %Y %-l:%M%P %Z")} + %span.has-tooltip{ title: l(merge_request.merged_at.to_time, format: "%b %-d, %Y %-l:%M%P %Z") } = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info') - elsif merge_request.closed? %li.d-none.d-sm-flex -- GitLab From a77c1d83ec79eaca8f4c65a28a53dae223fe73a5 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Tue, 5 Sep 2023 13:48:53 -0600 Subject: [PATCH 3/6] Add focusable element so the tooltip can be shown on keyboard nav --- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 5510e00927a3f9..475a8a4650f2de 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -46,7 +46,7 @@ %ul.controls.d-flex.align-items-end - if merge_request.merged? %li.d-none.d-sm-flex - %span.has-tooltip{ title: l(merge_request.merged_at.to_time, format: "%b %-d, %Y %-l:%M%P %Z") } + %a.has-tooltip{ href: merge_request_path(merge_request), title: l(merge_request.merged_at.to_time, format: :default) } = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info') - elsif merge_request.closed? %li.d-none.d-sm-flex -- GitLab From 9cf85dc9542b6909921db414ec2f07af5d426e05 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Tue, 5 Sep 2023 13:50:47 -0600 Subject: [PATCH 4/6] Don't override the default time format --- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 475a8a4650f2de..3fde238ae8af0a 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -46,7 +46,7 @@ %ul.controls.d-flex.align-items-end - if merge_request.merged? %li.d-none.d-sm-flex - %a.has-tooltip{ href: merge_request_path(merge_request), title: l(merge_request.merged_at.to_time, format: :default) } + %a.has-tooltip{ href: merge_request_path(merge_request), title: l(merge_request.merged_at.to_time) } = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info') - elsif merge_request.closed? %li.d-none.d-sm-flex -- GitLab From 390699a18ca7302245f7f2b75994b2a884fb2cff Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Tue, 5 Sep 2023 15:41:09 -0600 Subject: [PATCH 5/6] Send the link directly to the merged state of the widget --- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 3fde238ae8af0a..7151189c6f3f67 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -46,7 +46,7 @@ %ul.controls.d-flex.align-items-end - if merge_request.merged? %li.d-none.d-sm-flex - %a.has-tooltip{ href: merge_request_path(merge_request), title: l(merge_request.merged_at.to_time) } + %a.has-tooltip{ href: "#{merge_request_path(merge_request)}#widget-state", title: l(merge_request.merged_at.to_time) } = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info') - elsif merge_request.closed? %li.d-none.d-sm-flex -- GitLab From 84063aff342b0e260d7f0e612d1b34094a7fe565 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Wed, 6 Sep 2023 16:40:13 -0600 Subject: [PATCH 6/6] Provide a message for when a merged merge request has no merged date --- app/views/projects/merge_requests/_merge_request.html.haml | 3 ++- locale/gitlab.pot | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 7151189c6f3f67..4a7aa9a86abc97 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -45,8 +45,9 @@ .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 - %a.has-tooltip{ href: "#{merge_request_path(merge_request)}#widget-state", title: l(merge_request.merged_at.to_time) } + %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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e23b2dfb135109..0ef51b75c0220c 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 "" -- GitLab