Merge remote-tracking branch 'origin/develop' into pleroma-conversations

diff --cc CHANGELOG.md
index f8c90a73b67ef5c83e4bb413c7db6f0b2caa50f0,358287096295542b6c177faaf39e9daee4433412..2d6eac4c5d6e235767cf35fd84756c4660d75c5f
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -38,9 -41,11 +41,12 @@@ The format is based on [Keep a Changelo
  - Invalid SemVer version generation, when the current branch does not have commits ahead of tag/checked out on a tag
  - Pleroma.Upload base_url was not automatically whitelisted by MediaProxy. Now your custom CDN or file hosting will be accessed directly as expected.
  - Report email not being sent to admins when the reporter is a remote user
+ - MRF: ensure that subdomain_match calls are case-insensitive
  
  ### Added
 +- Conversations: Add Pleroma-specific conversation endpoints and status posting extensions. Run the `bump_all_conversations` task again to create the necessary data.
+ - **Breaking:** MRF describe API, which adds support for exposing configuration information about MRF policies to NodeInfo.
+   Custom modules will need to be updated by adding, at the very least, `def describe, do: {:ok, %{}}` to the MRF policy modules.
  - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
  - MRF: Support for excluding specific domains from Transparency.
  - MRF: Support for filtering posts based on who they mention (`Pleroma.Web.ActivityPub.MRF.MentionPolicy`)

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
index a862554b1d4b1f85b1ec4eff76231bfae0b5caa0,492af170206bbdc3256901e3f397676b5bb95baf..d3aea2aaf8861c243fe302ec8f6b326cb78c3ed4
--- 1/lib/pleroma/web/mastodon_api/views/status_view.ex
--- 2/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@@ -5,9 -5,9 +5,11 @@@
  defmodule Pleroma.Web.MastodonAPI.StatusView do
    use Pleroma.Web, :view
  
+   require Pleroma.Constants
+ 
    alias Pleroma.Activity
 +  alias Pleroma.Conversation
 +  alias Pleroma.Conversation.Participation
    alias Pleroma.HTML
    alias Pleroma.Object
    alias Pleroma.Repo

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