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 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index c4a69079925df1a4de625c8e9c43d9926b358e39..23ada389b4fb8c0554bd1f65eec293abd4ff8685 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-438,7
+438,9
@@
config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http,
headers: [],
options: []
headers: [],
options: []
-config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, script_path: nil
+config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script,
+ script_path: nil,
+ url_format: nil
# Note: media preview proxy depends on media proxy to be enabled
config :pleroma, :media_preview_proxy,
# Note: media preview proxy depends on media proxy to be enabled
config :pleroma, :media_preview_proxy,
@@
-541,6
+543,7
@@
config :pleroma, Oban,
queues: [
activity_expiration: 10,
token_expiration: 5,
queues: [
activity_expiration: 10,
token_expiration: 5,
+ filter_expiration: 1,
backup: 1,
federator_incoming: 50,
federator_outgoing: 50,
backup: 1,
federator_incoming: 50,
federator_outgoing: 50,
@@
-608,10
+611,7
@@
config :ueberauth,
base_path: "/oauth",
providers: ueberauth_providers
base_path: "/oauth",
providers: ueberauth_providers
-config :pleroma,
- :auth,
- enforce_oauth_admin_scope_usage: true,
- oauth_consumer_strategies: oauth_consumer_strategies
+config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
@@
-654,6
+654,10
@@
config :pleroma, :oauth2,
config :pleroma, :database, rum_enabled: false
config :pleroma, :database, rum_enabled: false
+config :pleroma, :features, improved_hashtag_timeline: :auto
+
+config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01
+
config :pleroma, :env, Mix.env()
config :http_signatures,
config :pleroma, :env, Mix.env()
config :http_signatures,
@@
-723,7
+727,10
@@
config :pleroma, :frontends,
"git" => "https://git.pleroma.social/pleroma/fedi-fe",
"build_url" =>
"https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build",
"git" => "https://git.pleroma.social/pleroma/fedi-fe",
"build_url" =>
"https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build",
- "ref" => "master"
+ "ref" => "master",
+ "custom-http-headers" => [
+ {"service-worker-allowed", "/"}
+ ]
},
"admin-fe" => %{
"name" => "admin-fe",
},
"admin-fe" => %{
"name" => "admin-fe",