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

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc app/serializers/rest/account_serializer.rb
Simple merge

diff --cc app/views/admin/reports/show.html.haml
Simple merge

diff --cc app/views/directories/index.html.haml
Simple merge

diff --cc config/environments/production.rb
Simple merge

diff --cc spec/services/notify_service_spec.rb
index 83e62ff36111b4092de974be5ea87551e1f5b16b,294c31b044545152ad4f4a1525034901cdaf4c6f..67dd0483b499430b3ece888c9b6a5032bbabec94
--- 1/spec/services/notify_service_spec.rb
--- 2/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@@ -46,9 -44,9 +44,9 @@@ RSpec.describe NotifyService, type: :se
  
    it 'does not notify when recipient is suspended' do
      recipient.suspend!
-     is_expected.to_not change(Notification, :count)
+     expect { subject }.to_not change(Notification, :count)
    end
 -
 +  
    context 'for direct messages' do
      let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
      let(:type)     { :mention }