Merge branch 'feature/jason-view-render' into 'develop'

Use Jason for rendering responses See merge request pleroma/pleroma!1655
2019-09-11 20:47:25 +00:00 · 2019-09-11 20:47:25 +00:00 · 50269e9cac
parent 46ae62d159 56828abf6d
commit 50269e9cac
2 changed files with 3 additions and 0 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -373,6 +373,8 @@

 config :phoenix, :format_encoders, json: Jason

+config :phoenix, :json_library, Jason
+
 config :pleroma, :gopher,
  enabled: false,
  ip: {0, 0, 0, 0},
--- a/lib/pleroma/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,