summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-08-01 10:49:35 +0000
committerrinpatch <rinpatch@sdf.org>2020-08-01 10:49:35 +0000
commit3a6a4dd77aca3d423b92405e9cdbffca51b98bd3 (patch)
treec6d6f5e756bd0c2efe3dd54dfa077c5bed232f9e /mix.exs
parentf1f4b1863fec739dc854e0ab7b0f03644ec42100 (diff)
parent87180ff817e4b9e3a3b90e7f0054b60b0d0c2c41 (diff)
downloadpleroma-3a6a4dd77aca3d423b92405e9cdbffca51b98bd3.tar.gz
pleroma-3a6a4dd77aca3d423b92405e9cdbffca51b98bd3.zip
Merge branch 'fix/gun-limiter' into 'develop'
Fix ConnecitonPool deadlocking after reaching the connection limit Closes #1977 See merge request pleroma/pleroma!2830
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 860c6aee7..0e723c15f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -178,7 +178,7 @@ defmodule Pleroma.Mixfile do
{:flake_id, "~> 0.1.0"},
{:concurrent_limiter,
git: "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter.git",
- ref: "8eee96c6ba39b9286ec44c51c52d9f2758951365"},
+ ref: "55e92f84b4ed531bd487952a71040a9c69dc2807"},
{:remote_ip,
git: "https://git.pleroma.social/pleroma/remote_ip.git",
ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},