diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-13 21:19:27 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-13 21:19:27 +0300 |
| commit | a16b3dbcbf19d584eaefbecbfb4ff34fa7b3743a (patch) | |
| tree | 33a566478405ab5da9e6cdb5f77bb59a3ff3be0c /lib/mix | |
| parent | 2b7d7bbd2dc3121488592a958c29ba6a418e0104 (diff) | |
| parent | ef37774403ff5af69a637875240eec205b6f55a5 (diff) | |
| download | pleroma-a16b3dbcbf19d584eaefbecbfb4ff34fa7b3743a.tar.gz | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/mix')
| -rw-r--r-- | lib/mix/pleroma.ex | 1 | ||||
| -rw-r--r-- | lib/mix/tasks/pleroma/benchmark.ex | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex index 4dfcc32e7..3ad6edbfb 100644 --- a/lib/mix/pleroma.ex +++ b/lib/mix/pleroma.ex @@ -5,7 +5,6 @@ defmodule Mix.Pleroma do @doc "Common functions to be reused in mix tasks" def start_pleroma do - Mix.Task.run("app.start") Application.put_env(:phoenix, :serve_endpoints, false, persistent: true) if Pleroma.Config.get(:env) != :test do diff --git a/lib/mix/tasks/pleroma/benchmark.ex b/lib/mix/tasks/pleroma/benchmark.ex index dd2b9c8f2..6ab7fe8ef 100644 --- a/lib/mix/tasks/pleroma/benchmark.ex +++ b/lib/mix/tasks/pleroma/benchmark.ex @@ -67,7 +67,8 @@ defmodule Mix.Tasks.Pleroma.Benchmark do Pleroma.Web.MastodonAPI.StatusView.render("index.json", %{ activities: activities, for: user, - as: :activity + as: :activity, + skip_relationships: true }) end }, |