Merge branch 'pull/5035'

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index fa7207721c9dd28db5ce5c35281f60e7a20f3227..71df9ad3d7ef560eb732bbcf2467351b349209dd 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -59,6 +59,10 @@ user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 8766
 user_account_deletion_delay: null
 # Rate limit for message sending
 max_messages_per_hour: 60
 user_account_deletion_delay: null
 # Rate limit for message sending
 max_messages_per_hour: 60

+# Default limit on the number of messages returned by inbox and outbox message api
+default_message_query_limit: 100
+# Maximum number of messages returned by inbox and outbox message api
+max_message_query_limit: 100

 # Rate limit for friending
 max_friends_per_hour: 60
 # Rate limit for changeset comments
 # Rate limit for friending
 max_friends_per_hour: 60
 # Rate limit for changeset comments