projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 3656059f2508d0eaa2ed6bc1c5417b2afe4cc2ab..03b060bc0ff698c1a0237b38bbc350982edf2a26 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-126,8
+126,8
@@
defmodule Pleroma.Mixfile do
{:postgrex, ">= 0.13.5"},
{:oban, "~> 1.2"},
{:gettext, "~> 0.15"},
{:postgrex, ">= 0.13.5"},
{:oban, "~> 1.2"},
{:gettext, "~> 0.15"},
- {:
comeonin, "~> 4.1.1
"},
- {:
pbkdf2_elixir, "~> 0.12.3
"},
+ {:
pbkdf2_elixir, "~> 1.0
"},
+ {:
bcrypt_elixir, "~> 2.0
"},
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.1"},
{:html_entities, "~> 0.5", override: true},
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.1"},
{:html_entities, "~> 0.5", override: true},
@@
-155,7
+155,7
@@
defmodule Pleroma.Mixfile do
{:credo, "~> 1.1.0", only: [:dev, :test], runtime: false},
{:mock, "~> 0.3.3", only: :test},
{:crypt,
{:credo, "~> 1.1.0", only: [:dev, :test], runtime: false},
{:mock, "~> 0.3.3", only: :test},
{:crypt,
- git: "https://github.com/msantos/crypt", ref: "
1f2b58927ab57e72910191a7ebaeff984382a1d3
"},
+ git: "https://github.com/msantos/crypt", ref: "
f63a705f92c26955977ee62a313012e309a4d77a
"},
{:cors_plug, "~> 1.5"},
{:ex_doc, "~> 0.21", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:cors_plug, "~> 1.5"},
{:ex_doc, "~> 0.21", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
@@
-199,7
+199,7
@@
defmodule Pleroma.Mixfile do
{:restarter, path: "./restarter"},
{:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
{:restarter, path: "./restarter"},
{:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
- ref: "
b862ebd78de0df95875cf46feb6e9607130dc2a8
"}
+ ref: "
f296ac0924ba3cf79c7a588c4c252889df4c2edd
"}
] ++ oauth_deps()
end
] ++ oauth_deps()
end