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

Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/auth/passwords_controller.rb
Simple merge

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/controllers/home_controller.rb
index efdb1d2268ae21a45386eafa55b6b11ba548c379,702889cd030759d3f145848776fdd4e52a1e9d3d..c9b84088171788f2e8529ad29c07844ae8dcd9b7
--- 1/app/controllers/home_controller.rb
--- 2/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@@ -1,9 -1,8 +1,10 @@@
  # frozen_string_literal: true
  
  class HomeController < ApplicationController
+   before_action :redirect_unauthenticated_to_permalinks!
    before_action :authenticate_user!
 +
 +  before_action :set_pack
    before_action :set_referrer_policy_header
  
    def index

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

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

diff --cc app/views/layouts/application.html.haml
index 92edaea3c14ab50db6fa4f48b44366cba3bd3d08,e32cdcabb3f6017d6b499c14924a21ddaa8084fb..3336cf3910d7641d8a9dd8a6b4cfacfca9858c6d
--- 1/app/views/layouts/application.html.haml
--- 2/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@@ -20,13 -20,12 +20,14 @@@
  
      %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
  
 -    = stylesheet_pack_tag 'common', media: 'all'
 -    = stylesheet_pack_tag current_theme, media: 'all'
 -    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 -    = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
 +    = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 +    - if @theme
 +      - if @theme[:supported_locales].include? I18n.locale.to_s
 +        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
 +      - elsif @theme[:supported_locales].include? 'en'
 +        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
      = csrf_meta_tags
+     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
  
      = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style'
  

diff --cc config/initializers/content_security_policy.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index fbf5fb673da0eec6ce1b07e6446b66f7615ea749,fc151a5fcb968585ef2869f179c4c73578ccab59..bbf436fdb311cb0aca6ccbc650c2fb6cb93b2797
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,8 -71,7 +72,8 @@@
      "@gamestdio/websocket": "^0.3.2",
      "@rails/ujs": "^6.0.3",
      "array-includes": "^3.1.1",
-     "arrow-key-navigation": "^1.1.0",
 +    "atrament": "0.2.4",
+     "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.0",
      "axios": "^0.19.2",
      "babel-loader": "^8.1.0",

diff --cc yarn.lock
Simple merge