projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ipv6 handling to pleroma.nginx
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 4af896fc970e46eeabe39a29c3311b2e9ae8b5c2..d78825769b4bbb1e95be4702ab7bb24dad02476b 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-5,7
+5,7
@@
defmodule Pleroma.Mixfile do
[
app: :pleroma,
version: version("0.9.0"),
[
app: :pleroma,
version: version("0.9.0"),
- elixir: "~> 1.
4
",
+ elixir: "~> 1.
7
",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: true],
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: true],
@@
-21,8
+21,16
@@
defmodule Pleroma.Mixfile do
homepage_url: "https://pleroma.social/",
docs: [
logo: "priv/static/static/logo.png",
homepage_url: "https://pleroma.social/",
docs: [
logo: "priv/static/static/logo.png",
- extras: ["README.md", "config/config.md", "Pleroma-API.md"],
- main: "readme"
+ extras: [
+ "README.md",
+ "docs/config.md",
+ "docs/Pleroma-API.md",
+ "docs/Admin-API.md",
+ "docs/Clients.md",
+ "docs/Differences-in-MastodonAPI-Responses.md"
+ ],
+ main: "readme",
+ output: "priv/static/doc"
]
]
end
]
]
end
@@
-31,7
+39,11
@@
defmodule Pleroma.Mixfile do
#
# Type `mix help compile.app` for more information.
def application do
#
# Type `mix help compile.app` for more information.
def application do
- [mod: {Pleroma.Application, []}, extra_applications: [:logger, :runtime_tools, :comeonin]]
+ [
+ mod: {Pleroma.Application, []},
+ extra_applications: [:logger, :runtime_tools, :comeonin],
+ included_applications: [:ex_syslogger]
+ ]
end
# Specifies which paths to compile per environment.
end
# Specifies which paths to compile per environment.
@@
-54,6
+66,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"},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
@@
-70,11
+83,14
@@
defmodule Pleroma.Mixfile do
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
- {:ex_doc, "
> 0.18.3 and < 0.20.0
", only: :dev, runtime: false},
+ {:ex_doc, "
~> 0.19
", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:gen_smtp, "~> 0.13"},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:gen_smtp, "~> 0.13"},
- {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
+ {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
+ {:floki, "~> 0.20.0"},
+ {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
+ {:timex, "~> 3.5"}
]
end
]
end