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

Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.

diff --cc app/controllers/about_controller.rb
index 5d5db937c2533a672b06cd2e01d1c74df5b8cbf5,dcad5d3b44efb1a96906e3b305b8f258515d2231..5ff6990d70b44339f080296367671947cde8309d
--- 1/app/controllers/about_controller.rb
--- 2/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@@ -1,7 -1,8 +1,10 @@@
  # frozen_string_literal: true
  
  class AboutController < ApplicationController
+   include RegistrationSpamConcern
+ 
 +  before_action :set_pack
++
    layout 'public'
  
    before_action :require_open_federation!, only: [:show, :more]

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/javascript/packs/public.js
Simple merge

diff --cc app/models/user.rb
Simple merge