BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c8276c9b
Commit
c8276c9b
authored
Jul 31, 2017
by
Phil Hughes
Committed by
James Edwards-Jones
Jul 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'win-newnav-badges-firefox' into 'master'
Fix badge positioning in new navigation for Firefox Closes #35634 See merge request !13186
parent
3b41e0b3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
_new_admin_sidebar.html.haml
app/views/layouts/nav/_new_admin_sidebar.html.haml
+1
-1
_new_group_sidebar.html.haml
app/views/layouts/nav/_new_group_sidebar.html.haml
+2
-2
No files found.
app/views/layouts/nav/_new_admin_sidebar.html.haml
View file @
c8276c9b
...
...
@@ -87,8 +87,8 @@
=
nav_link
(
controller: :abuse_reports
)
do
=
link_to
admin_abuse_reports_path
,
title:
"Abuse Reports"
do
%span
Abuse Reports
%span
.badge.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
Abuse Reports
-
if
akismet_enabled?
=
nav_link
(
controller: :spam_logs
)
do
...
...
app/views/layouts/nav/_new_group_sidebar.html.haml
View file @
c8276c9b
...
...
@@ -24,9 +24,9 @@
=
nav_link
(
path:
[
'groups#issues'
,
'labels#index'
,
'milestones#index'
])
do
=
link_to
issues_group_path
(
@group
),
title:
'Issues'
do
%span
Issues
-
issues
=
IssuesFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
%span
.badge.count
=
number_with_delimiter
(
issues
.
count
)
Issues
%ul
.sidebar-sub-level-items
=
nav_link
(
path:
'groups#issues'
,
html_options:
{
class:
'home'
})
do
...
...
@@ -47,9 +47,9 @@
=
nav_link
(
path:
'groups#merge_requests'
)
do
=
link_to
merge_requests_group_path
(
@group
),
title:
'Merge Requests'
do
%span
Merge Requests
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
,
non_archived:
true
).
execute
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
Merge Requests
=
nav_link
(
path:
'group_members#index'
)
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
...
...
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