Merge remote-tracking branch 'parent/main' into upstream-20231027

app/views/admin/accounts/index.html.haml

@@ -22,9 +22,10 @@
 
   .fields-group
     - %i(username by_domain display_name email ip).each do |key|
-      - unless key == :by_domain && params[:origin] != 'remote'
-        .input.string.optional
-          = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
+      - next if key == :by_domain && params[:origin] != 'remote'
+
+      .input.string.optional
+        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
 
   .actions
     %button.button= t('admin.accounts.search')

app/views/settings/exports/show.html.haml

@@ -24,14 +24,14 @@
         %th= t('admin.accounts.followers')
         %td= number_with_delimiter @export.total_followers
         %td
-      %tr
-        %th= t('exports.blocks')
-        %td= number_with_delimiter @export.total_blocks
-        %td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
       %tr
         %th= t('exports.mutes')
         %td= number_with_delimiter @export.total_mutes
         %td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv)
+      %tr
+        %th= t('exports.blocks')
+        %td= number_with_delimiter @export.total_blocks
+        %td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
       %tr
         %th= t('exports.domain_blocks')
         %td= number_with_delimiter @export.total_domain_blocks