summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-07-23 16:36:27 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-07-23 16:36:27 +0300
commit67ab9a792868ea4ef38ecd59abb6b193140eaf10 (patch)
treed744f1baa74b3b7b6ef08bfd97af5fdd6671c949 /mix.exs
parent7991ddad582537f34b4964125195961e596b8687 (diff)
parent76aa49a0c5be0d1d51e99fd30683b12c8edc653d (diff)
downloadpleroma-67ab9a792868ea4ef38ecd59abb6b193140eaf10.tar.gz
pleroma-67ab9a792868ea4ef38ecd59abb6b193140eaf10.zip
Merge branch 'develop' into issue/1934-welcome-email
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs11
1 files changed, 5 insertions, 6 deletions
diff --git a/mix.exs b/mix.exs
index 52b4cf268..da0e88287 100644
--- a/mix.exs
+++ b/mix.exs
@@ -151,12 +151,13 @@ defmodule Pleroma.Mixfile do
{:credo, "~> 1.1.0", only: [:dev, :test], runtime: false},
{:mock, "~> 0.3.3", only: :test},
{:crypt,
- git: "https://github.com/msantos/crypt", ref: "f63a705f92c26955977ee62a313012e309a4d77a"},
+ git: "https://github.com/msantos/crypt.git",
+ ref: "f63a705f92c26955977ee62a313012e309a4d77a"},
{:cors_plug, "~> 1.5"},
{:ex_doc, "~> 0.21", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh,
- git: "https://github.com/swoosh/swoosh",
+ git: "https://github.com/swoosh/swoosh.git",
ref: "c96e0ca8a00d8f211ec1f042a4626b09f249caa5",
override: true},
{:phoenix_swoosh, "~> 0.2"},
@@ -166,9 +167,7 @@ defmodule Pleroma.Mixfile do
{:floki, "~> 0.25"},
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
- {:auto_linker,
- git: "https://git.pleroma.social/pleroma/auto_linker.git",
- ref: "95e8188490e97505c56636c1379ffdf036c1fdde"},
+ {:linkify, "~> 0.2.0"},
{:http_signatures,
git: "https://git.pleroma.social/pleroma/http_signatures.git",
ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},
@@ -190,7 +189,7 @@ defmodule Pleroma.Mixfile do
{:excoveralls, "~> 0.12.1", only: :test},
{:flake_id, "~> 0.1.0"},
{:concurrent_limiter,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter",
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter.git",
ref: "8eee96c6ba39b9286ec44c51c52d9f2758951365"},
{:remote_ip,
git: "https://git.pleroma.social/pleroma/remote_ip.git",