Replace before_filter with before_action

skanev · Apr 6, 2014 · 68968d8 · 68968d8
1 parent b6de172
commit 68968d8
Show file tree

Hide file tree

Showing 26 changed files with 30 additions and 30 deletions.
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -1,5 +1,5 @@
 class ActivitiesController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def index
     @feed = Feed.new

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
@@ -1,5 +1,5 @@
 class AnnouncementsController < ApplicationController
-  before_filter :require_admin, except: :index
+  before_action :require_admin, except: :index
 
   def index
     @announcements = Announcement.page params[:page]

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
   include CustomPaths
   helper  CustomPaths
 
-  before_filter :set_time_zone
+  before_action :set_time_zone
 
   helper_method :can_edit?, :logged_in?, :admin?
 

diff --git a/app/controllers/attributions_controller.rb b/app/controllers/attributions_controller.rb
@@ -1,5 +1,5 @@
 class AttributionsController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def new
     @user = User.find params[:user_id]

diff --git a/app/controllers/backdoor_controller.rb b/app/controllers/backdoor_controller.rb
@@ -1,5 +1,5 @@
 class BackdoorController < ApplicationController
-  before_filter :prevent_from_execution_outside_test_environment
+  before_action :prevent_from_execution_outside_test_environment
 
   def login
     sign_in User.find_by_email!(params[:email])

diff --git a/app/controllers/challenge_checks_controller.rb b/app/controllers/challenge_checks_controller.rb
@@ -1,5 +1,5 @@
 class ChallengeChecksController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def create
     challenge_id = params[:challenge_id]

diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
@@ -1,5 +1,5 @@
 class ChallengesController < ApplicationController
-  before_filter :require_admin, except: %w[index show]
+  before_action :require_admin, except: %w( index show )
 
   def index
     @challenges = if admin?

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -1,6 +1,6 @@
 class CommentsController < ApplicationController
-  before_filter :require_user
-  before_filter :require_editable_comment, only: [:edit, :update]
+  before_action :require_user
+  before_action :require_editable_comment, only: %w( edit update )
 
   def create
     @revision = Revision.find params[:revision_id]

diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
@@ -1,5 +1,5 @@
 class DashboardsController < ApplicationController
-  before_filter :require_user
+  before_action :require_user
 
   def show
     @points = current_user.points

diff --git a/app/controllers/hooks_controller.rb b/app/controllers/hooks_controller.rb
@@ -1,6 +1,6 @@
 class HooksController < ApplicationController
-  before_filter :require_admin, only: :index
-  before_filter :validate_secret_key, except: :index
+  before_action :require_admin,         only: :index
+  before_action :validate_secret_key, except: :index
   skip_before_action :verify_authenticity_token
 
   def index

diff --git a/app/controllers/my_answers_controller.rb b/app/controllers/my_answers_controller.rb
@@ -1,5 +1,5 @@
 class MyAnswersController < ApplicationController
-  before_filter :require_user
+  before_action :require_user
 
   def show
     @poll       = Poll.find params[:poll_id]

diff --git a/app/controllers/my_challenge_solutions_controller.rb b/app/controllers/my_challenge_solutions_controller.rb
@@ -1,5 +1,5 @@
 class MyChallengeSolutionsController < ApplicationController
-  before_filter :require_user
+  before_action :require_user
 
   def show
     @challenge  = Challenge.find params[:challenge_id]

diff --git a/app/controllers/my_solutions_controller.rb b/app/controllers/my_solutions_controller.rb
@@ -1,5 +1,5 @@
 class MySolutionsController < ApplicationController
-  before_filter :require_user
+  before_action :require_user
 
   def show
     @task = Task.find params[:task_id]

diff --git a/app/controllers/points_breakdowns_controller.rb b/app/controllers/points_breakdowns_controller.rb
@@ -1,5 +1,5 @@
 class PointsBreakdownsController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def index
     @points_breakdowns = PointsBreakdown.all

diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
@@ -1,5 +1,5 @@
 class PollsController < ApplicationController
-  before_filter :require_admin, except: :index
+  before_action :require_admin, except: :index
 
   def index
     @polls = Poll.all

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
@@ -1,5 +1,5 @@
 class ProfilesController < ApplicationController
-  before_filter :require_user
+  before_action :require_user
 
   def edit
     @user = current_user

diff --git a/app/controllers/replies_controller.rb b/app/controllers/replies_controller.rb
@@ -1,6 +1,6 @@
 class RepliesController < ApplicationController
-  before_filter :require_user, only: [:create]
-  before_filter :authorize, only: [:edit, :update]
+  before_action :require_user, only: :create
+  before_action :authorize,    only: %w( edit update )
 
   def create
     @topic = Topic.find params[:topic_id]

diff --git a/app/controllers/sign_ups_controller.rb b/app/controllers/sign_ups_controller.rb
@@ -1,5 +1,5 @@
 class SignUpsController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def index
     @sign_ups = SignUp.all

diff --git a/app/controllers/solutions_controller.rb b/app/controllers/solutions_controller.rb
@@ -1,5 +1,5 @@
 class SolutionsController < ApplicationController
-  before_filter :require_admin, only: :update
+  before_action :require_admin, only: :update
 
   def index
     @task = Task.find params[:task_id]

diff --git a/app/controllers/stars_controller.rb b/app/controllers/stars_controller.rb
@@ -1,5 +1,5 @@
 class StarsController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def create
     post = Post.find params[:post_id]

diff --git a/app/controllers/task_checks_controller.rb b/app/controllers/task_checks_controller.rb
@@ -1,5 +1,5 @@
 class TaskChecksController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def create
     task_id = params[:task_id]

diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
@@ -1,5 +1,5 @@
 class TasksController < ApplicationController
-  before_filter :require_admin, except: [:index, :show, :guide]
+  before_action :require_admin, except: %w( index show guide )
 
   def index
     @tasks = if admin?

diff --git a/app/controllers/tips_controller.rb b/app/controllers/tips_controller.rb
@@ -1,5 +1,5 @@
 class TipsController < ApplicationController
-  before_filter :require_admin, except: [:index, :show]
+  before_action :require_admin, except: %w( index show )
 
   def index
     if admin?

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
@@ -1,6 +1,6 @@
 class TopicsController < ApplicationController
-  before_filter :require_user, except: [:index, :show, :last_reply]
-  before_filter :authorize, only: [:edit, :update]
+  before_action :require_user, except: %w( index show last_reply )
+  before_action :authorize,      only: %w( edit update )
 
   def index
     @topics = Topic.boards_page params[:page] || 1

diff --git a/app/controllers/voucher_claims_controller.rb b/app/controllers/voucher_claims_controller.rb
@@ -1,5 +1,5 @@
 class VoucherClaimsController < ApplicationController
-  before_filter :require_user
+  before_action :require_user
 
   def new
   end

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
@@ -1,5 +1,5 @@
 class VouchersController < ApplicationController
-  before_filter :require_admin
+  before_action :require_admin
 
   def index
     @vouchers = Voucher.all