diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-11 20:47:25 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-11 20:47:25 +0000 |
| commit | 50269e9cacdbb7834c31fc7ad9872b68977e9f10 (patch) | |
| tree | 78d20dabd5ae2296336d3c81ec88f2ce4824ff6c | |
| parent | 46ae62d159ca0a330d18a2e1f775a5ed9eaebc42 (diff) | |
| parent | 56828abf6de81a52079b26cf899b91fdd822f2ce (diff) | |
| download | pleroma-50269e9cacdbb7834c31fc7ad9872b68977e9f10.tar.gz | |
Merge branch 'feature/jason-view-render' into 'develop'
Use Jason for rendering responses
See merge request pleroma/pleroma!1655
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | lib/pleroma/healthcheck.ex (renamed from lib/healthcheck.ex) | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 5206fe375..0e91df886 100644 --- a/config/config.exs +++ b/config/config.exs @@ -373,6 +373,8 @@ config :pleroma, :chat, enabled: true config :phoenix, :format_encoders, json: Jason +config :phoenix, :json_library, Jason + config :pleroma, :gopher, enabled: false, ip: {0, 0, 0, 0}, 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, |