diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-15 20:45:27 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-15 20:45:27 +0100 |
commit | c79a03b319e17f5ab8c40d065842607de0d76108 (patch) | |
tree | 71debfede36bf8985cd5e3e37b6107560c358f57 /app/views/admin/reports/_status.html.haml | |
parent | 80c4db160ecfd201cb82ed320cbe3eb32236ad20 (diff) | |
parent | e798c1c64cf417b88379e1d381592a8920fdeeab (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.
Diffstat (limited to 'app/views/admin/reports/_status.html.haml')
-rw-r--r-- | app/views/admin/reports/_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index 1c033c4c3..7538cfd54 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -29,7 +29,7 @@ %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) - if status.edited? · - = t('statuses.edited_at', date: l(status.edited_at)) + = t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')) - if status.discarded? · %span.negative-hint= t('admin.statuses.deleted') |