Merge branch 'rename-undefined-methods' into 'master'

Replace reject_blocked with reject_blocked! in skipped callbacks. `reject_blocked!` was introduced in c9def945, I can't find any references to `reject_blocked` ever existing. See merge request !5532

Merge branch 'rename-undefined-methods' into 'master'
17be364d · Robert Speicher · f6063bae · b1c94754 · 17be364d · 17be364d
Commit 17be364d authored Jul 27, 2016 by Robert Speicher
Showing with 3 additions and 3 deletions

application_controller.rb app/controllers/explore/application_controller.rb +1 -1

help_controller.rb app/controllers/help_controller.rb +1 -1

search_controller.rb app/controllers/search_controller.rb +1 -1

No files found.
--- a/app/controllers/explore/application_controller.rb
+++ b/app/controllers/explore/application_controller.rb
 class Explore::ApplicationController < ApplicationController
-  skip_before_action :authenticate_user!, :reject_blocked
+  skip_before_action :authenticate_user!, :reject_blocked!

  layout 'explore'
 end
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
 class HelpController < ApplicationController
-  skip_before_action :authenticate_user!, :reject_blocked
+  skip_before_action :authenticate_user!, :reject_blocked!

  layout 'help'


--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
 class SearchController < ApplicationController
-  skip_before_action :authenticate_user!, :reject_blocked
+  skip_before_action :authenticate_user!, :reject_blocked!

  include SearchHelper