Merge branch 'main' into glitch-soc/merge-upstream

2022-08-21 14:39:25 +02:00
parent aba0032f54 5920d8fe33
commit 0b37299775
9 changed files with 79 additions and 99 deletions
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@ -18,7 +18,7 @@
    .filter-subset.filter-subset--with-select
      %strong= t 'generic.order_by'
      .input.select
-        = select_tag :order, options_for_select([[t('relationships.most_recent'), nil], [t('relationships.last_active'), 'active']], params[:order])
+        = select_tag :order, options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])

  .fields-group
    - %i(username by_domain display_name email ip).each do |key|