Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream

2025-12-22 14:58:16 +00:00 · 2024-09-12 12:09:21 +02:00
parent 7cfa8bb782 0c3c06f7cc
commit 10e2b87774
101 changed files with 465 additions and 219 deletions
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -95,6 +95,7 @@ RSpec.describe Settings::MigrationsController do

        before do
          moved_to = Fabricate(:account, also_known_as: [ActivityPub::TagManager.instance.uri_for(user.account)])
+          p moved_to.acct
          user.account.migrations.create!(acct: moved_to.acct)
        end