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

Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/javascript/core/admin.js
Simple merge

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

diff --cc app/lib/activitypub/activity/create.rb
Simple merge

diff --cc app/models/account.rb
index b70978d2be3ad4fad335cbc6559945e4c8deb7b9,e21b353e9a585fe8165f7939b9da54d0199eb078..b0e254233ed2a3c2c4a33b723dd96fce685be906
--- 1/app/models/account.rb
--- 2/app/models/account.rb
+++ b/app/models/account.rb
@@@ -67,12 -67,9 +67,13 @@@ class Account < ApplicationRecor
    include Paginable
    include AccountCounters
    include DomainNormalizable
+   include DomainMaterializable
    include AccountMerging
  
 +  MAX_DISPLAY_NAME_LENGTH = (ENV['MAX_DISPLAY_NAME_CHARS'] || 30).to_i
 +  MAX_NOTE_LENGTH = (ENV['MAX_BIO_CHARS'] || 500).to_i
 +  MAX_FIELDS = (ENV['MAX_PROFILE_FIELDS'] || 4).to_i
 +
    TRUST_LEVELS = {
      untrusted: 0,
      trusted: 1,

diff --cc app/models/form/admin_settings.rb
index fcec3e686c7fe39bdb7f6d4da2a53a0e6cc3dafc,e9f78da2123ba4833b1047e625d6a5413179fe8d..999d835e65ccdf31c61f12596e485b2699f98710
--- 1/app/models/form/admin_settings.rb
--- 2/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@@ -41,7 -35,7 +41,8 @@@ class Form::AdminSetting
      show_domain_blocks
      show_domain_blocks_rationale
      noindex
 +    outgoing_spoilers
+     require_invite_text
    ).freeze
  
    BOOLEAN_KEYS = %i(

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

diff --cc app/presenters/instance_presenter.rb
Simple merge

diff --cc app/views/about/more.html.haml
Simple merge

diff --cc app/views/admin/reports/show.html.haml
Simple merge

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

diff --cc app/views/statuses/_simple_status.html.haml
index cbeefdffea3b0a9bac7ef6a1bcbcb7f930f582e7,236948a84c2abc73f6ce55e75e6a514e99334835..1b501a3eff0bf2a0e8286fe09e894e7384d927fe
--- 1/app/views/statuses/_simple_status.html.haml
--- 2/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@@ -29,7 -29,7 +29,7 @@@
        %p<
          %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
          %button.status__content__spoiler-link= t('statuses.show_more')
-     .e-content{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }<
 -    .e-content
++    .e-content<
        = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
        - if status.preloadable_poll
          = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do

diff --cc config/settings.yml
index 4d6a1cffcaafb5e3c618745f82b65a7a5268b065,9cf68a096632d500c4ac1909c1544054555de6d7..96645c222b6a6927e499e40c6a3dd1c703cb3bf6
--- 1/config/settings.yml
--- 2/config/settings.yml
+++ b/config/settings.yml
@@@ -78,7 -70,7 +78,8 @@@ defaults: &default
    spam_check_enabled: true
    show_domain_blocks: 'disabled'
    show_domain_blocks_rationale: 'disabled'
 +  outgoing_spoilers: ''
+   require_invite_text: false
  
  development:
    <<: *defaults

diff --cc db/schema.rb
Simple merge

diff --cc yarn.lock
Simple merge