Commit b1c94754 authored by Connor Shea's avatar Connor Shea

Replace reject_blocked with reject_blocked! in callbacks.

In Rails 4.2 and below, skipping callbacks (skip_before_action, skip_after_action, etc.) that use methods which do not exist will not throw any errors.

On the other hand, Rails 5 does. See https://github.com/rails/rails/pull/19029

After testing with Rails 5 I noticed there are some methods that don't actually exist (because they were renamed, usually), this fixes a few instances of those.

reject_blocked! was introduced in c9def945, I can't find any references to reject_blocked ever existing.
parent f6063bae
class Explore::ApplicationController < ApplicationController class Explore::ApplicationController < ApplicationController
skip_before_action :authenticate_user!, :reject_blocked skip_before_action :authenticate_user!, :reject_blocked!
layout 'explore' layout 'explore'
end end
class HelpController < ApplicationController class HelpController < ApplicationController
skip_before_action :authenticate_user!, :reject_blocked skip_before_action :authenticate_user!, :reject_blocked!
layout 'help' layout 'help'
......
class SearchController < ApplicationController class SearchController < ApplicationController
skip_before_action :authenticate_user!, :reject_blocked skip_before_action :authenticate_user!, :reject_blocked!
include SearchHelper include SearchHelper
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment