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

diff --cc app/controllers/auth/registrations_controller.rb
index fcfd1830a1f275ce8ce85a861205f296d6fcedeb,088832be3c528fa8723c6802db80eec0f943a3eb..0696dea8618c8383ebb2c58bd8e121d4987d38d3
--- 1/app/controllers/auth/registrations_controller.rb
--- 2/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@@ -6,10 -6,9 +6,10 @@@ class Auth::RegistrationsController < D
    before_action :set_invite, only: [:new, :create]
    before_action :check_enabled_registrations, only: [:new, :create]
    before_action :configure_sign_up_params, only: [:create]
 +  before_action :set_pack
    before_action :set_sessions, only: [:edit, :update]
    before_action :set_instance_presenter, only: [:new, :create, :update]
-   before_action :set_body_classes, only: [:new, :create]
+   before_action :set_body_classes, only: [:new, :create, :edit, :update]
  
    def destroy
      not_found

diff --cc db/schema.rb
Simple merge