diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 12:09:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 12:09:11 +0300 |
commit | 0388886f9439fa93efea29a159522aec5643f7c8 (patch) | |
tree | 9a4b2305088e62a9745ce598b45aa34e39e59642 /app/services/concerns | |
parent | 8c9dc985b90c353b33cb829caf51f8320171bc15 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/concerns')
-rw-r--r-- | app/services/concerns/akismet_methods.rb | 10 | ||||
-rw-r--r-- | app/services/concerns/spam_check_methods.rb | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/services/concerns/akismet_methods.rb b/app/services/concerns/akismet_methods.rb index 105b79785bd..4e554ddac4c 100644 --- a/app/services/concerns/akismet_methods.rb +++ b/app/services/concerns/akismet_methods.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true module AkismetMethods - def spammable_owner - @user ||= User.find(spammable.author_id) + def target_owner + @user ||= User.find(target.author_id) end def akismet @akismet ||= Spam::AkismetService.new( - spammable_owner.name, - spammable_owner.email, - spammable.try(:spammable_text) || spammable&.text, + target_owner.name, + target_owner.email, + target.try(:spammable_text) || target&.text, options ) end diff --git a/app/services/concerns/spam_check_methods.rb b/app/services/concerns/spam_check_methods.rb index 695bdf92b49..62836881099 100644 --- a/app/services/concerns/spam_check_methods.rb +++ b/app/services/concerns/spam_check_methods.rb @@ -2,7 +2,7 @@ # SpamCheckMethods # -# Provide helper methods for checking if a given spammable object has +# Provide helper methods for checking if a given target spammable object has # potential spam data. # # Dependencies: @@ -18,13 +18,13 @@ module SpamCheckMethods end # rubocop:enable Gitlab/ModuleWithInstanceVariables - # In order to be proceed to the spam check process, @spammable has to be + # In order to be proceed to the spam check process, @target has to be # a dirty instance, which means it should be already assigned with the new # attribute values. # rubocop:disable Gitlab/ModuleWithInstanceVariables def spam_check(spammable, user) Spam::SpamCheckService.new( - spammable: spammable, + target: spammable, request: @request ).execute( api: @api, |