diff options
| author | mo khan <mo@mokhan.ca> | 2013-12-30 08:00:28 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2013-12-30 08:00:28 -0700 |
| commit | 5eebdb6942e7a5ae291ab41b8e3906add0953b42 (patch) | |
| tree | 40ff5a69f388cb2c38436254045083fe9298963b /app/controllers/application_controller.rb | |
| parent | c56a474faf41b403d38c92519a204019c979c80e (diff) | |
| parent | d0b0d98479e3f1bba2dbfebdab767ce99609923c (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 |