summaryrefslogtreecommitdiff
path: root/app/views/admin/spam_logs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-18 03:07:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-18 03:07:23 +0000
commit962afb3da11a72c7fca322378886b2c0be9f3385 (patch)
tree541e08c4d329ab62cfbadde45b0f15d2171e004e /app/views/admin/spam_logs
parent8a560d56661f56804ddf6596f928e7d25db37443 (diff)
downloadgitlab-ce-962afb3da11a72c7fca322378886b2c0be9f3385.tar.gz
Add latest changes from gitlab-org/gitlab@masterHEADmaster
Diffstat (limited to 'app/views/admin/spam_logs')
-rw-r--r--app/views/admin/spam_logs/_spam_log.html.haml2
-rw-r--r--app/views/admin/spam_logs/index.html.haml1
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/admin/spam_logs/_spam_log.html.haml b/app/views/admin/spam_logs/_spam_log.html.haml
index 183667679b9..6aed8508a6a 100644
--- a/app/views/admin/spam_logs/_spam_log.html.haml
+++ b/app/views/admin/spam_logs/_spam_log.html.haml
@@ -22,6 +22,8 @@
%td
= truncate(spam_log.description, length: 100)
%td
+ = moderation_status(user)
+ %td
- if user
= render Pajamas::ButtonComponent.new(size: :small,
variant: :danger,
diff --git a/app/views/admin/spam_logs/index.html.haml b/app/views/admin/spam_logs/index.html.haml
index 001662c4015..9a0756510ec 100644
--- a/app/views/admin/spam_logs/index.html.haml
+++ b/app/views/admin/spam_logs/index.html.haml
@@ -14,6 +14,7 @@
%th= _('Type')
%th= _('Title')
%th= _('Description')
+ %th= _('User Status')
%th= _('Primary Action')
%th
= render @spam_logs