X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=bd8922b772355b5b0cf21ac651bd6486b1042d17;hb=21ff78cd40820b6b5e56b78a08afddd04417937b;hp=ccdd357771dc0057c0f8723eaa53a60895dbae2c;hpb=6d6f48d0795cc12d3c5aca5d90ae51b10086996d;p=akkoma diff --git a/config/config.exs b/config/config.exs index ccdd35777..bd8922b77 100644 --- a/config/config.exs +++ b/config/config.exs @@ -8,8 +8,6 @@ use Mix.Config # General application configuration config :pleroma, ecto_repos: [Pleroma.Repo] -config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes - config :pleroma, Pleroma.Captcha, enabled: false, seconds_valid: 60, @@ -174,7 +172,8 @@ config :pleroma, :instance, no_attachment_links: false, welcome_user_nickname: nil, welcome_message: nil, - max_report_comment_size: 1000 + max_report_comment_size: 1000, + safe_dm_mentions: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because @@ -273,8 +272,6 @@ config :pleroma, :media_proxy, config :pleroma, :chat, enabled: true -config :ecto, json_library: Jason - config :phoenix, :format_encoders, json: Jason config :pleroma, :gopher,