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
Kazuhiko Shiozaki
gitlab-ce
Commits
fdbf77ef
Commit
fdbf77ef
authored
Jun 30, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix styling issues.
parent
d3796b84
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
20 deletions
+13
-20
app/assets/stylesheets/sections/groups.scss
app/assets/stylesheets/sections/groups.scss
+0
-5
app/models/group_milestone.rb
app/models/group_milestone.rb
+10
-10
app/services/milestones/group_service.rb
app/services/milestones/group_service.rb
+1
-1
app/views/groups/milestones/_issue.html.haml
app/views/groups/milestones/_issue.html.haml
+1
-2
app/views/groups/milestones/_merge_request.html.haml
app/views/groups/milestones/_merge_request.html.haml
+1
-2
No files found.
app/assets/stylesheets/sections/groups.scss
View file @
fdbf77ef
...
@@ -11,8 +11,3 @@
...
@@ -11,8 +11,3 @@
.milestone-row
{
.milestone-row
{
@include
str-truncated
(
90%
);
@include
str-truncated
(
90%
);
}
}
.label.label-default.project-name
{
width
:
80px
;
@include
str-truncated
(
80%
);
}
app/models/group_milestone.rb
View file @
fdbf77ef
...
@@ -18,27 +18,27 @@ class GroupMilestone
...
@@ -18,27 +18,27 @@ class GroupMilestone
end
end
def
projects
def
projects
milestones
.
map
{
|
milestone
|
milestone
.
project
}
milestones
.
map
{
|
milestone
|
milestone
.
project
}
end
end
def
issue_count
def
issue_count
milestones
.
map
{
|
milestone
|
milestone
.
issues
.
count
}.
sum
milestones
.
map
{
|
milestone
|
milestone
.
issues
.
count
}.
sum
end
end
def
merge_requests_count
def
merge_requests_count
milestones
.
map
{
|
milestone
|
milestone
.
merge_requests
.
count
}.
sum
milestones
.
map
{
|
milestone
|
milestone
.
merge_requests
.
count
}.
sum
end
end
def
open_items_count
def
open_items_count
milestones
.
map
{
|
milestone
|
milestone
.
open_items_count
}.
sum
milestones
.
map
{
|
milestone
|
milestone
.
open_items_count
}.
sum
end
end
def
closed_items_count
def
closed_items_count
milestones
.
map
{
|
milestone
|
milestone
.
closed_items_count
}.
sum
milestones
.
map
{
|
milestone
|
milestone
.
closed_items_count
}.
sum
end
end
def
total_items_count
def
total_items_count
milestones
.
map
{
|
milestone
|
milestone
.
total_items_count
}.
sum
milestones
.
map
{
|
milestone
|
milestone
.
total_items_count
}.
sum
end
end
def
percent_complete
def
percent_complete
...
@@ -48,7 +48,7 @@ class GroupMilestone
...
@@ -48,7 +48,7 @@ class GroupMilestone
end
end
def
state
def
state
state
=
milestones
.
map
{
|
milestone
|
milestone
.
state
}
state
=
milestones
.
map
{
|
milestone
|
milestone
.
state
}
if
state
.
count
(
'active'
)
==
state
.
size
if
state
.
count
(
'active'
)
==
state
.
size
'active'
'active'
...
@@ -66,15 +66,15 @@ class GroupMilestone
...
@@ -66,15 +66,15 @@ class GroupMilestone
end
end
def
issues
def
issues
@group_issues
||=
milestones
.
map
{
|
milestone
|
milestone
.
issues
}.
flatten
.
group_by
(
&
:state
)
@group_issues
||=
milestones
.
map
{
|
milestone
|
milestone
.
issues
}.
flatten
.
group_by
(
&
:state
)
end
end
def
merge_requests
def
merge_requests
@group_merge_requests
||=
milestones
.
map
{
|
milestone
|
milestone
.
merge_requests
}.
flatten
.
group_by
(
&
:state
)
@group_merge_requests
||=
milestones
.
map
{
|
milestone
|
milestone
.
merge_requests
}.
flatten
.
group_by
(
&
:state
)
end
end
def
participants
def
participants
milestones
.
map
{
|
milestone
|
milestone
.
participants
.
uniq
}.
reject
(
&
:empty?
).
flatten
milestones
.
map
{
|
milestone
|
milestone
.
participants
.
uniq
}.
reject
(
&
:empty?
).
flatten
end
end
def
opened_issues
def
opened_issues
...
...
app/services/milestones/group_service.rb
View file @
fdbf77ef
...
@@ -17,7 +17,7 @@ module Milestones
...
@@ -17,7 +17,7 @@ module Milestones
end
end
end
end
private
private
def
build
(
milestone
)
def
build
(
milestone
)
milestone
.
map
{
|
title
,
milestones
|
GroupMilestone
.
new
(
title
,
milestones
)
}
milestone
.
map
{
|
title
,
milestones
|
GroupMilestone
.
new
(
title
,
milestones
)
}
...
...
app/views/groups/milestones/_issue.html.haml
View file @
fdbf77ef
%li
{
id:
dom_id
(
issue
,
'sortable'
),
class:
'issue-row'
,
'data-iid'
=>
issue
.
iid
}
%li
{
id:
dom_id
(
issue
,
'sortable'
),
class:
'issue-row'
,
'data-iid'
=>
issue
.
iid
}
%span
.milestone-row
%span
.milestone-row
-
project
=
issue
.
project
-
project
=
issue
.
project
%span
.label.label-default.project-name
%strong
#{
project
.
name
}
·
=
project
.
name
=
link_to
[
project
,
issue
]
do
=
link_to
[
project
,
issue
]
do
%span
.cgray
##{issue.iid}
%span
.cgray
##{issue.iid}
=
link_to_gfm
issue
.
title
,
[
project
,
issue
]
=
link_to_gfm
issue
.
title
,
[
project
,
issue
]
...
...
app/views/groups/milestones/_merge_request.html.haml
View file @
fdbf77ef
%li
{
id:
dom_id
(
merge_request
,
'sortable'
),
class:
'mr-row'
,
'data-iid'
=>
merge_request
.
iid
}
%li
{
id:
dom_id
(
merge_request
,
'sortable'
),
class:
'mr-row'
,
'data-iid'
=>
merge_request
.
iid
}
%span
.milestone-row
%span
.milestone-row
-
project
=
merge_request
.
project
-
project
=
merge_request
.
project
%span
.label.label-default.project-name
%strong
#{
project
.
name
}
·
=
project
.
name
=
link_to
[
project
,
merge_request
]
do
=
link_to
[
project
,
merge_request
]
do
%span
.cgray
##{merge_request.iid}
%span
.cgray
##{merge_request.iid}
=
link_to_gfm
merge_request
.
title
,
[
project
,
merge_request
]
=
link_to_gfm
merge_request
.
title
,
[
project
,
merge_request
]
...
...
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