aboutsummaryrefslogtreecommitdiffstats
path: root/lib/configuration.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-03-04 09:53:26 +0000
committerLouise Crow <louise.crow@gmail.com>2014-03-04 09:53:26 +0000
commit3912c73583464e3ff203e3e101325ccabcba0506 (patch)
tree3b57620358c4c4cfe1c52702f2979876f6452aa0 /lib/configuration.rb
parent2a49615ee3ea08f7952283efc0306a1ac0c23334 (diff)
parentaf83354da1030c2d2fad3c63f3ccb516c4923d38 (diff)
Merge branch 'release/0.17' into wdtk
Conflicts: config/general.yml-example
Diffstat (limited to 'lib/configuration.rb')
-rw-r--r--lib/configuration.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb
index 40a426f65..cf3e10049 100644
--- a/lib/configuration.rb
+++ b/lib/configuration.rb
@@ -18,6 +18,7 @@ module AlaveteliConfiguration
DEFAULTS = {
:ADMIN_PASSWORD => '',
:ADMIN_USERNAME => '',
+ :ALLOW_BATCH_REQUESTS => false,
:AVAILABLE_LOCALES => '',
:BLACKHOLE_PREFIX => 'do-not-reply-to-this-address',
:BLOG_FEED => '',