aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-02-19 14:27:47 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-02-25 16:26:52 +1100
commit5f7d17bc2128d7de3749f65d3e9168e2fcc1a478 (patch)
treee48c8a8c787f80f96b50f563d4aafb3794bdf01e /app/controllers/general_controller.rb
parent0699f148f43d58eef818cf710bd182cc99196ad2 (diff)
Move serving of js for admin interface from general to admin_general controller
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index d34f75a72..f6a46458e 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -229,11 +229,5 @@ class GeneralController < ApplicationController
@locale = self.locale_from_params()
render(:layout => false, :content_type => 'text/css')
end
-
- # For merged adminbootstraptheme
- # TODO: Remove this ugly hack
- def admin_js
- render :layout => false, :content_type => "application/javascript"
- end
end