projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index d333c618ecb28c6b7604ac9bbe86c80c87859417..005388c42ea6aa0d6cbb66d48134da73fa218fd1 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-190,7
+190,6
@@
config :pleroma, :instance,
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
description_limit: 5_000,
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
description_limit: 5_000,
- chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
@@
-222,6
+221,7
@@
config :pleroma, :instance,
"text/markdown",
"text/bbcode"
],
"text/markdown",
"text/bbcode"
],
+ staff_transparency: [],
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
@@
-322,9
+322,6
@@
config :pleroma, :frontend_configurations,
subjectLineBehavior: "email",
theme: "pleroma-dark",
webPushNotifications: false
subjectLineBehavior: "email",
theme: "pleroma-dark",
webPushNotifications: false
- },
- masto_fe: %{
- showInstanceSpecificPanel: true
}
config :pleroma, :assets,
}
config :pleroma, :assets,
@@
-457,9
+454,11
@@
config :pleroma, :media_preview_proxy,
image_quality: 85,
min_content_length: 100 * 1024
image_quality: 85,
min_content_length: 100 * 1024
-config :pleroma, :chat, enabled: true
+config :pleroma, :shout,
+ enabled: true,
+ limit: 5_000
-config :phoenix, :format_encoders, json: Jason
+config :phoenix, :format_encoders, json: Jason
, "activity+json": Jason
config :phoenix, :json_library, Jason
config :phoenix, :json_library, Jason
@@
-559,6
+558,7
@@
config :pleroma, Oban,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
+ poll_notifications: 10,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 1,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 1,