diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-08-16 13:23:01 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-08-16 13:23:01 +0100 |
commit | b59164bf2658058cf8e7360c6d1bd53c557b8972 (patch) | |
tree | 6471acd21ddc8dced544a28156e79b7b0dde6798 /app/controllers/admin_controller.rb | |
parent | 1cb96ca9deb4157341d9ab0bce16513593f573d8 (diff) | |
parent | 9fb7527720321e43f4ea2464a1dfca1b2e0eb46b (diff) |
Merge branch 'wdtk' into develop
Conflicts:
app/controllers/admin_request_controller.rb
config/httpd.conf
spec/models/info_request_spec.rb
Diffstat (limited to 'app/controllers/admin_controller.rb')
-rw-r--r-- | app/controllers/admin_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index d8fda9c01..08528f8a8 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -36,7 +36,7 @@ class AdminController < ApplicationController # also force a search reindexing (so changed text reflected in search) info_request.reindex_request_events - # and remove from varnsi + # and remove from varnish info_request.purge_in_cache end |