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

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index adea6d01924cd7d90cbe92f57669f8a33de0a82a,de11dd7a9dced305f43c4bb6ace0905f7689f551..497fb62f381e3455f12f254844e44d81f93bdfe7
--- 1/CHANGELOG.md
--- 2/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).

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge