Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
071624a0
Commit
071624a0
authored
Dec 28, 2017
by
megos
Committed by
Robert Speicher
Dec 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed abuse reports link url
parent
0ea79ccf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/views/layouts/nav/sidebar/_admin.html.haml
app/views/layouts/nav/sidebar/_admin.html.haml
+1
-1
changelogs/unreleased/fix-abuse-reports-link-url.yml
changelogs/unreleased/fix-abuse-reports-link-url.yml
+5
-0
No files found.
app/views/layouts/nav/sidebar/_admin.html.haml
View file @
071624a0
...
@@ -130,7 +130,7 @@
...
@@ -130,7 +130,7 @@
%span
.badge.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
%span
.badge.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
%ul
.sidebar-sub-level-items.is-fly-out-only
%ul
.sidebar-sub-level-items.is-fly-out-only
=
nav_link
(
controller: :abuse_reports
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
nav_link
(
controller: :abuse_reports
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
admin_
broadcast_message
s_path
do
=
link_to
admin_
abuse_report
s_path
do
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
#{
_
(
'Abuse Reports'
)
}
#{
_
(
'Abuse Reports'
)
}
%span
.badge.count.merge_counter.js-merge-counter.fly-out-badge
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
%span
.badge.count.merge_counter.js-merge-counter.fly-out-badge
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
...
...
changelogs/unreleased/fix-abuse-reports-link-url.yml
0 → 100644
View file @
071624a0
---
title
:
Fix abuse reports link url in admin area navbar
merge_request
:
16068
author
:
megos
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment