summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-07-12 14:26:25 +0000
committerfeld <feld@feld.me>2024-07-12 14:26:25 +0000
commit2e7258cafd492001e91dc8af449819e087a95f0d (patch)
treeb5314eecbe302d4eb14ac7eda0a1b3bbde826f32
parent19eeea7c121426b2ee356a5b5d9d5bd2e8ada025 (diff)
parente4ba5777ee1c0c1d9b079f8aca1b6d9cce014571 (diff)
downloadpleroma-2e7258cafd492001e91dc8af449819e087a95f0d.tar.gz
pleroma-2e7258cafd492001e91dc8af449819e087a95f0d.zip
Merge branch 'move-poison' into 'develop'
Move poison dependency See merge request pleroma/pleroma!4156
-rw-r--r--changelog.d/deps-poison-test-only.skip0
-rw-r--r--mix.exs2
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/deps-poison-test-only.skip b/changelog.d/deps-poison-test-only.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/deps-poison-test-only.skip
diff --git a/mix.exs b/mix.exs
index 3ecbdc267..eab77d9cd 100644
--- a/mix.exs
+++ b/mix.exs
@@ -152,7 +152,6 @@ defmodule Pleroma.Mixfile do
{:html_entities, "~> 0.5", override: true},
{:calendar, "~> 1.0"},
{:cachex, "~> 3.2"},
- {:poison, "~> 3.0", override: true},
{:tesla, "~> 1.11"},
{:castore, "~> 0.1"},
{:cowlib, "~> 2.9", override: true},
@@ -205,6 +204,7 @@ defmodule Pleroma.Mixfile do
## dev & test
{:phoenix_live_reload, "~> 1.3.3", only: :dev},
+ {:poison, "~> 3.0", only: :test},
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
{:ex_machina, "~> 2.4", only: :test},
{:credo, "~> 1.6", only: [:dev, :test], runtime: false},