Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

2 files changed, 5 insertions, 5 deletions

diff --git a/app/services/spam/mark_as_spam_service.rb b/app/services/spam/akismet_mark_as_spam_service.rb
index ed5e674d8e9..da5506b9a21 100644
--- a/app/services/spam/mark_as_spam_service.rb
+++ b/app/services/spam/akismet_mark_as_spam_service.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spam
-  class MarkAsSpamService
+  class AkismetMarkAsSpamService
     include ::AkismetMethods
 
     attr_accessor :target, :options
@@ -9,12 +9,12 @@ module Spam
     def initialize(target:)
       @target = target
       @options = {}
+    end
 
+    def execute
       @options[:ip_address] = @target.ip_address
       @options[:user_agent] = @target.user_agent
-    end
 
-    def execute
       return unless target.submittable_as_spam?
       return unless akismet.submit_spam
 
diff --git a/app/services/spam/spam_action_service.rb b/app/services/spam/spam_action_service.rb
index ec16ce19cf6..2a28b66f09b 100644
--- a/app/services/spam/spam_action_service.rb
+++ b/app/services/spam/spam_action_service.rb
@@ -28,7 +28,7 @@ module Spam
         ServiceResponse.success(message: "CAPTCHA successfully verified")
       else
         return ServiceResponse.success(message: 'Skipped spam check because user was allowlisted') if allowlisted?(user)
-        return ServiceResponse.success(message: 'Skipped spam check because it was not required') unless check_for_spam?
+        return ServiceResponse.success(message: 'Skipped spam check because it was not required') unless check_for_spam?(user: user)
 
         perform_spam_service_check
         ServiceResponse.success(message: "Spam check performed. Check #{target.class.name} spammable model for any errors or CAPTCHA requirement")
@@ -94,7 +94,7 @@ module Spam
     def create_spam_log
       @spam_log = SpamLog.create!(
         {
-          user_id: target.author_id,
+          user_id: user.id,
           title: target.spam_title,
           description: target.spam_description,
           source_ip: spam_params.ip_address,