aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-09-11 20:47:25 +0000
committerkaniini <ariadne@dereferenced.org>2019-09-11 20:47:25 +0000
commit50269e9cacdbb7834c31fc7ad9872b68977e9f10 (patch)
tree78d20dabd5ae2296336d3c81ec88f2ce4824ff6c /lib
parent46ae62d159ca0a330d18a2e1f775a5ed9eaebc42 (diff)
parent56828abf6de81a52079b26cf899b91fdd822f2ce (diff)
downloadpleroma-50269e9cacdbb7834c31fc7ad9872b68977e9f10.tar.gz
Merge branch 'feature/jason-view-render' into 'develop'
Use Jason for rendering responses See merge request pleroma/pleroma!1655
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/healthcheck.ex (renamed from lib/healthcheck.ex)1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/healthcheck.ex b/lib/pleroma/healthcheck.ex
index f97d14432..977b78c26 100644
--- a/lib/healthcheck.ex
+++ b/lib/pleroma/healthcheck.ex
@@ -9,6 +9,7 @@ defmodule Pleroma.Healthcheck do
alias Pleroma.Healthcheck
alias Pleroma.Repo
+ @derive Jason.Encoder
defstruct pool_size: 0,
active: 0,
idle: 0,