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.
This commit is contained in:
Claire
2021-03-11 16:08:15 +01:00
16 changed files with 116 additions and 204 deletions

View File

@ -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