summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-12-13 12:16:41 +0000
committerrinpatch <rinpatch@sdf.org>2020-12-13 12:16:41 +0000
commitf687befb93a9ad2c3dc61f47bdbb717cb1421ad5 (patch)
treee0aed004219ca3a7db71c43160a708d041eea5d1 /mix.exs
parent1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea (diff)
parentdfde4af0fda1e166b3ba68cdfb056b4cae71e48f (diff)
Merge branch 'fix/hackney-follow-redirects' into 'develop'
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix Closes #2342 See merge request pleroma/pleroma!3199
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 3b18a6419..c948b0b02 100644
--- a/mix.exs
+++ b/mix.exs
@@ -207,7 +207,10 @@ defmodule Pleroma.Mixfile do
{:mock, "~> 0.3.5", only: :test},
# temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed
{:excoveralls, "0.12.3", only: :test},
- {:hackney, "1.15.2", override: true},
+ {:hackney,
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git",
+ ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e",
+ override: true},
{:mox, "~> 0.5", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()