diff options
| author | lain <lain@soykaf.club> | 2020-04-15 14:41:43 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-15 14:41:43 +0200 |
| commit | 44bfb491eae00d541e6d11c8b52b5de5bc0bd34e (patch) | |
| tree | 0fae87b11ceb4696075927c7f77228e59bb6926c /lib/mix | |
| parent | 64c78581fe397b6d9356c52cf3f43becd2ff3b4e (diff) | |
| parent | ad8630b95a691d01ec49344fd1a7578860728d63 (diff) | |
| download | pleroma-44bfb491eae00d541e6d11c8b52b5de5bc0bd34e.tar.gz pleroma-44bfb491eae00d541e6d11c8b52b5de5bc0bd34e.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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 }, |