diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-20 20:27:03 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-20 20:27:03 +0300 |
commit | 6fd4f58ead9189697ed004b6ca593d5ba746898f (patch) | |
tree | 447bf02a1bc76941686e2017b6b8bed4494737d4 /lib/mix/tasks | |
parent | 1871a5ddb4a803ebe4fae6943a9b9c94f1f9c1a8 (diff) | |
parent | 265746b21f5a58f49efbdbe9d9eecd697781b93b (diff) | |
download | pleroma-6fd4f58ead9189697ed004b6ca593d5ba746898f.tar.gz pleroma-6fd4f58ead9189697ed004b6ca593d5ba746898f.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
Diffstat (limited to 'lib/mix/tasks')
-rw-r--r-- | lib/mix/tasks/pleroma/benchmark.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/mix/tasks/pleroma/benchmark.ex b/lib/mix/tasks/pleroma/benchmark.ex index 6ab7fe8ef..dd2b9c8f2 100644 --- 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 }, |