diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
commit | 905c1110b08f93a19661cf42a276c7ea90d0a0ff (patch) | |
tree | 756d138db422392c00471ab06acdff92c5a9b69c /app/services/spam_service.rb | |
parent | 50d93f8d1686950fc58dda4823c4835fd0d8c14b (diff) | |
download | gitlab-ce-905c1110b08f93a19661cf42a276c7ea90d0a0ff.tar.gz |
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
Diffstat (limited to 'app/services/spam_service.rb')
-rw-r--r-- | app/services/spam_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/spam_service.rb b/app/services/spam_service.rb index f2f133dae28..babe69cfdc8 100644 --- a/app/services/spam_service.rb +++ b/app/services/spam_service.rb @@ -37,7 +37,8 @@ class SpamService else # Otherwise, it goes to Akismet and check if it's a spam. If that's the # case, it assigns spammable record as "spam" and create a SpamLog record. - spammable.spam = check(api) + possible_spam = check(api) + spammable.spam = possible_spam unless spammable.allow_possible_spam? spammable.spam_log = spam_log end end |