3 files changed, 5 insertions, 13 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 0bccd3358..f5191504e 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -17,7 +17,7 @@ class AdminController < ApplicationController
     end
 
     # Always give full stack trace for admin interface
-    def local_request?
+    def show_rails_exceptions?
         true
     end
 
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb
index ec5f95eda..196616ed6 100644
--- a/app/controllers/admin_general_controller.rb
+++ b/app/controllers/admin_general_controller.rb
@@ -5,7 +5,6 @@
 # Email: hello@mysociety.org; WWW: http://www.mysociety.org/
 
 class AdminGeneralController < AdminController
-    skip_before_filter :authenticate, :only => :admin_js
 
     def index
         # ensure we have a trailing slash
@@ -142,9 +141,5 @@ class AdminGeneralController < AdminController
         @request_env = request.env
     end
 
-    # TODO: Remove this when support for proxy admin interface is removed
-    def admin_js
-      render :layout => false, :content_type => "application/javascript"
-    end
 end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 88b107861..2ce44011f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -119,12 +119,9 @@ class ApplicationController < ActionController::Base
     end
 
     def render_exception(exception)
-
-        # In development, or the admin interface, or for a local request, let Rails handle the exception
-        # with its stack trace templates. Local requests in testing are a special case so that we can
-        # test this method - there we use consider_all_requests_local to control behaviour.
-        if Rails.application.config.consider_all_requests_local || local_request? ||
-        (request.local? && !Rails.env.test?)
+        # In development or the admin interface let Rails handle the exception
+        # with its stack trace templates
+        if Rails.application.config.consider_all_requests_local || show_rails_exceptions?
             raise exception
         end
 
@@ -150,7 +147,7 @@ class ApplicationController < ActionController::Base
         end
     end
 
-    def local_request?
+    def show_rails_exceptions?
         false
     end