diff options
| author | lain <lain@soykaf.club> | 2019-03-25 13:37:32 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-03-25 13:37:32 +0100 |
| commit | 037fefe21871ee0a1926286c87c334ea1d339394 (patch) | |
| tree | 2775b91de5652ddd5baa3e32861ac9cac4bc40be /config | |
| parent | f6fab01ba7a08fe0e5147f82d9e3dd294922dc93 (diff) | |
| parent | b028b0f97d4b6310b1402b3b876aa8f8b286bc4d (diff) | |
| download | pleroma-037fefe21871ee0a1926286c87c334ea1d339394.tar.gz pleroma-037fefe21871ee0a1926286c87c334ea1d339394.zip | |
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 2 insertions, 5 deletions
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, |