about summary refs log tree commit diff
path: root/app/views/admin/reports
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-05 14:16:25 +0100
committerClaire <claire.github-309c@sitedethib.com>2023-01-05 14:16:25 +0100
commit6c20dad201efdfaec59c37ce3f3ca4c7702b5274 (patch)
treeb1df234db04b93b7d0c241d120019f03368850f4 /app/views/admin/reports
parent7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff)
parent18d00055f4f7e28a9a4cc81d3159072e9beb779d (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/reports')
-rw-r--r--app/views/admin/reports/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 1535e5003..181067802 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -141,7 +141,7 @@
           - else
             = link_to @report.account.domain, admin_instance_path(@report.account.domain)
         %time.relative-formatted{ datetime: @report.created_at.iso8601 }
-          = t('admin.report_notes.created_at')
+          = l @report.created_at.to_date
 
       .report-notes__item__content
         = simple_format(h(@report.comment))