From cc98d010edc444e260c81ac9f264a27d9afd5daf Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 25 Feb 2020 16:21:48 +0300
Subject: relay list shows hosts without accepted follow

---
 lib/mix/tasks/pleroma/relay.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix')

diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex
index 7ef5f9678..b0fadeae9 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)}")
-- 
cgit v1.2.3


From 474ef512df5c7833f29e6201c52238b5d561a785 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 18 Feb 2020 18:10:39 +0300
Subject: wait in mix task while pleroma is rebooted

---
 lib/mix/pleroma.ex | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'lib/mix')

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index 90f8c8008..3ad6edbfb 100644
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -12,6 +12,19 @@ defmodule Mix.Pleroma do
     end
 
     {:ok, _} = Application.ensure_all_started(:pleroma)
+
+    if Pleroma.Config.get(:env) not in [:test, :benchmark] do
+      pleroma_rebooted?()
+    end
+  end
+
+  defp pleroma_rebooted? do
+    if Restarter.Pleroma.rebooted?() do
+      :ok
+    else
+      Process.sleep(10)
+      pleroma_rebooted?()
+    end
   end
 
   def load_pleroma do
-- 
cgit v1.2.3


From 282a93554fbf919ff553d839eeea98abe1f861d4 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Wed, 11 Mar 2020 16:25:53 +0300
Subject: merging release default config on app start

---
 lib/mix/tasks/pleroma/docs.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix')

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,
-- 
cgit v1.2.3