aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/environments/test.rb2
-rw-r--r--config/general.yml-example2
-rw-r--r--config/routes.rb1
3 files changed, 5 insertions, 0 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8d6041ad9..be28c3df6 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,7 @@
# Settings specified here will take precedence over those in config/environment.rb
+require 'lib/patches/fixtures_constraint_disabling'
+
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
diff --git a/config/general.yml-example b/config/general.yml-example
index 86399f0bc..98f04d0bf 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -137,3 +137,5 @@ EXCEPTION_NOTIFICATIONS_TO:
- robin@example.org
- seb@example.org
+# This rate limiting can be turned off per-user via the admin interface
+MAX_REQUESTS_PER_USER_PER_DAY: 6
diff --git a/config/routes.rb b/config/routes.rb
index eeeebc3ea..c4339209a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -169,6 +169,7 @@ ActionController::Routing::Routes.draw do |map|
body.admin_body_create '/admin/body/create/:id', :action => 'create'
body.admin_body_destroy '/admin/body/destroy/:id', :action => 'destroy'
body.admin_body_import_csv '/admin/body/import_csv', :action => 'import_csv'
+ body.admin_body_mass_tag_add '/admin/body/mass_tag_add', :action => 'mass_tag_add'
end
map.with_options :controller => 'admin_general' do |admin|