Add "reverted" notice to merge request list

59125300 · Kev · 46a4e693 · 59125300
Commit 59125300 authored Oct 18, 2020 by Kev
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/_merge_request.html.haml +4 -1

No files found.
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -40,7 +40,10 @@
    .issuable-meta
      %ul.controls.d-flex.align-items-end
-        - if merge_request.merged?
+        - if merge_request.is_reverted?(current_user)
+          %li.issuable-status.d-none.d-sm-inline-block
+            = _('MERGED (REVERTED)')
+        - elsif merge_request.merged?
          %li.issuable-status.d-none.d-sm-inline-block
            = _('MERGED')
        - elsif merge_request.closed?