summaryrefslogtreecommitdiff
path: root/app/controllers/my
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/my
parent24d66ea2011900309606702c9525fe1efaa1f8a9 (diff)
rename before_filter to before_action.
Diffstat (limited to 'app/controllers/my')
-rw-r--r--app/controllers/my/avatars_controller.rb2
-rw-r--r--app/controllers/my/base_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/my/avatars_controller.rb b/app/controllers/my/avatars_controller.rb
index cb534ba9..c884a4fb 100644
--- a/app/controllers/my/avatars_controller.rb
+++ b/app/controllers/my/avatars_controller.rb
@@ -1,6 +1,6 @@
module My
class AvatarsController < BaseController
- before_filter :find_or_build_avatar
+ before_action :find_or_build_avatar
def edit
end
diff --git a/app/controllers/my/base_controller.rb b/app/controllers/my/base_controller.rb
index ce525473..5a0e5cb9 100644
--- a/app/controllers/my/base_controller.rb
+++ b/app/controllers/my/base_controller.rb
@@ -1,5 +1,5 @@
module My
class BaseController < ApplicationController
- before_filter :authenticate!
+ before_action :authenticate!
end
end