Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'

config/config.exs

config/test.exs

docs/api/admin_api.md

docs/api/prometheus.md

docs/config.md

lib/pleroma/activity.ex

lib/pleroma/application.ex

lib/pleroma/html.ex

lib/pleroma/repo.ex

lib/pleroma/scheduled_activity.ex

lib/pleroma/scheduled_activity_worker.ex

lib/pleroma/web/admin_api/admin_api_controller.ex

lib/pleroma/web/endpoint.ex

lib/pleroma/web/mastodon_api/mastodon_api.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

...pleroma/web/mastodon_api/views/scheduled_activity_view.ex

lib/pleroma/web/mastodon_api/views/status_view.ex

lib/pleroma/web/metadata/utils.ex

lib/pleroma/web/oauth/oauth_controller.ex

lib/pleroma/web/router.ex