aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/admin_general_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-08-28 17:54:17 +0100
committerLouise Crow <louise.crow@gmail.com>2013-08-28 17:54:17 +0100
commit7541a8165e8ea435c0a3c337254fb07d4a0e2e1b (patch)
tree5bf8e22aedf2cf049adb14295546487b4ea66342 /app/controllers/admin_general_controller.rb
parentaf781f17032f17432fd615da57526aac0caab8b8 (diff)
parent8dea412e69d62d336a079dc0f27eacd0566c6242 (diff)
Merge remote-tracking branch 'origin/admin-js-static' into rails-3-develop
Diffstat (limited to 'app/controllers/admin_general_controller.rb')
-rw-r--r--app/controllers/admin_general_controller.rb5
1 files changed, 0 insertions, 5 deletions
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