Merge commit '2f932cb2bb' into kb_migration

2023-08-03 15:48:07 +09:00 · 2023-08-03 15:48:07 +09:00 · 82d61dad96
commit 82d61dad96
parent c2324203fd 2f932cb2bb
65 changed files with 909 additions and 162 deletions
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@ -65,7 +65,7 @@ module Admin
    end

    def filtered_instances
-      InstanceFilter.new(whitelist_mode? ? { allowed: true } : filter_params).results
+      InstanceFilter.new(limited_federation_mode? ? { allowed: true } : filter_params).results
    end

    def filter_params