projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/1.1.8' into 'stable'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 56a11cac38c1111923d93fe25a85d715d8ad07e3..6438740c56d44ba9a14360b7fa72f00136b129ad 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,7
+4,7
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("1.1.
0
"),
+ version: version("1.1.
8
"),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@
-106,7
+106,7
@@
defmodule Pleroma.Mixfile do
{:pbkdf2_elixir, "~> 0.12.3"},
{:trailing_format_plug, "~> 0.0.7"},
{:html_sanitize_ex, "~> 1.3.0"},
{:pbkdf2_elixir, "~> 0.12.3"},
{:trailing_format_plug, "~> 0.0.7"},
{:html_sanitize_ex, "~> 1.3.0"},
- {:html_entities, "~> 0.
4"
},
+ {:html_entities, "~> 0.
5", override: true
},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
@@
-158,6
+158,9
@@
defmodule Pleroma.Mixfile do
{:plug_static_index_html, "~> 1.0.0"},
{:excoveralls, "~> 0.11.1", only: :test},
{:flake_id, "~> 0.1.0"},
{:plug_static_index_html, "~> 1.0.0"},
{:excoveralls, "~> 0.11.1", only: :test},
{:flake_id, "~> 0.1.0"},
+ {:captcha,
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
+ ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:mox, "~> 0.5", only: :test}
] ++ oauth_deps()
end
{:mox, "~> 0.5", only: :test}
] ++ oauth_deps()
end