From 2457f5914d906f0bacdc82bf7b26c5dabbe5a918 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 14 Jul 2016 07:29:04 +0000 Subject: [PATCH] Use .skip_before_action instead of .skip_before_filter. git-svn-id: http://svn.redmine.org/redmine/trunk@15656 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/account_controller.rb | 2 +- app/controllers/my_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 7101d17be..1191accfd 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -20,7 +20,7 @@ class AccountController < ApplicationController include CustomFieldsHelper # prevents login action to be filtered by check_if_login_required application scope filter - skip_before_filter :check_if_login_required, :check_password_change + skip_before_action :check_if_login_required, :check_password_change # Overrides ApplicationController#verify_authenticity_token to disable # token verification on openid callbacks diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 2699f2cb0..aefb30282 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -18,7 +18,7 @@ class MyController < ApplicationController before_action :require_login # let user change user's password when user has to - skip_before_filter :check_password_change, :only => :password + skip_before_action :check_password_change, :only => :password require_sudo_mode :account, only: :post require_sudo_mode :reset_rss_key, :reset_api_key, :show_api_key, :destroy -- 2.39.5