aboutsummaryrefslogtreecommitdiff
path: root/lib/mix/tasks
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-03 11:29:39 +0200
committerlain <lain@soykaf.club>2020-09-03 11:29:39 +0200
commitf26b580e80e57f162442e6f0c3bc0072cb935ce3 (patch)
tree3aad914a705da3574c3924c7dc6915965c2e3ad7 /lib/mix/tasks
parent0a9c63fb4351ed29a521697f2c584b0ae007696c (diff)
parentd1a6f67b1d92e17f4fe3cfc8f296879326897220 (diff)
downloadpleroma-f26b580e80e57f162442e6f0c3bc0072cb935ce3.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
Diffstat (limited to 'lib/mix/tasks')
-rw-r--r--lib/mix/tasks/pleroma/frontend.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/frontend.ex b/lib/mix/tasks/pleroma/frontend.ex
index 0a48be1fe..1957b1d84 100644
--- a/lib/mix/tasks/pleroma/frontend.ex
+++ b/lib/mix/tasks/pleroma/frontend.ex
@@ -124,7 +124,9 @@ defmodule Mix.Tasks.Pleroma.Frontend do
url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"])
with {:ok, %{status: 200, body: zip_body}} <-
- Pleroma.HTTP.get(url, [], timeout: 120_000, recv_timeout: 120_000) do
+ Pleroma.HTTP.get(url, [],
+ adapter: [pool: :media, timeout: 120_000, recv_timeout: 120_000]
+ ) do
unzip(zip_body, dest)
else
e -> {:error, e}