From 93e4425400aa60f54f1bbccb26ef6581503952f3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 19 Oct 2020 09:08:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/spam/spam_action_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services/spam') 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) -- cgit v1.2.3