diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-12 12:07:07 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-12 12:07:07 +0300 |
| commit | bd40880fa0ed328c2948bb145354a8292fe051b5 (patch) | |
| tree | d997a20a129cd72fe24c1f7169e1f6952339ce02 /lib/mix/tasks | |
| parent | 5b696a8ac1b5a06e60c2143cf88e014b28e14702 (diff) | |
| parent | 00d17520314e3591caaa7ab4ca39c6227a6bdf15 (diff) | |
| download | pleroma-bd40880fa0ed328c2948bb145354a8292fe051b5.tar.gz pleroma-bd40880fa0ed328c2948bb145354a8292fe051b5.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/pleroma/docs.ex | 2 | ||||
| -rw-r--r-- | lib/mix/tasks/pleroma/relay.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mix/tasks/pleroma/docs.ex b/lib/mix/tasks/pleroma/docs.ex index 3c870f876..6088fc71d 100644 --- a/lib/mix/tasks/pleroma/docs.ex +++ b/lib/mix/tasks/pleroma/docs.ex @@ -28,7 +28,7 @@ defmodule Mix.Tasks.Pleroma.Docs do defp do_run(implementation) do start_pleroma() - with descriptions <- Pleroma.Config.Loader.load("config/description.exs"), + with descriptions <- Pleroma.Config.Loader.read("config/description.exs"), {:ok, file_path} <- Pleroma.Docs.Generator.process( implementation, diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex index c6ca888d4..c3312507e 100644 --- a/lib/mix/tasks/pleroma/relay.ex +++ b/lib/mix/tasks/pleroma/relay.ex @@ -35,7 +35,7 @@ defmodule Mix.Tasks.Pleroma.Relay do def run(["list"]) do start_pleroma() - with {:ok, list} <- Relay.list() do + with {:ok, list} <- Relay.list(true) do list |> Enum.each(&shell_info(&1)) else {:error, e} -> shell_error("Error while fetching relay subscription list: #{inspect(e)}") |