Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream

Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.

spec/controllers/concerns/accountable_concern_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe AccountableConcern do
   let(:hoge_class) do
     Class.new do
       include AccountableConcern
+
       attr_reader :current_account
 
       def initialize(current_account)