Merge branch 'cablett-spam-tidy-mark-method' into 'master'

Refactor `spammable_owner_id` method

See merge request gitlab-org/gitlab!23224

app/services/concerns/akismet_methods.rb

@@ -2,16 +2,7 @@
 
 module AkismetMethods
   def spammable_owner
-    @user ||= User.find(spammable_owner_id)
-  end
-
-  def spammable_owner_id
-    @owner_id ||=
-      if spammable.respond_to?(:author_id)
-        spammable.author_id
-      elsif spammable.respond_to?(:creator_id)
-        spammable.creator_id
-      end
+    @user ||= User.find(spammable.author_id)
   end
 
   def akismet

app/services/spam_service.rb

@@ -53,7 +53,7 @@ class SpamService
   def create_spam_log(api)
     @spam_log = SpamLog.create!(
       {
-        user_id: spammable_owner_id,
+        user_id: spammable.author_id,
         title: spammable.spam_title,
         description: spammable.spam_description,
         source_ip: options[:ip_address],