summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-09-07 08:08:28 -0600
committermo khan <mo@mokhan.ca>2014-09-07 08:08:28 -0600
commit48b69b3ba446bc3e97d92f1ecae47a31112a2275 (patch)
tree14d714beb85521deac8350f26ac7aac9153998e5 /app/controllers/application_controller.rb
parent24d66ea2011900309606702c9525fe1efaa1f8a9 (diff)
rename before_filter to before_action.
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index db67fe28..46ce3dd3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,9 +2,9 @@ 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 :load_header
- before_filter :configure_permitted_parameters, if: :devise_controller?
- before_filter :extend_session_cookie
+ before_action :load_header
+ before_action :configure_permitted_parameters, if: :devise_controller?
+ before_action :extend_session_cookie
helper_method :current_user, :user_signed_in?
rescue_from ActiveRecord::RecordNotFound, with: :record_not_found