Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index fe56bb6f77f00e9804595d9e788da79291c255b1..bf497031408fd52b33c964801e000855a8e5e1a0 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -302,7 +302,6 @@ config :pleroma, :assets,
   default_mascot: :pleroma_fox_tan
 
 config :pleroma, :activitypub,
-  accept_blocks: true,
   unfollow_blocked: true,
   outgoing_blocks: true,
   follow_handshake_timeout: 500,
@@ -542,7 +541,8 @@ config :pleroma, :rate_limit,
   relation_id_action: {60_000, 2},
   statuses_actions: {10_000, 15},
   status_id_action: {60_000, 3},
-  password_reset: {1_800_000, 5}
+  password_reset: {1_800_000, 5},
+  account_confirmation_resend: {8_640_000, 5}
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.