projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 1114dc84de811cdc2e7e235684269a935c0a6ce0..9dc9387c82593174f25403b19aefd259984b1c53 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-100,9
+100,9
@@
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
shortcode_globs: ["/emoji/custom/**/*.png"],
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
- Finmoji: "/finmoji/128px/*-128.png",
- Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
- ]
+ Custom: ["/emoji/*.png", "/emoji/**/*.png"]
+ ],
+ default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"
config :pleroma, :uri_schemes,
valid_schemes: [
config :pleroma, :uri_schemes,
valid_schemes: [
@@
-223,7
+223,6
@@
config :pleroma, :instance,
"text/html",
"text/markdown"
],
"text/html",
"text/markdown"
],
- finmoji_enabled: true,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
@@
-414,7
+413,8
@@
config :pleroma_job_queue, :queues,
web_push: 50,
mailer: 10,
transmogrifier: 20,
web_push: 50,
mailer: 10,
transmogrifier: 20,
- scheduled_activities: 10
+ scheduled_activities: 10,
+ user: 10
config :pleroma, :fetch_initial_posts,
enabled: false,
config :pleroma, :fetch_initial_posts,
enabled: false,