hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/prometheus

Browse source
This commit is contained in:
Mark Felder 2019-04-04 15:39:42 -05:00
commit 66e7b03372
4 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mix.exs
View file

@ -41,7 +41,7 @@ defmodule Pleroma.Mixfile do
def application do
[
mod: {Pleroma.Application, []},
extra_applications: [:logger, :runtime_tools, :comeonin],
extra_applications: [:logger, :runtime_tools, :comeonin, :quack],
included_applications: [:ex_syslogger]
]
end
@ -101,7 +101,8 @@ defmodule Pleroma.Mixfile do
{:prometheus_phoenix, "~> 1.2"},
{:prometheus_ecto, "~> 1.4"},
{:prometheus_process_collector, "~> 1.4"},
{:recon, github: "ferd/recon"}
{:recon, github: "ferd/recon"},
{:quack, "~> 0.1.1"}
]
end