diff options
author | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
commit | bb49d8f5a0dbbad65a8f65a28cc2d0847b518067 (patch) | |
tree | 938fb7fd74053a816c21948b28d5f6cfb7443f37 /lib/mix | |
parent | e8493431bfc16977e43715bf8bdb09ac46580028 (diff) | |
parent | 8d15d6c3ab9aecb82ba5126bb5efef20b3dfef41 (diff) | |
download | pleroma-bb49d8f5a0dbbad65a8f65a28cc2d0847b518067.tar.gz |
Merge branch 'release/2.0.1' into 'stable'v2.0.1
2.0.1 release
See merge request pleroma/pleroma!2298
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)}") |