diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-07 14:21:13 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-07 14:21:13 +0000 |
| commit | 38cb0347b2ae8dc3d8bd61dd81f5f10af688562b (patch) | |
| tree | f668cf3725116b72e1cdbc3c95be76a77be6b922 /app/views/admin | |
| parent | 8d5ae0d99f9194b3c6c97f5f90883fe1f07298f8 (diff) | |
| parent | 3d2954e4570d236a080b0d46698d96a28fd9acec (diff) | |
| download | gitlab-ce-38cb0347b2ae8dc3d8bd61dd81f5f10af688562b.tar.gz | |
Merge branch '21518_recaptcha_spam_issues' into 'master'
Use reCaptcha when an issue identified as spam
Closes #21518
See merge request !8846
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/spam_logs/_spam_log.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/spam_logs/index.html.haml | 1 |
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 4ce4eab8753..33f6d847782 100644 --- a/app/views/admin/spam_logs/_spam_log.html.haml +++ b/app/views/admin/spam_logs/_spam_log.html.haml @@ -14,6 +14,8 @@ %td = spam_log.via_api? ? 'Y' : 'N' %td + = spam_log.recaptcha_verified ? 'Y' : 'N' + %td = spam_log.noteable_type %td = spam_log.title diff --git a/app/views/admin/spam_logs/index.html.haml b/app/views/admin/spam_logs/index.html.haml index 0fdd5bd9960..8aaa6379730 100644 --- a/app/views/admin/spam_logs/index.html.haml +++ b/app/views/admin/spam_logs/index.html.haml @@ -10,6 +10,7 @@ %th User %th Source IP %th API? + %th Recaptcha verified? %th Type %th Title %th Description |