diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 14:16:25 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 14:16:25 +0100 |
commit | 6c20dad201efdfaec59c37ce3f3ca4c7702b5274 (patch) | |
tree | b1df234db04b93b7d0c241d120019f03368850f4 /app/views/admin/report_notes/_report_note.html.haml | |
parent | 7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff) | |
parent | 18d00055f4f7e28a9a4cc81d3159072e9beb779d (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
Diffstat (limited to 'app/views/admin/report_notes/_report_note.html.haml')
-rw-r--r-- | app/views/admin/report_notes/_report_note.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml index 14df2f609..54c252ee8 100644 --- a/app/views/admin/report_notes/_report_note.html.haml +++ b/app/views/admin/report_notes/_report_note.html.haml @@ -4,8 +4,8 @@ .report-notes__item__header %span.username = link_to report_note.account.username, admin_account_path(report_note.account_id) - %time.relative-formatted{ datetime: report_note.created_at } - = t('admin.report_notes.created_at') + %time.relative-formatted{ datetime: report_note.created_at.iso8601 } + = l report_note.created_at.to_date .report-notes__item__content = simple_format(h(report_note.content)) |