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
Boxiang Sun
gitlab-ce
Commits
7cc102a0
Commit
7cc102a0
authored
Feb 23, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Merge Requests tab have the same look as Issues.
parent
e0a18829
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
50 deletions
+26
-50
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+4
-4
app/views/groups/milestones/_issue.html.haml
app/views/groups/milestones/_issue.html.haml
+0
-10
app/views/groups/milestones/_issues.html.haml
app/views/groups/milestones/_issues.html.haml
+0
-6
app/views/groups/milestones/_merge_request.html.haml
app/views/groups/milestones/_merge_request.html.haml
+0
-10
app/views/groups/milestones/_merge_requests.html.haml
app/views/groups/milestones/_merge_requests.html.haml
+0
-6
app/views/shared/milestones/_merge_request.html.haml
app/views/shared/milestones/_merge_request.html.haml
+10
-4
app/views/shared/milestones/_merge_requests.html.haml
app/views/shared/milestones/_merge_requests.html.haml
+5
-2
app/views/shared/milestones/_merge_requests_tab.haml
app/views/shared/milestones/_merge_requests_tab.haml
+7
-8
No files found.
app/assets/stylesheets/pages/milestone.scss
View file @
7cc102a0
...
@@ -19,7 +19,7 @@ li.milestone {
...
@@ -19,7 +19,7 @@ li.milestone {
width
:
105px
;
width
:
105px
;
}
}
.issue-row
{
.issue-row
,
.mr-row
{
.color-label
{
.color-label
{
border-radius
:
2px
;
border-radius
:
2px
;
padding
:
3px
!
important
;
padding
:
3px
!
important
;
...
@@ -44,11 +44,11 @@ li.milestone {
...
@@ -44,11 +44,11 @@ li.milestone {
}
}
}
}
.issues-sortable-list
{
.issues-sortable-list
,
.merge_requests-sortable-list
{
.issue-detail
{
.issue-detail
,
.merge-request-detail
{
display
:
block
;
display
:
block
;
.issue-number
{
.issue-number
,
.merge-request-number
{
color
:
rgba
(
0
,
0
,
0
,
0
.44
);
color
:
rgba
(
0
,
0
,
0
,
0
.44
);
margin-right
:
5px
;
margin-right
:
5px
;
}
}
...
...
app/views/groups/milestones/_issue.html.haml
deleted
100644 → 0
View file @
e0a18829
%li
{
id:
dom_id
(
issue
,
'sortable'
),
class:
'issue-row'
,
'data-iid'
=>
issue
.
iid
}
%span
.milestone-row
-
project
=
issue
.
project
%strong
#{
project
.
name
}
·
=
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"
,
alt:
''
app/views/groups/milestones/_issues.html.haml
deleted
100644 → 0
View file @
e0a18829
.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/groups/milestones/_merge_request.html.haml
deleted
100644 → 0
View file @
e0a18829
%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
}
·
=
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"
,
alt:
''
app/views/groups/milestones/_merge_requests.html.haml
deleted
100644 → 0
View file @
e0a18829
.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/shared/milestones/_merge_request.html.haml
View file @
7cc102a0
...
@@ -2,10 +2,16 @@
...
@@ -2,10 +2,16 @@
-
project
=
@project
||
merge_request
.
project
-
project
=
@project
||
merge_request
.
project
%li
{
id:
dom_id
(
merge_request
,
'sortable'
),
class:
'mr-row'
,
'data-iid'
=>
merge_request
.
iid
,
'data-url'
=>
merge_request_path
(
merge_request
)
}
%li
{
id:
dom_id
(
merge_request
,
'sortable'
),
class:
'mr-row'
,
'data-iid'
=>
merge_request
.
iid
,
'data-url'
=>
merge_request_path
(
merge_request
)
}
%span
.str-truncated
%span
=
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
merge_request
]
do
-
if
show_project_name
%span
.cgray
##{merge_request.iid}
%strong
#{
project
.
name
}
·
-
elsif
show_full_project_name
%strong
#{
project
.
name_with_namespace
}
·
=
link_to_gfm
merge_request
.
title
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
merge_request
],
title:
merge_request
.
title
=
link_to_gfm
merge_request
.
title
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
merge_request
],
title:
merge_request
.
title
.pull-right.assignee-icon
.merge-request-detail
=
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
merge_request
]
do
%span
.merge-request-number
##{merge_request.iid}
-
merge_request
.
labels
.
each
do
|
label
|
=
render_colored_label
(
label
)
-
if
merge_request
.
assignee
-
if
merge_request
.
assignee
=
image_tag
avatar_icon
(
merge_request
.
assignee
,
16
),
class:
"avatar s16"
,
alt:
''
=
image_tag
avatar_icon
(
merge_request
.
assignee
,
16
),
class:
"avatar s16"
,
alt:
''
app/views/shared/milestones/_merge_requests.html.haml
View file @
7cc102a0
.panel.panel-default
-
primary
=
local_assigns
.
fetch
(
:primary
,
false
)
-
panel_class
=
primary
?
'panel-primary'
:
'panel-default'
.panel
{
class:
panel_class
}
.panel-heading
=
title
.panel-heading
=
title
%ul
{
class:
"well-list merge_requests-sortable-list"
,
id:
"merge_requests-list-#{id}"
,
"data-state"
=>
id
}
%ul
{
class:
"well-list merge_requests-sortable-list"
,
id:
"merge_requests-list-#{id}"
,
"data-state"
=>
id
}
-
merge_requests
.
sort_by
(
&
:position
).
each
do
|
merge_request
|
-
merge_requests
.
sort_by
(
&
:position
).
each
do
|
merge_request
|
=
render
'shared/milestones/merge_request'
,
merge_request:
merge_request
=
render
'shared/milestones/merge_request'
,
merge_request:
merge_request
,
show_project_name:
show_project_name
,
show_full_project_name:
show_full_project_name
app/views/shared/milestones/_merge_requests_tab.haml
View file @
7cc102a0
-
args
=
{
show_project_name:
local_assigns
.
fetch
(
:show_project_name
,
false
),
show_full_project_name:
local_assigns
.
fetch
(
:show_full_project_name
,
false
)
}
.row.prepend-top-default
.row.prepend-top-default
.col-md-3
.col-md-3
=
render
(
'shared/milestones/merge_requests'
,
title:
'Work in progress (open and unassigned)'
,
merge_requests:
unassigned
,
id:
'unassigned'
)
=
render
'shared/milestones/merge_requests'
,
args
.
merge
({
title:
'Work in progress (open and unassigned)'
,
merge_requests:
unassigned
,
id:
'unassigned'
}
)
.col-md-3
.col-md-3
=
render
(
'shared/milestones/merge_requests'
,
title:
'Waiting for merge (open and assigned)'
,
merge_requests:
assigned
,
id:
'ongoing'
)
=
render
'shared/milestones/merge_requests'
,
args
.
merge
({
title:
'Waiting for merge (open and assigned)'
,
merge_requests:
assigned
,
id:
'ongoing'
}
)
.col-md-3
.col-md-3
=
render
(
'shared/milestones/merge_requests'
,
title:
'Rejected (closed)'
,
merge_requests:
closed
,
id:
'closed'
)
=
render
'shared/milestones/merge_requests'
,
args
.
merge
({
title:
'Rejected (closed)'
,
merge_requests:
closed
,
id:
'closed'
}
)
.col-md-3
.col-md-3
.panel.panel-primary
=
render
'shared/milestones/merge_requests'
,
args
.
merge
({
title:
'Merged'
,
merge_requests:
merged
,
id:
'merged'
,
primary:
true
})
.panel-heading
Merged
%ul
.well-list
-
merged
.
each
do
|
merge_request
|
=
render
'shared/milestones/merge_request'
,
merge_request:
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