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

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/well_known/keybase_proof_config_controller.rb
index c78683a8d5d5094eef67c86d4255289f2e55ae8f,e1d43ecbe9a1ad9c18c5944abbd8b81a2596bb05..03232df2d389d3abe7528166c5ddd655d776c8b7
--- 1/app/controllers/well_known/keybase_proof_config_controller.rb
--- 2/app/controllers/well_known/keybase_proof_config_controller.rb
+++ b/app/controllers/well_known/keybase_proof_config_controller.rb
@@@ -2,16 -2,8 +2,16 @@@
  
  module WellKnown
    class KeybaseProofConfigController < ActionController::Base
 +    before_action :check_enabled
 +
      def show
-       render json: {}, serializer: ProofProvider::Keybase::ConfigSerializer
+       render json: {}, serializer: ProofProvider::Keybase::ConfigSerializer, root: 'keybase_config'
      end
 +
 +    private
 +
 +    def check_enabled
 +      head 404 unless Setting.enable_keybase
 +    end
    end
  end

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

diff --cc config/webpack/rules/css.js
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge