projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge conflicts with upstream
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 4381068ac34afa3fa488672f5716a777bbc7b427..c00d5dca9d78d5d3a15d6a4e34a444d43ea0b5a4 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-41,7
+41,7
@@
#
# This configuration file is loaded before any dependency and
# is restricted to this project.
#
# This configuration file is loaded before any dependency and
# is restricted to this project.
-
use Mix.
Config
+
import
Config
# General application configuration
config :pleroma, ecto_repos: [Pleroma.Repo]
# General application configuration
config :pleroma, ecto_repos: [Pleroma.Repo]
@@
-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,
@@
-322,9
+321,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,7
+453,9
@@
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