Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-21 18:17:23 +00:00
parent cc230e5d57 5ea643b279
commit f93806ea55
4 changed files with 25 additions and 10 deletions
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@ -72,7 +72,11 @@
 .speech-bubble
  .speech-bubble__bubble= simple_format(@report.comment.presence || t('admin.reports.comment.none'))
  .speech-bubble__owner
-    = admin_account_link_to @report.account
+    - if @report.account.local?
+      = admin_account_link_to @report.account
+    - else
+      = @report.account.domain
+      %br/
    %time.formatted{ datetime: @report.created_at.iso8601 }

 - unless @report.statuses.empty?