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

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.

diff --cc app/controllers/settings/preferences_controller.rb
index 3d98d583c888bee9a6376b91ce59ef1d1c1ddb4e,930ff70e7fe38ad369bb6a390b7d38e89a5fcd28..a713ee55865be719b64b89175fbefc1c083c951f
--- 1/app/controllers/settings/preferences_controller.rb
--- 2/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@@ -42,11 -45,11 +42,12 @@@ class Settings::PreferencesController 
        :setting_reduce_motion,
        :setting_system_font_ui,
        :setting_noindex,
 -      :setting_theme,
        :setting_hide_network,
 +      :setting_hide_followers_count,
        :setting_aggregate_reblogs,
        :setting_show_application,
+       :setting_advanced_layout,
 +      :setting_default_content_type,
        notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
        interactions: %i(must_be_follower must_be_following)
      )

diff --cc app/javascript/mastodon/initial_state.js
Simple merge

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

diff --cc app/lib/user_settings_decorator.rb
index 802ca71fe1c4b2e773a751920019553eeb89d894,bf2e5a962f37626cfc3ee5062c22f74c2345240b..a95d09c5cbf054b735a69b47af36a6a6185b5ca3
--- 1/app/lib/user_settings_decorator.rb
--- 2/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@@ -36,7 -33,7 +36,8 @@@ class UserSettingsDecorato
      user.settings['hide_network']        = hide_network_preference if change?('setting_hide_network')
      user.settings['aggregate_reblogs']   = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
      user.settings['show_application']    = show_application_preference if change?('setting_show_application')
+     user.settings['advanced_layout']     = advanced_layout_preference if change?('setting_advanced_layout')
 +    user.settings['default_content_type']= default_content_type_preference if change?('setting_default_content_type')
    end
  
    def merged_notification_emails
@@@ -123,10 -108,10 +124,14 @@@
      boolean_cast_setting 'setting_aggregate_reblogs'
    end
  
+   def advanced_layout_preference
+     boolean_cast_setting 'setting_advanced_layout'
+   end
+ 
 +  def default_content_type_preference
 +    settings['setting_default_content_type']
 +  end
 +
    def boolean_cast_setting(key)
      ActiveModel::Type::Boolean.new.cast(settings[key])
    end

diff --cc app/models/user.rb
index 496cb0b1b3675e562ad5582c3fe1cf6e470a1935,eb1a2fecefe9f1f8f067898a467a16430270207c..c24741ff1e1e5402f135be4061e39832430bd491
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -102,9 -102,10 +102,10 @@@ class User < ApplicationRecor
  
    has_many :session_activations, dependent: :destroy
  
 -  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
 -           :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
 +  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal,
 +           :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network, :hide_followers_count,
-            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :default_content_type, to: :settings, prefix: :setting, allow_nil: false
+            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
 -           :advanced_layout, to: :settings, prefix: :setting, allow_nil: false
++           :advanced_layout, :default_content_type, to: :settings, prefix: :setting, allow_nil: false
  
    attr_reader :invite_code
    attr_writer :external

diff --cc app/serializers/initial_state_serializer.rb
index d74e56ebc8f3bb8f474bac09102abb673f096bbe,184ed867c06e486ef04250fb9d41d5038660f15a..efed199f3df5211500c70f0ec1bb4d8682a3c865
--- 1/app/serializers/initial_state_serializer.rb
--- 2/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@@ -46,8 -31,8 +46,9 @@@ class InitialStateSerializer < ActiveMo
        store[:display_media]   = object.current_account.user.setting_display_media
        store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
        store[:reduce_motion]   = object.current_account.user.setting_reduce_motion
+       store[:advanced_layout] = object.current_account.user.setting_advanced_layout
        store[:is_staff]        = object.current_account.user.staff?
 +      store[:default_content_type] = object.current_account.user.setting_default_content_type
      end
  
      store

diff --cc app/views/settings/preferences/show.html.haml
index cd5bf9be244ccb7868063b048e39756e9421f2eb,35b660a6809a38f8a6d289622a333fd81d958fac..45c8b55db086102bab66031f2a825502578fbaf7
--- 1/app/views/settings/preferences/show.html.haml
--- 2/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@@ -40,12 -38,17 +40,15 @@@
    .fields-group
      = f.input :setting_show_application, as: :boolean, wrapper: :with_label
  
 -  %hr#settings_web/
 +  - unless Setting.hide_followers_count
 +    .fields-group
 +      = f.input :setting_hide_followers_count, as: :boolean, wrapper: :with_label
  
 -  .fields-row
 -    .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.fields-row__column.fields-row__column-6
 -      = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false
 +  %hr#settings_web/
  
+   .fields-group
+     = f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label
+ 
    .fields-group
      = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
      = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label

diff --cc config/locales/simple_form.en.yml
index 6fad7f73a281bcb9f41b49cea5b815744f99e308,2f75efdbd75120bc966a2a375252c817c5522471..97a5e8785889eb35c7a4f5ebfd49c400eaa6f9b5
--- 1/config/locales/simple_form.en.yml
--- 2/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@@ -26,10 -26,8 +26,11 @@@ en
          password: Use at least 8 characters
          phrase: Will be matched regardless of casing in text or content warning of a toot
          scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
+         setting_advanced_layout: The advanced UI consists of multiple customizable columns
          setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts)
 +        setting_default_content_type_html: When writing toots, assume they are written in raw HTML, unless specified otherwise
 +        setting_default_content_type_markdown: When writing toots, assume they are using Markdown for rich text formatting, unless specified otherwise
 +        setting_default_content_type_plain: When writing toots, assume they are plain text with no special formatting, unless specified otherwise (default Mastodon behavior)
          setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
          setting_display_media_default: Hide media marked as sensitive
          setting_display_media_hide_all: Always hide all media

diff --cc config/settings.yml
index 69996af25dbf8c2e3e6bfe6bd8f9fea8d6cbe5e5,0c35106995d20c57f4022e903496a00b69666be9..bde43cb3c054cc900b157100f34049bc926033cb
--- 1/config/settings.yml
--- 2/config/settings.yml
+++ b/config/settings.yml
@@@ -27,14 -26,12 +27,15 @@@ defaults: &default
    expand_spoilers: false
    preview_sensitive_media: false
    reduce_motion: false
 -  show_application: true
 +  show_application: false
    system_font_ui: false
    noindex: false
 -  theme: 'default'
 +  hide_followers_count: false
 +  enable_keybase: true
 +  flavour: 'glitch'
 +  skin: 'default'
    aggregate_reblogs: true
+   advanced_layout: true
    notification_emails:
      follow: false
      reblog: false

diff --cc lib/mastodon/version.rb
Simple merge