Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'
Add recaptcha_check_if_spammable for issualbes than arent spammables See merge request gitlab-org/gitlab-ce!15817
This commit is contained in:
commit
689bc9ea6d
1 changed files with 8 additions and 2 deletions
|
@ -21,11 +21,11 @@ module IssuableActions
|
|||
|
||||
respond_to do |format|
|
||||
format.html do
|
||||
recaptcha_check_with_fallback { render :edit }
|
||||
recaptcha_check_if_spammable { render :edit }
|
||||
end
|
||||
|
||||
format.json do
|
||||
recaptcha_check_with_fallback(false) { render_entity_json }
|
||||
recaptcha_check_if_spammable(false) { render_entity_json }
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -80,6 +80,12 @@ module IssuableActions
|
|||
|
||||
private
|
||||
|
||||
def recaptcha_check_if_spammable(should_redirect = true, &block)
|
||||
return yield unless @issuable.is_a? Spammable
|
||||
|
||||
recaptcha_check_with_fallback(should_redirect, &block)
|
||||
end
|
||||
|
||||
def render_conflict_response
|
||||
respond_to do |format|
|
||||
format.html do
|
||||
|
|
Loading…
Reference in a new issue