diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
| commit | 7d9b66d1ff31afa8d73ea1a81f4e612e41f89cb0 (patch) | |
| tree | 5206d9fbaf8d6af58bdaa35cefdfeb34a88c84ff /app/controllers/admin_general_controller.rb | |
| parent | 40a28fa2fe21d752a15c11938791d620dd31d17f (diff) | |
| parent | 8e7432be764254e6a50e6a06e77bb93bb5bba9fe (diff) | |
Merge branch 'release/0.14' into wdtk
Conflicts:
app/views/request/show.html.erb
Diffstat (limited to 'app/controllers/admin_general_controller.rb')
| -rw-r--r-- | app/controllers/admin_general_controller.rb | 5 |
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 |