projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'replies-count' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index ccdd357771dc0057c0f8723eaa53a60895dbae2c..bd8922b772355b5b0cf21ac651bd6486b1042d17 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-8,8
+8,6
@@
use Mix.Config
# General application configuration
config :pleroma, ecto_repos: [Pleroma.Repo]
# 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,
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,
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
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 :pleroma, :chat, enabled: true
-config :ecto, json_library: Jason
-
config :phoenix, :format_encoders, json: Jason
config :pleroma, :gopher,
config :phoenix, :format_encoders, json: Jason
config :pleroma, :gopher,