diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
| commit | 20e0f3660541f19cf878b789aa9f5b9d5ce8cddb (patch) | |
| tree | 08cb90d62e431beb7ee6a2261dc679b725aec1f1 /config | |
| parent | 2a95014b9d7142aa2549e70f428293af78fae8eb (diff) | |
| parent | 15aa94f40f73444d67da7cb71ec219b97ec5142e (diff) | |
| download | pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.tar.gz pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
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 bdaf5205a..d8378a162 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, |