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

Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/auth/sessions_controller.rb
index d4a659409701d9fdc660eab19df7513cb86b5f4a,fb8615c3134dc5b6db94ddf648b7f7bda1717340..332f4d7a7efc402f7bc1672affe0ff6809ce8f85
--- 1/app/controllers/auth/sessions_controller.rb
--- 2/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@@ -8,10 -8,8 +8,9 @@@ class Auth::SessionsController < Devise
    skip_before_action :require_no_authentication, only: [:create]
    skip_before_action :check_user_permissions, only: [:destroy]
    prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create]
 +  prepend_before_action :set_pack
    before_action :set_instance_presenter, only: [:new]
    before_action :set_body_classes
-   after_action :clear_site_data, only: [:destroy]
  
    def new
      Devise.omniauth_configs.each do |provider, config|

diff --cc app/services/fan_out_on_write_service.rb
Simple merge

diff --cc config/locales/oc.yml
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge