diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-31 08:48:40 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-31 08:48:40 +0000 |
| commit | 62ae2d1d4538d682c27971e4937d01eca9896929 (patch) | |
| tree | 8b537ca81551800634e2a6f3e8184a70aee881d7 | |
| parent | edf43caeb577ad321c5beebfec6130382cb06db7 (diff) | |
| parent | 0a560b492e77eb04b6b83b6d567db4e4e5429bb2 (diff) | |
Merge branch 'wdtk' into release/0.5
Conflicts:
config/general.yml-example
doc/CHANGES.md
| -rw-r--r-- | config/general.yml-example | 2 | ||||
| -rw-r--r-- | doc/CHANGES.md | 2 | ||||
| -rw-r--r-- | spec/controllers/admin_public_body_controller_spec.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/general.yml-example b/config/general.yml-example index 345d3b1d6..98f04d0bf 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -138,4 +138,4 @@ EXCEPTION_NOTIFICATIONS_TO: - seb@example.org # This rate limiting can be turned off per-user via the admin interface -MAX_REQUESTS_PER_USER_PER_DAY: 6
\ No newline at end of file +MAX_REQUESTS_PER_USER_PER_DAY: 6 diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 641dc30a5..d80acec3c 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -20,7 +20,7 @@ * Ensure you have values for new config variables (see `config/general.yml-example`): * EXCEPTION_NOTIFICATIONS_FROM * EXCEPTION_NOTIFICATIONS_TO - * MAX_REQUESTS_PER_USER_PER_DAY +* The new optional config variable MAX_REQUESTS_PER_USER_PER_DAY can be set to limit the number of requests each user can make per day. * The recommended Varnish config has changed, so that we ignore more cookies. You should review your Varnish config with respect to the example at `config/varnish-alaveteli.vcl`. * Consider setting elinks global config as described in the "Troubleshooting" section of INSTALL.md diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 9a7c46476..7af637c1c 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -76,7 +76,7 @@ describe AdminPublicBodyController, "when administering public bodies and paying it "disallows non-authenticated users to do anything" do @request.env["HTTP_AUTHORIZATION"] = "" - n = PublicBody.count.should + n = PublicBody.count post :destroy, { :id => 3 } response.code.should == "401" PublicBody.count.should == n @@ -111,7 +111,7 @@ describe AdminPublicBodyController, "when administering public bodies and paying config['ADMIN_USERNAME'] = 'biz' config['ADMIN_PASSWORD'] = 'fuz' @request.env["HTTP_AUTHORIZATION"] = "" - n = PublicBody.count.should + n = PublicBody.count basic_auth_login(@request, "baduser", "badpassword") post :destroy, { :id => public_bodies(:forlorn_public_body).id } response.code.should == "401" |