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
32f8fc1f
Commit
32f8fc1f
authored
Feb 23, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor Milestone view for Dashboard.
parent
ed480855
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
70 deletions
+10
-70
app/views/dashboard/milestones/_issue.html.haml
app/views/dashboard/milestones/_issue.html.haml
+0
-10
app/views/dashboard/milestones/_issues.html.haml
app/views/dashboard/milestones/_issues.html.haml
+0
-6
app/views/dashboard/milestones/_merge_request.html.haml
app/views/dashboard/milestones/_merge_request.html.haml
+0
-10
app/views/dashboard/milestones/_merge_requests.html.haml
app/views/dashboard/milestones/_merge_requests.html.haml
+0
-6
app/views/dashboard/milestones/show.html.haml
app/views/dashboard/milestones/show.html.haml
+10
-38
No files found.
app/views/dashboard/milestones/_issue.html.haml
deleted
100644 → 0
View file @
ed480855
%li
{
id:
dom_id
(
issue
,
'sortable'
),
class:
'issue-row'
,
'data-iid'
=>
issue
.
iid
}
%span
.milestone-row
-
project
=
issue
.
project
%strong
#{
project
.
name_with_namespace
}
·
=
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
issue
]
do
%span
.cgray
##{issue.iid}
=
link_to_gfm
issue
.
title
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
issue
],
title:
issue
.
title
.pull-right.assignee-icon
-
if
issue
.
assignee
=
image_tag
avatar_icon
(
issue
.
assignee
,
16
),
class:
"avatar s16"
app/views/dashboard/milestones/_issues.html.haml
deleted
100644 → 0
View file @
ed480855
.panel.panel-default
.panel-heading
=
title
%ul
{
class:
"well-list issues-sortable-list"
}
-
if
issues
-
issues
.
each
do
|
issue
|
=
render
'issue'
,
issue:
issue
app/views/dashboard/milestones/_merge_request.html.haml
deleted
100644 → 0
View file @
ed480855
%li
{
id:
dom_id
(
merge_request
,
'sortable'
),
class:
'mr-row'
,
'data-iid'
=>
merge_request
.
iid
}
%span
.milestone-row
-
project
=
merge_request
.
project
%strong
#{
project
.
name_with_namespace
}
·
=
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
merge_request
]
do
%span
.cgray
##{merge_request.iid}
=
link_to_gfm
merge_request
.
title
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
merge_request
],
title:
merge_request
.
title
.pull-right.assignee-icon
-
if
merge_request
.
assignee
=
image_tag
avatar_icon
(
merge_request
.
assignee
,
16
),
class:
"avatar s16"
app/views/dashboard/milestones/_merge_requests.html.haml
deleted
100644 → 0
View file @
ed480855
.panel.panel-default
.panel-heading
=
title
%ul
{
class:
"well-list merge_requests-sortable-list"
}
-
if
merge_requests
-
merge_requests
.
each
do
|
merge_request
|
=
render
'merge_request'
,
merge_request:
merge_request
app/views/dashboard/milestones/show.html.haml
View file @
32f8fc1f
...
...
@@ -61,45 +61,17 @@
=
link_to
'#tab-participants'
,
'data-toggle'
=>
'tab'
do
Participants
%span
.badge
=
@milestone
.
participants
.
count
%li
=
link_to
'#tab-labels'
,
'data-toggle'
=>
'tab'
,
'data-show'
=>
'.tab-issues-buttons'
do
Labels
%span
.badge
=
@milestone
.
labels
.
count
.tab-content
.tab-content
.milestone-content
.tab-pane.active
#tab-issues
.gray-content-block.middle-block
.pull-right
=
link_to
'Browse Issues'
,
issues_dashboard_path
(
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All issues in this milestone
.row.prepend-top-default
.col-md-6
=
render
'issues'
,
title:
"Open"
,
issues:
@milestone
.
opened_issues
.col-md-6
=
render
'issues'
,
title:
"Closed"
,
issues:
@milestone
.
closed_issues
=
render
'shared/milestones/issues_tab'
,
unassigned:
@milestone
.
opened_issues
.
unassigned
,
assigned:
@milestone
.
opened_issues
.
assigned
,
closed:
@milestone
.
closed_issues
.tab-pane
#tab-merge-requests
.gray-content-block.middle-block
.pull-right
=
link_to
'Browse Merge Requests'
,
merge_requests_dashboard_path
(
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All merge requests in this milestone
.row.prepend-top-default
.col-md-6
=
render
'merge_requests'
,
title:
"Open"
,
merge_requests:
@milestone
.
opened_merge_requests
.col-md-6
=
render
'merge_requests'
,
title:
"Closed"
,
merge_requests:
@milestone
.
closed_merge_requests
=
render
'shared/milestones/merge_requests_tab'
,
unassigned:
@milestone
.
opened_merge_requests
.
unassigned
,
assigned:
@milestone
.
opened_merge_requests
.
assigned
,
closed:
@milestone
.
merge_requests
.
closed
,
merged:
@milestone
.
merge_requests
.
merged
.tab-pane
#tab-participants
.gray-content-block.middle-block
.oneline
All participants to this milestone
%ul
.bordered-list
-
@milestone
.
participants
.
each
do
|
user
|
%li
=
link_to
user
,
title:
user
.
name
,
class:
"darken"
do
=
image_tag
avatar_icon
(
user
,
32
),
class:
"avatar s32"
%strong
=
truncate
(
user
.
name
,
lenght:
40
)
%br
%small
.cgray
=
user
.
username
=
render
'shared/milestones/participants_tab'
,
users:
@milestone
.
participants
.tab-pane
#tab-labels
=
render
'shared/milestones/labels_tab'
,
labels:
@milestone
.
labels
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