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

Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.

diff --cc Gemfile
index bb4e65fdc2d68e6c927fab4c66ea495b904a1fd2,b6e8453421afac961c9db8dd42240a624c4e2b4c..a0ad8e46482c301c133903b67961c93550cae730
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -50,9 -50,8 +50,9 @@@ gem 'fast_blank', '~> 1.0
  gem 'fastimage'
  gem 'goldfinger', '~> 2.1'
  gem 'hiredis', '~> 0.6'
- gem 'redis-namespace', '~> 1.5'
+ gem 'redis-namespace', '~> 1.7'
  gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
 +gem 'html2text'
  gem 'htmlentities', '~> 4.3'
  gem 'http', '~> 3.3'
  gem 'http_accept_language', '~> 2.1'

diff --cc Gemfile.lock
index cfa4201fde731be2e5f60d72ae7cb459e789e8b7,2e86eda19357244e9dcd4a035b7fb857bbdd2e86..fec95d27f9da0e74cae09b6103ba0f32c77559e4
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -776,9 -772,8 +776,9 @@@ DEPENDENCIE
    rails-i18n (~> 5.1)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.3)
 +  redcarpet (~> 3.4)
    redis (~> 4.1)
-   redis-namespace (~> 1.5)
+   redis-namespace (~> 1.7)
    redis-rails (~> 5.0)
    rqrcode (~> 0.10)
    rspec-rails (~> 3.9)

diff --cc app/controllers/application_controller.rb
index f1a4f0d0274af254b78828ca2d588425af217e87,0cfa2b38606f2e58e0bed58f4f203298e90235a9..c882d40ab0f1aabbc7141f9f55d88746d85d6f19
--- 1/app/controllers/application_controller.rb
--- 2/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@@ -211,7 -137,9 +212,12 @@@ class ApplicationController < ActionCon
    end
  
    def respond_with_error(code)
-     use_pack 'error'
-     render "errors/#{code}", layout: 'error', status: code, formats: [:html]
+     respond_to do |format|
 -      format.any  { render "errors/#{code}", layout: 'error', status: code, formats: [:html] }
++      format.any do
++        use_pack 'error'
++        render "errors/#{code}", layout: 'error', status: code, formats: [:html]
++      end
+       format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code }
+     end
    end
  end

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

diff --cc app/controllers/filters_controller.rb
index f1e110d87ddb8a17fb9b07aba6f54d919d973c27,63d9d9cd37244fe81d84db26b413f7040c4ec0ec..76be03e5376cfbf8f4f840314b5e2ed9bd63983c
--- 1/app/controllers/filters_controller.rb
--- 2/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@@ -1,13 -1,11 +1,12 @@@
  # frozen_string_literal: true
  
  class FiltersController < ApplicationController
-   include Authorization
- 
    layout 'admin'
  
+   before_action :authenticate_user!
    before_action :set_filters, only: :index
    before_action :set_filter, only: [:edit, :update, :destroy]
 +  before_action :set_pack
    before_action :set_body_classes
  
    def 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/oauth/authorizations_controller.rb
index f6f5d1eccb42900d2bcbc185ec0e8da2e8605c5c,bb5d639ced6a9d0e046b72b8b62da071282aa4e4..137346ed0981b07eea86321c09dbe2ed8486e3fe
--- 1/app/controllers/oauth/authorizations_controller.rb
--- 2/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@@ -5,7 -5,7 +5,8 @@@ class Oauth::AuthorizationsController 
  
    before_action :store_current_location
    before_action :authenticate_resource_owner!
 +  before_action :set_pack
+   before_action :set_cache_headers
  
    include Localized
  

diff --cc app/controllers/settings/base_controller.rb
index 8c394a6d35d1046dec7b9b4f4d09a70568b3498d,3c404cfff20b308de7c997e2efb8e3d782acdbe0..b97603af6f22e6cb5fb0d5d6a71872d8592e015c
--- 1/app/controllers/settings/base_controller.rb
--- 2/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@@@ -1,8 -1,8 +1,9 @@@
  # frozen_string_literal: true
  
  class Settings::BaseController < ApplicationController
 +  before_action :set_pack
    before_action :set_body_classes
+   before_action :set_cache_headers
  
    private
  

diff --cc app/helpers/accounts_helper.rb
Simple merge

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

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

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

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

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

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

diff --cc app/views/admin/tags/index.html.haml
Simple merge

diff --cc app/views/settings/preferences/appearance/show.html.haml
index f1e3d2e97ef640cbd3e26dcf776018c0a0546961,d2b05513e39df390c11072dadbe33e605d785237..f460cebba38e84ec1ab6232e7e73996b70361ebf
--- 1/app/views/settings/preferences/appearance/show.html.haml
--- 2/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@@ -2,9 -2,16 +2,13 @@@
    = t('settings.appearance')
  
  = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put } do |f|
 -  .fields-row
 -    .fields-group.fields-row__column.fields-row__column-6
 -      = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
 -    .fields-group.fields-row__column.fields-row__column-6
 -      = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false
 +  .fields-group
 +    = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
  
+   - unless I18n.locale == :en
+     .flash-message{ style: "text-align: unset; color: unset" }
+       #{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: "_blank", rel: "noopener", style: "text-decoration: underline")}
+ 
    %h4= t 'appearance.advanced_web_interface'
  
    %p.hint= t 'appearance.advanced_web_interface_hint'

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

diff --cc package.json
index 9e0c44550667511a02070799de15ca4463debe43,02bbba2a6fa2bd2334e18212064dfdf518e8dfd8..71cab74ab0ba3dd9d2670802eb27165247d0c32e
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -69,9 -68,8 +69,9 @@@
      "@babel/preset-react": "^7.7.4",
      "@babel/runtime": "^7.7.7",
      "@gamestdio/websocket": "^0.3.2",
-     "@clusterws/cws": "^0.16.0",
+     "@clusterws/cws": "^0.16.1",
      "array-includes": "^3.1.1",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.1.0",
      "autoprefixer": "^9.7.3",
      "axios": "^0.19.0",

diff --cc yarn.lock
Simple merge