Merge remote-tracking branch 'upstream/pull/2225'

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 51d3ed2c9e1f792949e1eb47bf8e2308063863a1..a664b78b0f883fe4cf15d23f14ae26688f22be5b 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -42,7 +42,7 @@ api_timeout: 300
 # Timeout for web pages in seconds
 web_timeout: 30
 # Periods (in hours) which are allowed for user blocks
-user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96]
+user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]
 # Rate limit for message sending
 max_messages_per_hour: 60
 # Domain for handling message replies