diff options
author | Luke Bennett <lbennett@gitlab.com> | 2017-12-08 18:19:51 +0000 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2017-12-08 18:19:51 +0000 |
commit | 0e935c76061e9e5b2ef0a196637602f3720b23d7 (patch) | |
tree | a80cfa36cc893f173690fac3559674566de7ff75 | |
parent | 2a181d68c810e89ff5d2e49999775d8b58adb394 (diff) | |
download | gitlab-ce-recaptcha_check_if_spammable_ce_backport.tar.gz |
Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backport
-rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index ecac9be0360..281756af57a 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -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 |