diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-08 12:12:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-08 12:12:41 +0000 |
| commit | 8fea353b907d1fd571f5450a757cafee73cfbfd0 (patch) | |
| tree | 38cd1edddd3de94d6f743029c164fab5691a7241 /app/views/admin/spam_logs/_spam_log.html.haml | |
| parent | db5097a28b061ef273a058aa64845c79635ea4e7 (diff) | |
| download | gitlab-ce-8fea353b907d1fd571f5450a757cafee73cfbfd0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/spam_logs/_spam_log.html.haml')
| -rw-r--r-- | app/views/admin/spam_logs/_spam_log.html.haml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/views/admin/spam_logs/_spam_log.html.haml b/app/views/admin/spam_logs/_spam_log.html.haml index cd6df5f30f3..2d0ea585735 100644 --- a/app/views/admin/spam_logs/_spam_log.html.haml +++ b/app/views/admin/spam_logs/_spam_log.html.haml @@ -26,11 +26,13 @@ = link_to _('Remove user'), admin_spam_log_path(spam_log, remove_user: true), data: { confirm: _("USER %{user_name} WILL BE REMOVED! Are you sure?") % { user_name: user.name }, confirm_btn_variant: 'danger' }, aria: { label: _('Remove user') }, method: :delete, class: "gl-button btn btn-sm btn-danger" %td - - if spam_log.submitted_as_ham? - .gl-button.btn.btn-default.btn-sm.disabled.gl-mb-3 - = _("Submitted as ham") - - else - = link_to _('Submit as ham'), mark_as_ham_admin_spam_log_path(spam_log), method: :post, class: 'gl-button btn btn-default btn-sm gl-mb-3' + -# TODO: Remove conditonal once spamcheck supports this https://gitlab.com/gitlab-com/gl-security/engineering-and-research/automation-team/spam/spamcheck/-/issues/190 + - if akismet_enabled? + - if spam_log.submitted_as_ham? + .gl-button.btn.btn-default.btn-sm.disabled.gl-mb-3 + = _("Submitted as ham") + - else + = link_to _('Submit as ham'), mark_as_ham_admin_spam_log_path(spam_log), method: :post, class: 'gl-button btn btn-default btn-sm gl-mb-3' - if user && !user.blocked? = link_to _('Block user'), block_admin_user_path(user), data: {confirm: _('USER WILL BE BLOCKED! Are you sure?')}, method: :put, class: "gl-button btn btn-default btn-sm gl-mb-3" - else |