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

2024-07-16 09:01:12 +09:00 · 2024-07-16 09:01:12 +09:00 · adee1645a3
commit adee1645a3
parent 5629bc6f72 9d0bce4072
203 changed files with 1707 additions and 1067 deletions
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@ -150,7 +150,7 @@ RSpec.describe FollowService do
      expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
    end

-    it 'sends a follow activity to the inbox', :sidekiq_inline do
+    it 'sends a follow activity to the inbox', :inline_jobs do
      expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
    end
  end