about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-22 04:17:14 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-22 04:17:14 +0000
commit6d00ca1c718e32ff3e4106cd06042f047c24e908 (patch)
tree8cb59949c9de424ac0b9496a3bf0ec1db480450e /app/views
parent4a7782d5c98f830f5ef65a52f176d94bef53b7fc (diff)
parent9592b5e31e19ce470252ade7b8df73625e2592e6 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/accounts/_account.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index 598f6cddd..dfa7c5649 100644
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -6,7 +6,10 @@
       = link_to account.domain, admin_accounts_path(by_domain: account.domain)
   %td
     - if account.local?
-      = t("admin.accounts.roles.#{account.user&.role}")
+      - if account.user.nil?
+        = t("admin.accounts.moderation.suspended")
+      - else
+        = t("admin.accounts.roles.#{account.user.role}")
     - else
       = account.protocol.humanize
   %td