Merge remote-tracking branch 'origin/develop' into shigusegubu

* origin/develop: (59 commits)
  Fix OAuth cleanup worker unconditionally starting
  Parallelize template rendering
  Collect stats immediately after init
  Cache follow state
  Add a task to benchmark timeline rendering
  html.ex: Allow sub and sup elements by default
  Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
  activitypub: publisher: add (request-target) to http signature when POSTing
  MRF: fix up unserializable option lists in describe implementations
  fix formatting
  Implement Pleroma.Stats as GenServer
  streamline Streamer pings
  Isolate OAuth.Token.CleanWorker
  use default child_specs
  Conversations: Load relations in one query.
  Switch to pre-1.8 version of tzdata.
  Conversation: Render new participation on update.
  Conversations: Use correct oauth paths for extended api.
  update changelog to cover MRF describe API.
  Preload thread mutes/bookmarks in user_statuses
  ...
This commit is contained in:
Henry Jameson 2019-08-17 12:12:32 +03:00
commit 0dd79c283c
105 changed files with 1688 additions and 482 deletions

View file

@ -255,6 +255,8 @@ config :pleroma, :instance,
skip_thread_containment: true,
limit_to_local_content: :unauthenticated,
dynamic_configuration: false,
user_bio_length: 5000,
user_name_length: 100,
external_user_synchronization: true
config :pleroma, :markup,
@ -306,7 +308,6 @@ config :pleroma, :assets,
default_mascot: :pleroma_fox_tan
config :pleroma, :activitypub,
accept_blocks: true,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,
@ -350,6 +351,10 @@ config :pleroma, :mrf_keyword,
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_vocabulary,
accept: [],
reject: []
config :pleroma, :rich_media,
enabled: true,
ignore_hosts: [],