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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
48a30a7a
Commit
48a30a7a
authored
Mar 29, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prever #count over #size when calculating issue/mr totals
parent
36714377
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+12
-12
No files found.
app/views/shared/milestones/_sidebar.html.haml
View file @
48a30a7a
...
...
@@ -68,10 +68,10 @@
.sidebar-collapsed-icon
%strong
=
icon
(
'hashtag'
,
'aria-hidden'
:
'true'
)
%span
=
milestone
.
issues_visible_to_user
(
current_user
).
size
%span
=
milestone
.
issues_visible_to_user
(
current_user
).
count
.title.hide-collapsed
Issues
%span
.badge
=
milestone
.
issues_visible_to_user
(
current_user
).
size
%span
.badge
=
milestone
.
issues_visible_to_user
(
current_user
).
count
-
if
project
&&
can?
(
current_user
,
:create_issue
,
project
)
=
link_to
new_namespace_project_issue_path
(
project
.
namespace
,
project
,
issue:
{
milestone_id:
milestone
.
id
}),
class:
"pull-right"
,
title:
"New Issue"
do
New issue
...
...
@@ -79,44 +79,44 @@
%span
.milestone-stat
=
link_to
milestones_browse_issuables_path
(
milestone
,
type: :issues
)
do
Open:
=
milestone
.
issues_visible_to_user
(
current_user
).
opened
.
size
=
milestone
.
issues_visible_to_user
(
current_user
).
opened
.
count
%span
.milestone-stat
=
link_to
milestones_browse_issuables_path
(
milestone
,
type: :issues
,
state:
'closed'
)
do
Closed:
=
milestone
.
issues_visible_to_user
(
current_user
).
closed
.
size
=
milestone
.
issues_visible_to_user
(
current_user
).
closed
.
count
.block
.sidebar-collapsed-icon
%strong
=
icon
(
'exclamation'
,
'aria-hidden'
:
'true'
)
%span
=
milestone
.
issues_visible_to_user
(
current_user
).
size
%span
=
milestone
.
issues_visible_to_user
(
current_user
).
count
.title.hide-collapsed
Merge requests
%span
.badge
=
milestone
.
merge_requests
.
size
%span
.badge
=
milestone
.
merge_requests
.
count
.value.hide-collapsed.bold
-
if
!
project
||
can?
(
current_user
,
:read_merge_request
,
project
)
%span
.milestone-stat
=
link_to
milestones_browse_issuables_path
(
milestone
,
type: :merge_requests
)
do
Open:
=
milestone
.
merge_requests
.
opened
.
size
=
milestone
.
merge_requests
.
opened
.
count
%span
.milestone-stat
=
link_to
milestones_browse_issuables_path
(
milestone
,
type: :merge_requests
,
state:
'closed'
)
do
Closed:
=
milestone
.
merge_requests
.
closed
.
size
=
milestone
.
merge_requests
.
closed
.
count
%span
.milestone-stat
=
link_to
milestones_browse_issuables_path
(
milestone
,
type: :merge_requests
,
state:
'merged'
)
do
Merged:
=
milestone
.
merge_requests
.
merged
.
size
=
milestone
.
merge_requests
.
merged
.
count
-
else
%span
.milestone-stat
Open:
=
milestone
.
merge_requests
.
opened
.
size
=
milestone
.
merge_requests
.
opened
.
count
%span
.milestone-stat
Closed:
=
milestone
.
merge_requests
.
closed
.
size
=
milestone
.
merge_requests
.
closed
.
count
%span
.milestone-stat
Merged:
=
milestone
.
merge_requests
.
merged
.
size
=
milestone
.
merge_requests
.
merged
.
count
-
milestone_ref
=
milestone
.
try
(
:to_reference
,
full:
true
)
-
if
milestone_ref
.
present?
...
...
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