diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-03 04:26:30 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-03 04:26:30 +0300 |
| commit | 8a85906a74aff295074c79619d491bea9c947e05 (patch) | |
| tree | fc4aa22c44ce08a4bf6b823090e5c499b11ecc4a /app/views/layouts/nav/_admin.html.haml | |
| parent | fcfafffef5535295e310407a7e3bb4a20ff2fd55 (diff) | |
| parent | dffacbb12c0abd4edf677aed2d9e201b41fd2dae (diff) | |
Merge branch 'support-akismet' into 'master'
Support Akismet spam checking for creation of issues via API
Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.
Closes #5612
See merge request !2266
Diffstat (limited to 'app/views/layouts/nav/_admin.html.haml')
| -rw-r--r-- | app/views/layouts/nav/_admin.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index 62e6fba5e34..ac1d5429382 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -82,6 +82,14 @@ Abuse Reports %span.count= number_with_delimiter(AbuseReport.count(:all)) + - if askimet_enabled? + = nav_link(controller: :spam_logs) do + = link_to admin_spam_logs_path, title: "Spam Logs" do + = icon('exclamation-triangle fw') + %span + Spam Logs + %span.count= number_with_delimiter(SpamLog.count(:all)) + = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do = link_to admin_application_settings_path, title: 'Settings' do = icon('cogs fw') |