about summary refs log tree commit diff
path: root/app/views/admin
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-03-11 16:08:15 +0100
committerClaire <claire.github-309c@sitedethib.com>2021-03-11 16:08:15 +0100
commit1b6a21e6bc7ec9c0d5bb3daf2646d003ba90404c (patch)
tree656d328e630e1a4fa11e9853203f4dba8e29cb71 /app/views/admin
parent318efa49de8d0b9615427c99ab07c591230dfd80 (diff)
parentf2ca6c7a172deb9309c793adb87cdc4b46974a44 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_length_validator.rb`:
  Conflict due to glitch-soc's configurable maximum toot chars.
  Ported upstream changes.
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/accounts/index.html.haml2
-rw-r--r--app/views/admin/action_logs/index.html.haml2
-rw-r--r--app/views/admin/email_domain_blocks/index.html.haml2
-rw-r--r--app/views/admin/instances/index.html.haml2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 8eac226e0..398ab4bb4 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -51,6 +51,6 @@
         %th= t('admin.accounts.most_recent_activity')
         %th
     %tbody
-      = render @accounts
+      = render partial: 'account', collection: @accounts
 
 = paginate @accounts
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index 937664c4b..347eca166 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -20,6 +20,6 @@
     = t 'admin.action_logs.empty'
 - else
   .announcements-list
-    = render @action_logs
+    = render partial: 'action_log', collection: @action_logs
 
 = paginate @action_logs
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 6015cfac0..fa5d86b67 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -14,6 +14,6 @@
           %th= t('admin.email_domain_blocks.domain')
           %th
       %tbody
-        = render @email_domain_blocks
+        = render partial: 'email_domain_block', collection: @email_domain_blocks
 
 = paginate @email_domain_blocks
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 5f20e7ec0..7c7958786 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -36,6 +36,6 @@
   %div.muted-hint.center-text
     = t 'admin.instances.empty'
 - else
-  = render @instances
+  = render partial: 'instance', collection: @instances
 
 = paginate @instances