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

spec/services/resolve_account_service_spec.rb

@@ -199,7 +199,7 @@ RSpec.describe ResolveAccountService do
       expect(account.uri).to eq 'https://ap.example.com/users/foo'
     end
 
-    it 'merges accounts', :sidekiq_inline do
+    it 'merges accounts', :inline_jobs do
       account = subject.call('foo@ap.example.com')
 
       expect(status.reload.account_id).to eq account.id