diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 12:08:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 12:08:58 +0300 |
| commit | 93e4425400aa60f54f1bbccb26ef6581503952f3 (patch) | |
| tree | 60ec09e58a7ba58d3d795ddc12803d40471b758d /app/services/spam | |
| parent | 731d58455c61ad6400924171eb182f2c2ab2f0a4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/spam')
| -rw-r--r-- | app/services/spam/spam_action_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/spam/spam_action_service.rb b/app/services/spam/spam_action_service.rb index ab83fc401e9..b3d617256ff 100644 --- a/app/services/spam/spam_action_service.rb +++ b/app/services/spam/spam_action_service.rb @@ -45,7 +45,7 @@ module Spam attr_reader :user, :context def allowlisted?(user) - user.try(:gitlab_employee?) || user.try(:gitlab_bot?) + user.try(:gitlab_employee?) || user.try(:gitlab_bot?) || user.try(:gitlab_service_user?) end def perform_spam_service_check(api) |