diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-28 22:50:10 +0000 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2018-01-19 14:52:35 +0000 |
| commit | 69cf3fa982d51c94cf605a6deaab11dbfd719ca7 (patch) | |
| tree | eb164c9be854eefa520024eaaf11070138283296 | |
| parent | 317b90d284426d7c7d1b34cc578745b076d2eb38 (diff) | |
| download | gitlab-ce-69cf3fa982d51c94cf605a6deaab11dbfd719ca7.tar.gz | |
Merge branch 'fix-abuse-reports-link-url' into 'master'
Fixed abuse reports link url
See merge request gitlab-org/gitlab-ce!16068
(cherry picked from commit 97bebab61f1589a9c434ccb8169a635d72a3bdf2)
7dfafd0f Fixed abuse reports link url
9574818e Add changelog entry
| -rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-abuse-reports-link-url.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index cb8db306b56..dd086f70641 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -130,7 +130,7 @@ %span.badge.count= number_with_delimiter(AbuseReport.count(:all)) %ul.sidebar-sub-level-items.is-fly-out-only = nav_link(controller: :abuse_reports, html_options: { class: "fly-out-top-item" } ) do - = link_to admin_broadcast_messages_path do + = link_to admin_abuse_reports_path do %strong.fly-out-top-item-name #{ _('Abuse Reports') } %span.badge.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all)) diff --git a/changelogs/unreleased/fix-abuse-reports-link-url.yml b/changelogs/unreleased/fix-abuse-reports-link-url.yml new file mode 100644 index 00000000000..44c26f35984 --- /dev/null +++ b/changelogs/unreleased/fix-abuse-reports-link-url.yml @@ -0,0 +1,5 @@ +--- +title: Fix abuse reports link url in admin area navbar +merge_request: 16068 +author: megos +type: fixed |