Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8df23c28
Commit
8df23c28
authored
Sep 18, 2020
by
Jake Lear
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gitlab_bot? method and allowlist gitlab bots for spam
parent
0709379d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
app/services/spam/spam_action_service.rb
app/services/spam/spam_action_service.rb
+1
-1
ee/app/models/ee/user.rb
ee/app/models/ee/user.rb
+10
-0
No files found.
app/services/spam/spam_action_service.rb
View file @
8df23c28
...
...
@@ -45,7 +45,7 @@ module Spam
attr_reader
:user
,
:context
def
allowlisted?
(
user
)
user
.
respond_to?
(
:gitlab_employee
)
&&
user
.
gitlab_employee?
user
.
respond_to?
(
:gitlab_employee
)
&&
user
.
gitlab_employee?
||
user
.
respond_to?
(
:gitlab_bot
)
&&
user
.
gitlab_bot?
end
def
perform_spam_service_check
(
api
)
...
...
ee/app/models/ee/user.rb
View file @
8df23c28
...
...
@@ -358,6 +358,16 @@ module EE
end
end
def
gitlab_bot?
strong_memoize
(
:gitlab_bot
)
do
if
::
Gitlab
.
com?
bot?
&&
::
Gitlab
::
Com
.
gitlab_com_group_member_id?
(
id
)
else
false
end
end
end
def
security_dashboard
InstanceSecurityDashboard
.
new
(
self
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment