summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-04-01 17:05:09 +0000
committerfeld <feld@feld.me>2020-04-01 17:05:09 +0000
commitef7d2b0f11a9bf74e982b73ae4cec632f93fbebc (patch)
tree2058bf1189b7a7ba12b1a160c27a9e92f3fa28bb /mix.exs
parentbfec45bf740f9fcfcea92bbded6bd2c146dc64c1 (diff)
parent1fcdcb12a717fa3dbd54a5c3778bd216df6449ad (diff)
downloadpleroma-ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc.tar.gz
pleroma-ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc.zip
Merge branch 'gun' into 'develop'
Gun adapter Closes #945 See merge request pleroma/pleroma!1861
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs10
1 files changed, 9 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 890979f8b..87c025d89 100644
--- a/mix.exs
+++ b/mix.exs
@@ -119,7 +119,15 @@ defmodule Pleroma.Mixfile do
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
- {:tesla, "~> 1.3", override: true},
+ # {:tesla, "~> 1.3", override: true},
+ {:tesla,
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/tesla.git",
+ ref: "61b7503cef33f00834f78ddfafe0d5d9dec2270b",
+ override: true},
+ {:castore, "~> 0.1"},
+ {:cowlib, "~> 2.8", override: true},
+ {:gun,
+ github: "ninenines/gun", ref: "e1a69b36b180a574c0ac314ced9613fdd52312cc", override: true},
{:jason, "~> 1.0"},
{:mogrify, "~> 0.6.1"},
{:ex_aws, "~> 2.1"},