Merging 17905:17944 from trunk.

[rails.git] / config / application.yml

diff --git a/config/application.yml b/config/application.yml
index 67d51e375210eff850afc228a9bdae275e4a4588..6a67a51236af20f3c1a9fe234513a54553e360fb 100644 (file)
--- a/config/application.yml
+++ b/config/application.yml
@@ -11,6 +11,10 @@ standard_settings: &standard_settings
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
   geonames_zoom: 12
+  # Timeout for API calls in seconds
+  api_timeout: 300
+  # Periods (in hours) which are allowed for user blocks
+  user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96]
  
 development:
   <<: *standard_settings