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

Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.

app/services/notify_service.rb

@@ -7,6 +7,7 @@ class NotifyService < BaseService
     admin.report
     admin.sign_up
     update
+    poll
   ).freeze
 
   def call(recipient, type, activity)