X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=a7429fcdfcd4ba4d6a0898b5aef4bd166e1924cc;hb=b56bb88c02dcbbc16ca3f861df5d5e09828fc56a;hp=703c10c4814f78562296d8935f35aff04894ba60;hpb=0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 703c10c48..a7429fcdf 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -9,6 +9,9 @@ use Mix.Config
 config :pleroma,
   ecto_repos: [Pleroma.Repo]
 
+config :pleroma, Pleroma.Repo,
+  types: Pleroma.PostgresTypes
+
 config :pleroma, Pleroma.Upload,
   uploads: "uploads"
 
@@ -27,7 +30,8 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
-  "application/xrd+xml" => ["xrd+xml"]
+  "application/xrd+xml" => ["xrd+xml"],
+  "application/activity+json" => ["activity+json"]
 }
 
 config :pleroma, :websub, Pleroma.Web.Websub
@@ -60,6 +64,11 @@ config :pleroma, :media_proxy,
 config :pleroma, :chat,
   enabled: true
 
+config :ecto, json_library: Jason
+
+config :phoenix, :format_encoders,
+  json: Jason
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env}.exs"