kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
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
This commit is contained in:
Robert Speicher 2016-07-27 22:26:37 +00:00
commit 17be364d07
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/explore/application_controller.rb
View file

@ -1,5 +1,5 @@
class Explore::ApplicationController < ApplicationController
skip_before_action :authenticate_user!, :reject_blocked
skip_before_action :authenticate_user!, :reject_blocked!
layout 'explore'
end

2
app/controllers/help_controller.rb
View file

@ -1,5 +1,5 @@
class HelpController < ApplicationController
skip_before_action :authenticate_user!, :reject_blocked
skip_before_action :authenticate_user!, :reject_blocked!
layout 'help'

2
app/controllers/search_controller.rb
View file

@ -1,5 +1,5 @@
class SearchController < ApplicationController
skip_before_action :authenticate_user!, :reject_blocked
skip_before_action :authenticate_user!, :reject_blocked!
include SearchHelper