Merge branch 'develop' into refactor/notification_settings

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 458d3a99ab0b90cd66e18bcf6d9fca5e65708eb8..6fc84efc2abae11b90bc31620b1f93b93435f185 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -498,8 +498,7 @@ config :pleroma, Pleroma.User,
 
 config :pleroma, Oban,
   repo: Pleroma.Repo,
-  verbose: false,
-  prune: {:maxlen, 1500},
+  log: false,
   queues: [
     activity_expiration: 10,
     federator_incoming: 50,
@@ -706,6 +705,8 @@ config :tzdata, :http_client, Pleroma.HTTP.Tzdata
 
 config :ex_aws, http_client: Pleroma.HTTP.ExAws
 
+config :pleroma, :instances_favicons, enabled: false
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"