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 103361b297373e3f5f397d00d54ced636e95c633..31221b914fcfb6f6b6e9c9c8184a1072ed4acdfe 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-108,10
+108,6
@@
config :pleroma, Pleroma.Uploaders.S3,
streaming_enabled: true,
public_endpoint: "https://s3.amazonaws.com"
streaming_enabled: true,
public_endpoint: "https://s3.amazonaws.com"
-config :pleroma, Pleroma.Uploaders.MDII,
- cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
- files: "https://mdii.sakura.ne.jp"
-
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
pack_extensions: [".png", ".gif"],
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
pack_extensions: [".png", ".gif"],
@@
-258,6
+254,7
@@
config :pleroma, :instance,
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
no_attachment_links: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
no_attachment_links: true,
@@
-565,7
+562,7
@@
config :ueberauth,
config :pleroma,
:auth,
config :pleroma,
:auth,
- enforce_oauth_admin_scope_usage:
fals
e,
+ enforce_oauth_admin_scope_usage:
tru
e,
oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false