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

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/accounts_controller.rb
Simple merge

diff --cc app/controllers/concerns/sign_in_token_authentication_concern.rb
index 88c009b19de575e00a87f4058231ae2b57ee71a8,91f813acc3508c06d88de491734290d6a92a6ab2..f5178930b6bb8ef2712f6bf6bdb66848a855c57a
--- 1/app/controllers/concerns/sign_in_token_authentication_concern.rb
--- 2/app/controllers/concerns/sign_in_token_authentication_concern.rb
+++ b/app/controllers/concerns/sign_in_token_authentication_concern.rb
@@@ -42,9 -42,10 +42,11 @@@ module SignInTokenAuthenticationConcer
        UserMailer.sign_in_token(user, request.remote_ip, request.user_agent, Time.now.utc.to_s).deliver_later!
      end
  
-     session[:attempt_user_id] = user.id
-     use_pack 'auth'
-     @body_classes = 'lighter'
-     render :sign_in_token
+     set_locale do
+       session[:attempt_user_id] = user.id
++      use_pack 'auth'
+       @body_classes = 'lighter'
+       render :sign_in_token
+     end
    end
  end

diff --cc app/controllers/concerns/two_factor_authentication_concern.rb
index 0d9f874551017824d0ba49058452c3b1670328ed,daafe56f4602d4cab477359ccf968c38e7ef30c0..35c0c27cfc11f46f90f3a332cbea8b46fbd5291a
--- 1/app/controllers/concerns/two_factor_authentication_concern.rb
--- 2/app/controllers/concerns/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/two_factor_authentication_concern.rb
@@@ -40,9 -40,10 +40,11 @@@ module TwoFactorAuthenticationConcer
    end
  
    def prompt_for_two_factor(user)
-     session[:attempt_user_id] = user.id
-     use_pack 'auth'
-     @body_classes = 'lighter'
-     render :two_factor
+     set_locale do
+       session[:attempt_user_id] = user.id
++      use_pack 'auth'
+       @body_classes = 'lighter'
+       render :two_factor
+     end
    end
  end

diff --cc app/controllers/directories_controller.rb
index adf2bd0146f82bd58aa21f86c5150a0e4f68acb3,f198ad5ba5bdb2e9335ddaa0839c50c63500251b..549c6a39e0847472dfc2b0afd153b37bc8bec368
--- 1/app/controllers/directories_controller.rb
--- 2/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@@@ -8,9 -8,8 +8,9 @@@ class DirectoriesController < Applicati
    before_action :set_instance_presenter
    before_action :set_tag, only: :show
    before_action :set_accounts
 +  before_action :set_pack
  
-   skip_before_action :require_functional!
+   skip_before_action :require_functional!, unless: :whitelist_mode?
  
    def index
      render :index

diff --cc app/controllers/follower_accounts_controller.rb
Simple merge

diff --cc app/controllers/following_accounts_controller.rb
Simple merge

diff --cc app/controllers/remote_interaction_controller.rb
index 51bb9bdeaa7d31dc8d4a390a88599e7a45ab8b2a,6c29a2b9ffed2766f563f0f75e74534ddb6e9886..a277bfa10366bdc9c9dd0969fd0ab38b2a505341
--- 1/app/controllers/remote_interaction_controller.rb
--- 2/app/controllers/remote_interaction_controller.rb
+++ b/app/controllers/remote_interaction_controller.rb
@@@ -9,9 -9,8 +9,9 @@@ class RemoteInteractionController < App
    before_action :set_interaction_type
    before_action :set_status
    before_action :set_body_classes
 +  before_action :set_pack
  
-   skip_before_action :require_functional!
+   skip_before_action :require_functional!, unless: :whitelist_mode?
  
    def new
      @remote_follow = RemoteFollow.new(session_params)

diff --cc app/controllers/statuses_controller.rb
Simple merge

diff --cc app/controllers/tags_controller.rb
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge