diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 18:10:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 18:10:07 +0300 |
| commit | 12a224d5db7aebdb30cda8ffb75c69fc66d07096 (patch) | |
| tree | b76fd3f006aef2f6cc81a2df18fc73dcf1727bb8 /app/services/spam | |
| parent | 8470023ba6ca065d0491c37c33e2348e499df8b3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/spam')
| -rw-r--r-- | app/services/spam/spam_action_service.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/services/spam/spam_action_service.rb b/app/services/spam/spam_action_service.rb index 0527412e9bc..5c510990b2d 100644 --- a/app/services/spam/spam_action_service.rb +++ b/app/services/spam/spam_action_service.rb @@ -12,10 +12,9 @@ module Spam end def execute - return ServiceResponse.success(message: 'Skipped spam check because spam_params was not present') unless spam_params return ServiceResponse.success(message: 'Skipped spam check because user was not present') unless user - if target.supports_recaptcha? + if target.supports_recaptcha? && spam_params execute_with_captcha_support else execute_spam_check @@ -105,8 +104,8 @@ module Spam user_id: user.id, title: target.spam_title, description: target.spam_description, - source_ip: spam_params.ip_address, - user_agent: spam_params.user_agent, + source_ip: spam_params&.ip_address, + user_agent: spam_params&.user_agent, noteable_type: noteable_type, # Now, all requests are via the API, so hardcode it to true to simplify the logic and API # of this service. See https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/2266 @@ -127,9 +126,9 @@ module Spam } options = { - ip_address: spam_params.ip_address, - user_agent: spam_params.user_agent, - referer: spam_params.referer + ip_address: spam_params&.ip_address, + user_agent: spam_params&.user_agent, + referer: spam_params&.referer } SpamVerdictService.new(target: target, |