Merge branch 'develop' into gun

diff --cc CHANGELOG.md
Simple merge

diff --cc docs/API/admin_api.md
Simple merge

diff --cc lib/pleroma/config/transfer_task.ex
Simple merge

diff --cc restarter/lib/pleroma.ex
index e48bc4d1dd20b3183930d843a16da7ab579c7931,7f08c637cb6f4ccb0107ad78112d6c835ff3cc6c..149a569ce42b016910c9780814aa24999d640176
--- 1/restarter/lib/pleroma.ex
--- 2/restarter/lib/pleroma.ex
+++ b/restarter/lib/pleroma.ex
@@@ -44,8 -62,8 +62,8 @@@ defmodule Restarter.Pleroma d
    end
  
    def handle_cast({:restart, :test, _}, state) do
 -    Logger.warn("pleroma restarted")
 +    Logger.debug("pleroma manually restarted")
-     {:noreply, Map.put(state, :need_reboot?, false)}
+     {:noreply, Map.put(state, :need_reboot, false)}
    end
  
    def handle_cast({:restart, _, delay}, state) do
@@@ -57,8 -75,9 +75,9 @@@
    def handle_cast({:after_boot, _}, %{after_boot: true} = state), do: {:noreply, state}
  
    def handle_cast({:after_boot, :test}, state) do
 -    Logger.warn("pleroma restarted")
 +    Logger.debug("pleroma restarted after boot")
-     {:noreply, Map.put(state, :after_boot, true)}
+     state = %{state | after_boot: true, rebooted: true}
+     {:noreply, state}
    end
  
    def handle_cast({:after_boot, _}, state) do

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge