diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
| commit | dfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch) | |
| tree | 92d77142391ed6eab45a4bec792ed02be91fbe39 /lib/mix | |
| parent | edb659dc579fe56227adef0b0704ff13b6ef717e (diff) | |
| parent | 4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff) | |
| download | pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/mix')
| -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)}") |