diff --git a/runbot_merge/views/batch.xml b/runbot_merge/views/batch.xml index f030f55d..a33df3a0 100644 --- a/runbot_merge/views/batch.xml +++ b/runbot_merge/views/batch.xml @@ -75,6 +75,7 @@ + diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml index ca1694f9..a01ac998 100644 --- a/runbot_merge/views/templates.xml +++ b/runbot_merge/views/templates.xml @@ -530,6 +530,7 @@ for branch in [*branches, branches.browse(())]: 'checked': done or p.status == 'success', 'reviewed': done or bool(p.reviewed_by), 'attached': done or p.parent_id or not p.source_id, + 'merge_date': p.merge_date or '', }) state = None for i, s in zip(range(2, -1, -1), ['danger', 'success', 'warning']): @@ -607,9 +608,10 @@ action = batches that's not always the case --> # +