projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'by-approval' into 'develop'
[akkoma]
/
lib
/
pleroma
/
config
/
transfer_task.ex
diff --git
a/lib/pleroma/config/transfer_task.ex
b/lib/pleroma/config/transfer_task.ex
index eb86b8ff490d8126a520ab9396bcb5f999493be8..a0d7b7d71b7952f7fadfc8f2b7c799f7bbea9394 100644
(file)
--- a/
lib/pleroma/config/transfer_task.ex
+++ b/
lib/pleroma/config/transfer_task.ex
@@
-31,8
+31,8
@@
defmodule Pleroma.Config.TransferTask do
{:pleroma, :gopher, [:enabled]}
]
{:pleroma, :gopher, [:enabled]}
]
- def start_link(
_
) do
- load_and_update_env()
+ def start_link(
restart_pleroma? \\ true
) do
+ load_and_update_env(
[], restart_pleroma?
)
if Config.get(:env) == :test, do: Ecto.Adapters.SQL.Sandbox.checkin(Repo)
:ignore
end
if Config.get(:env) == :test, do: Ecto.Adapters.SQL.Sandbox.checkin(Repo)
:ignore
end