From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Thu, 17 Sep 2020 19:22:59 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a42880040574701000470fc1c2dbd6f7242c1a06;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream

# Conflicts:
#	CHANGELOG.md
---

a42880040574701000470fc1c2dbd6f7242c1a06
diff --cc CHANGELOG.md
index adea6d019,de11dd7a9..497fb62f3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,11 -9,9 +9,13 @@@ The format is based on [Keep a Changelo
  
  - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated.
  - Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated.
+ - The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
+ - Users with the `discoverable` field set to false will not show up in searches.
  - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
 +
 +### Added
 +- Media preview proxy (requires media proxy be enabled; see `:media_preview_proxy` config for more details).
 +
  ### Removed
  
  - **Breaking:** `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab` (moved to a simpler implementation).