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

 Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/admin/settings_controller.rb
Simple merge

diff --cc app/controllers/directories_controller.rb
index 9d65361a6158651095fa857040eb61a42c201cda,b8565af4b50f53cfd1878695687f364f63d9438b..1c8ebdac9d86e28d900d13a0ce7daa04d38455d7
--- 1/app/controllers/directories_controller.rb
--- 2/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@@@ -19,10 -19,10 +20,14 @@@ class DirectoriesController < Applicati
  
    private
  
 +  def set_pack
 +    use_pack 'share'
 +  end
 +
+   def check_enabled
+     return not_found unless Setting.profile_directory
+   end
+ 
    def set_tag
      @tag = Tag.discoverable.find_by!(name: params[:id].downcase)
    end

diff --cc app/controllers/settings/applications_controller.rb
index 03c890a506d73f0349fcd869b1cbf3c0c82db46c,ed3f82a8e06e693e8107c0fbdf2211d7ec48a3a0..d3ac268d862018095561f295c222ff169e25d6c2
--- 1/app/controllers/settings/applications_controller.rb
--- 2/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@@ -1,7 -1,9 +1,6 @@@
  # frozen_string_literal: true
  
  class Settings::ApplicationsController < Settings::BaseController
 -  layout 'admin'
--
 -  before_action :authenticate_user!
    before_action :set_application, only: [:show, :update, :destroy, :regenerate]
    before_action :prepare_scopes, only: [:create, :update]
  

diff --cc app/controllers/settings/sessions_controller.rb
index f235dd4773120b1517eda9b2ac21c38786d348f8,11b150ffd3ae0f5da9038e717eb9353f15740824..780ea64b40f1970b50cfa9645670cef03d89b31a
--- 1/app/controllers/settings/sessions_controller.rb
--- 2/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@@@ -1,9 -1,7 +1,8 @@@
  # frozen_string_literal: true
  
 -class Settings::SessionsController < Settings::BaseController
 +#  Intentionally does not inherit from BaseController
 +class Settings::SessionsController < ApplicationController
    before_action :set_session, only: :destroy
-   before_action :set_body_classes
  
    def destroy
      @session.destroy!

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

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

diff --cc app/models/form/admin_settings.rb
index 8a39e09b7a56bb9cdfb17cacca28134927d5b1c8,eca71bf6214f466efb2782c5b12a04fd19a985f0..34c75e3bfb6fcfa81fed5e5951e2cc269c58fccf
--- 1/app/models/form/admin_settings.rb
--- 2/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@@ -46,10 -44,8 +46,12 @@@ class Form::AdminSetting
      :preview_sensitive_media=,
      :custom_css,
      :custom_css=,
+     :profile_directory,
+     :profile_directory=,
      to: Setting
    )
 +
 +  def flavour_and_skin
 +    "#{Setting.flavour}/#{Setting.skin}"
 +  end
  end

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

diff --cc app/views/admin/settings/edit.html.haml
Simple merge

diff --cc app/views/layouts/public.html.haml
Simple merge

diff --cc app/views/settings/profiles/show.html.haml
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc config/locales/simple_form.ja.yml
Simple merge

diff --cc config/locales/sk.yml
index 32bfcb8e170539fe5e9f3154f6164565191ba6e4,5f49a2d0eaa32f430c2573dbcddc8db987acca03..135fee51fa511c6c4807ee2ee3fee3292a56c24e
--- 1/config/locales/sk.yml
--- 2/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@@ -788,8 -820,16 +820,15 @@@ sk
      reblogged: vyzdvihnutý
      sensitive_content: Senzitívny obsah
    terms:
-     title: Podmienky užívania, a pravidlá o súkromí pre %{instance}
+     body_html: |
+       <h2>Podmienky súkromia</h2>
+ 
+       <h3 id="collect">Aké informácie zbierame?</h3>
+ 
+       <ul>
+       <li><em>Základné informácie o účte</em>: Ak sa na tomto serveri zaregistruješ, budeš môcť byť požiadaný/á zadať prezývku, emailovú adresu a heslo. Budeš tiež môcť zadať aj ďalšie profilové údaje, ako napríklad meno a životopis, a nahrať profilovú fotku aj obrázok v záhlaví. Tvoja prezývka, meno, životopis, profilová fotka a obrázok v záhlaví sú vždy zobrazené verejne.</li><li><em>Príspevky, sledovania a iné verejné informácie</em>:
+     title: Podmienky užívania, a pravidlá súkromia pre %{instance}
    themes:
 -    contrast: Vysoký kontrast
      default: Mastodon
      mastodon-light: Mastodon (svetlý)
    time:

diff --cc config/routes.rb
Simple merge

diff --cc config/settings.yml
index bfccd2cc797373706e8098239920ef53fbc39c62,b3d2e0240339650c8f4332678211f9bd0a3640e6..2cac28b6372babfabbcdb19fba6b0945a04747a0
--- 1/config/settings.yml
--- 2/config/settings.yml
+++ b/config/settings.yml
@@@ -15,10 -15,11 +15,11 @@@ defaults: &default
    site_contact_username: ''
    site_contact_email: ''
    open_registrations: true
+   profile_directory: true
    closed_registrations_message: ''
    open_deletion: true
 +  timeline_preview: false
    min_invite_role: 'admin'
 -  timeline_preview: true
    show_staff_badge: true
    default_sensitive: false
    hide_network: false

diff --cc db/schema.rb
Simple merge