Merge branch 'restricted-relations-embedding' into 'develop'

Restricted support for embedded relationships See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00 · 2020-05-17 07:26:51 +00:00 · 4b28d812cf
commit 4b28d812cf
parent d96f8f17e8 8062d590dd
31 changed files with 193 additions and 323 deletions
--- a/lib/mix/tasks/pleroma/benchmark.ex
+++ b/lib/mix/tasks/pleroma/benchmark.ex
@ -67,8 +67,7 @@ defmodule Mix.Tasks.Pleroma.Benchmark do
          Pleroma.Web.MastodonAPI.StatusView.render("index.json", %{
            activities: activities,
            for: user,
-            as: :activity,
-            skip_relationships: true
+            as: :activity
          })
        end
      },