projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge develop
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 7f499856fdb88c0611e9dfae054e50c7ae561fe2..03b060bc0ff698c1a0237b38bbc350982edf2a26 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-36,7
+36,7
@@
defmodule Pleroma.Mixfile do
releases: [
pleroma: [
include_executables_for: [:unix],
releases: [
pleroma: [
include_executables_for: [:unix],
- applications: [ex_syslogger: :load, syslog: :load],
+ applications: [ex_syslogger: :load, syslog: :load
, eldap: :transient
],
steps: [:assemble, &put_otp_version/1, ©_files/1, ©_nginx_config/1]
]
]
steps: [:assemble, &put_otp_version/1, ©_files/1, ©_nginx_config/1]
]
]
@@
-78,8
+78,7
@@
defmodule Pleroma.Mixfile do
:comeonin,
:quack,
:fast_sanitize,
:comeonin,
:quack,
:fast_sanitize,
- :ssl,
- :eldap
+ :ssl
],
included_applications: [:ex_syslogger]
]
],
included_applications: [:ex_syslogger]
]
@@
-127,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},
@@
-156,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"},