diff options
| author | mo khan <mo@mokhan.ca> | 2013-12-30 08:13:05 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2013-12-30 08:13:05 -0700 |
| commit | 55fd31cf068c6ef459db16f302b8cebfb689d41d (patch) | |
| tree | 88adeae75f43b7cf0857e638063835b6e3b69569 /app/controllers/application_controller.rb | |
| parent | 66b3458dafa78d10bc581fd2938e180d8d028f2f (diff) | |
| parent | 74148850f0c57432b1bc9c326c975c37cd335d49 (diff) | |
merge with master.
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 39476b91..932b2a7f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception - before_filter :profile_application before_filter :load_categories before_filter :load_user before_filter :configure_permitted_parameters, if: :devise_controller? @@ -13,10 +12,6 @@ class ApplicationController < ActionController::Base target.new(current_user) end - def profile_application - Rack::MiniProfiler.authorize_request if ENV['PROFILE_APPLICATION'] == true - end - def load_categories @categories = Category.all end |