summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-06-22 23:27:32 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-06-22 23:27:32 +0000
commitf9ae7e72e9d745a1174353814d0ae6774f36ba3f (patch)
tree1b5259e3af4e798d4bba7542054a042d60bd40bf /mix.exs
parenta814671e857182eb5332b9c3cb9dc5615c22fe42 (diff)
parentfc6ab78a84b1ef384fa48349e792921364de5df9 (diff)
downloadpleroma-f9ae7e72e9d745a1174353814d0ae6774f36ba3f.tar.gz
pleroma-f9ae7e72e9d745a1174353814d0ae6774f36ba3f.zip
Merge branch 'bugfix/upload-limit-plug' into 'develop'
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change See merge request pleroma/pleroma!3472
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs3
1 files changed, 3 insertions, 0 deletions
diff --git a/mix.exs b/mix.exs
index afb4da1f6..a0a6106a9 100644
--- a/mix.exs
+++ b/mix.exs
@@ -199,6 +199,9 @@ defmodule Pleroma.Mixfile do
{:eblurhash, "~> 1.1.0"},
{:open_api_spex, "~> 3.10"},
+ # indirect dependency version override
+ {:plug, "~> 1.10.4", override: true},
+
## dev & test
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
{:ex_machina, "~> 2.4", only: :test},