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

Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.
2022-01-28 08:58:32 +01:00
parent ad6ddb9bdd e38fc319dc
commit b2915613fb
116 changed files with 241 additions and 221 deletions
--- a/app/workers/activitypub/distribution_worker.rb
+++ b/app/workers/activitypub/distribution_worker.rb
@ -27,6 +27,6 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
  end

  def options
-    { synchronize_followers: @status.private_visibility? }
+    { 'synchronize_followers' => @status.private_visibility? }
  end
 end