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

diff --cc .circleci/config.yml
Simple merge

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/application_controller.rb
index dca6c5a5ae8f368b85be268e154068c5ab3eeceb,7bb14aa4c1a4bfe62fa2f9b32c95ad9247c148b2..983b116c95bd31dca1a16bfab0f12f46ccc5e104
--- 1/app/controllers/application_controller.rb
--- 2/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@@ -201,9 -126,9 +201,10 @@@ class ApplicationController < ActionCon
    def respond_with_error(code)
      respond_to do |format|
        format.any  { head code }
+ 
        format.html do
          set_locale
 +        use_pack 'error'
          render "errors/#{code}", layout: 'error', status: code
        end
      end

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

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

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

diff --cc app/serializers/rest/status_serializer.rb
Simple merge

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

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