diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 21:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 21:09:00 +0300 |
| commit | c57e10faab0abb213e7a18274fd5a98ba87a5c09 (patch) | |
| tree | de0195e28dfe19fbfeb5bffa8fde4f511288d8ef /app/services/concerns | |
| parent | 11e5d1b9ca3efa7be34ddebb708a6aedb4e91639 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/concerns')
| -rw-r--r-- | app/services/concerns/akismet_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/concerns/akismet_methods.rb b/app/services/concerns/akismet_methods.rb index 48c4e329944..105b79785bd 100644 --- a/app/services/concerns/akismet_methods.rb +++ b/app/services/concerns/akismet_methods.rb @@ -9,7 +9,7 @@ module AkismetMethods @akismet ||= Spam::AkismetService.new( spammable_owner.name, spammable_owner.email, - spammable.spammable_text, + spammable.try(:spammable_text) || spammable&.text, options ) end |