projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix streamer test
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index ed6ca61354d8ca9909b2f2344e5125100a07a825..70b5e4bd6ff006ffc8960c1b0f6cebc078d3dce9 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-26,6
+26,7
@@
defmodule Pleroma.Mixfile do
"docs/config.md",
"docs/Pleroma-API.md",
"docs/Admin-API.md",
"docs/config.md",
"docs/Pleroma-API.md",
"docs/Admin-API.md",
+ "docs/Clients.md",
"docs/Differences-in-MastodonAPI-Responses.md"
],
main: "readme",
"docs/Differences-in-MastodonAPI-Responses.md"
],
main: "readme",
@@
-54,9
+55,8
@@
defmodule Pleroma.Mixfile do
# Type `mix help deps` for examples and options.
defp deps do
[
# Type `mix help deps` for examples and options.
defp deps do
[
- # Until Phoenix 1.4.1 is released
- {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
- {:plug_cowboy, "~> 1.0"},
+ {:phoenix, "~> 1.4.1"},
+ {:plug_cowboy, "~> 2.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
{:postgrex, ">= 0.13.5"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
{:postgrex, ">= 0.13.5"},
@@
-76,7
+76,7
@@
defmodule Pleroma.Mixfile do
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
- {:ex_machina, "~> 2.
2
", only: :test},
+ {:ex_machina, "~> 2.
3
", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.1", only: :test},
{:crypt,
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.1", only: :test},
{:crypt,
@@
-88,7
+88,11
@@
defmodule Pleroma.Mixfile do
{:gen_smtp, "~> 0.13"},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
{:floki, "~> 0.20.0"},
{:gen_smtp, "~> 0.13"},
{: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"}
+ {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
+ {:timex, "~> 3.5"},
+ {:auto_linker,
+ git: "https://git.pleroma.social/pleroma/auto_linker.git",
+ ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}
]
end
]
end