From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 15 Dec 2020 13:27:06 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e4f8679eaeea062e1f9ca9f58703b51ff8162c35;p=mastodon.git

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.
---

e4f8679eaeea062e1f9ca9f58703b51ff8162c35
diff --cc app/models/account.rb
index b70978d2b,e21b353e9..b0e254233
--- a/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 fcec3e686,e9f78da21..999d835e6
--- a/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/views/statuses/_simple_status.html.haml
index cbeefdffe,236948a84..1b501a3ef
--- a/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 4d6a1cffc,9cf68a096..96645c222
--- a/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