Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists

diff --cc CHANGELOG.md
index 99b42e280aab3b858ab1cd5868e7175c27e86af2,2fa9bd1e7a14aca8f1439bbccccbc9909039a7cf..4766aef6cee6969b7954a682ba557366b2c23709
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -50,7 -50,7 +50,8 @@@ The format is based on [Keep a Changelo
  - MRF: Support for rejecting reports from specific instances (`mrf_simple`)
  - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
  - MRF: Support for running subchains.
 +- Addressable lists
+ - Configuration: `skip_thread_containment` option
  
  ### Changed
  - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer

diff --cc docs/api/differences_in_mastoapi_responses.md
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index 47115aa6e87fc9acafbdc43301ff073b3835c463,c0e3d1478794622ccd9d633bc04807fac9faed02..73c6e4cbf3d6d8b4617a000e578d8318bb099b4b
--- 1/lib/pleroma/web/activity_pub/activity_pub.ex
--- 2/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -860,7 -866,13 +865,11 @@@ defmodule Pleroma.Web.ActivityPub.Activ
    defp maybe_order(query, _), do: query
  
    def fetch_activities_query(recipients, opts \\ %{}) do
 -    base_query = from(activity in Activity)
 -
+     config = %{
+       skip_thread_containment: Config.get([:instance, :skip_thread_containment])
+     }
+ 
 -    base_query
 +    Activity
      |> maybe_preload_objects(opts)
      |> maybe_preload_bookmarks(opts)
      |> maybe_set_thread_muted_field(opts)

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