Merge remote-tracking branch 'henare_github/remove-dos' into develop

2 files changed, 0 insertions, 8 deletions

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 0cde238cd..3ba636e29 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -226,12 +226,6 @@ class GeneralController < ApplicationController
         redirect_to request_url(info_request)
     end
 
-    # For debugging
-    def fai_test
-        sleep 10
-        render :text => "awake\n"
-    end
-
     def custom_css
         long_cache
         @locale = self.locale_from_params()
diff --git a/config/routes.rb b/config/routes.rb
index 5fc0075a4..3512b4cd4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,8 +32,6 @@ ActionController::Routing::Routes.draw do |map|
         general.advanced_search '/advancedsearch', :action => 'search_redirect', :advanced => true
 
         general.random_request '/random', :action => 'random_request'
-
-        general.fai_test '/test', :action => 'fai_test'
     end
 
     map.with_options :controller => 'request' do |request|