Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b6e5de2c
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
b6e5de2c
编写于
2月 23, 2016
作者:
R
Rubén Dávila
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use the same partial when rendering Issues or Merge Requests.
上级
7cc102a0
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
10 addition
and
59 deletion
+10
-59
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+3
-3
app/views/shared/milestones/_issue.html.haml
app/views/shared/milestones/_issue.html.haml
+0
-17
app/views/shared/milestones/_issues.html.haml
app/views/shared/milestones/_issues.html.haml
+0
-7
app/views/shared/milestones/_issues_tab.html.haml
app/views/shared/milestones/_issues_tab.html.haml
+3
-3
app/views/shared/milestones/_merge_request.html.haml
app/views/shared/milestones/_merge_request.html.haml
+0
-17
app/views/shared/milestones/_merge_requests.html.haml
app/views/shared/milestones/_merge_requests.html.haml
+0
-8
app/views/shared/milestones/_merge_requests_tab.haml
app/views/shared/milestones/_merge_requests_tab.haml
+4
-4
未找到文件。
app/assets/stylesheets/pages/milestone.scss
浏览文件 @
b6e5de2c
...
...
@@ -19,7 +19,7 @@ li.milestone {
width
:
105px
;
}
.issue-row
,
.m
r
-row
{
.issue-row
,
.m
erge_request
-row
{
.color-label
{
border-radius
:
2px
;
padding
:
3px
!
important
;
...
...
@@ -45,10 +45,10 @@ li.milestone {
}
.issues-sortable-list
,
.merge_requests-sortable-list
{
.issue-detail
,
.merge
-
request-detail
{
.issue-detail
,
.merge
_
request-detail
{
display
:
block
;
.issue-number
,
.merge
-
request-number
{
.issue-number
,
.merge
_
request-number
{
color
:
rgba
(
0
,
0
,
0
,
0
.44
);
margin-right
:
5px
;
}
...
...
app/views/shared/milestones/_issue.html.haml
已删除
100644 → 0
浏览文件 @
7cc102a0
-# @project is present when viewing Project's milestone
-
project
=
@project
||
issue
.
project
%li
{
id:
dom_id
(
issue
,
'sortable'
),
class:
'issue-row'
,
'data-iid'
=>
issue
.
iid
,
'data-url'
=>
issue_path
(
issue
)
}
%span
-
if
show_project_name
%strong
#{
project
.
name
}
·
-
elsif
show_full_project_name
%strong
#{
project
.
name_with_namespace
}
·
=
link_to_gfm
issue
.
title
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
issue
],
title:
issue
.
title
.issue-detail
=
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
issue
]
do
%span
.issue-number
##{issue.iid}
-
issue
.
labels
.
each
do
|
label
|
=
render_colored_label
(
label
)
-
if
issue
.
assignee
=
image_tag
avatar_icon
(
issue
.
assignee
,
16
),
class:
"avatar s24"
,
alt:
''
app/views/shared/milestones/_issues.html.haml
已删除
100644 → 0
浏览文件 @
7cc102a0
.panel.panel-default
.panel-heading
=
title
.pull-right
=
issues
.
size
%ul
{
class:
"well-list issues-sortable-list"
,
id:
"issues-list-#{id}"
,
"data-state"
=>
id
}
-
issues
.
sort_by
(
&
:position
).
each
do
|
issue
|
=
render
'shared/milestones/issue'
,
issue:
issue
,
show_project_name:
show_project_name
,
show_full_project_name:
show_full_project_name
app/views/shared/milestones/_issues_tab.html.haml
浏览文件 @
b6e5de2c
...
...
@@ -3,8 +3,8 @@
.row.prepend-top-default
.col-md-4
=
render
'shared/milestones/
issues'
,
args
.
merge
({
title:
'Unstarted Issues (open and unassigned)'
,
issues:
unassigned
,
id:
'unassigned'
})
=
render
'shared/milestones/
records'
,
args
.
merge
({
title:
'Unstarted Issues (open and unassigned)'
,
records:
unassigned
,
id:
'unassigned'
,
show_counter:
true
})
.col-md-4
=
render
'shared/milestones/
issues'
,
args
.
merge
({
title:
'Ongoing Issues (open and assigned)'
,
issues:
assigned
,
id:
'ongoing'
})
=
render
'shared/milestones/
records'
,
args
.
merge
({
title:
'Ongoing Issues (open and assigned)'
,
records:
assigned
,
id:
'ongoing'
,
show_counter:
true
})
.col-md-4
=
render
'shared/milestones/
issues'
,
args
.
merge
({
title:
'Completed Issues (closed)'
,
issues:
closed
,
id:
'closed'
})
=
render
'shared/milestones/
records'
,
args
.
merge
({
title:
'Completed Issues (closed)'
,
records:
closed
,
id:
'closed'
,
show_counter:
true
})
app/views/shared/milestones/_merge_request.html.haml
已删除
100644 → 0
浏览文件 @
7cc102a0
-# @project is present when viewing Project's milestone
-
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
)
}
%span
-
if
show_project_name
%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
.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
=
image_tag
avatar_icon
(
merge_request
.
assignee
,
16
),
class:
"avatar s16"
,
alt:
''
app/views/shared/milestones/_merge_requests.html.haml
已删除
100644 → 0
浏览文件 @
7cc102a0
-
primary
=
local_assigns
.
fetch
(
:primary
,
false
)
-
panel_class
=
primary
?
'panel-primary'
:
'panel-default'
.panel
{
class:
panel_class
}
.panel-heading
=
title
%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
|
=
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
浏览文件 @
b6e5de2c
...
...
@@ -3,10 +3,10 @@
.row.prepend-top-default
.col-md-3
=
render
'shared/milestones/
merge_requests'
,
args
.
merge
({
title:
'Work in progress (open and unassigned)'
,
merge_request
s:
unassigned
,
id:
'unassigned'
})
=
render
'shared/milestones/
records'
,
args
.
merge
({
title:
'Work in progress (open and unassigned)'
,
record
s:
unassigned
,
id:
'unassigned'
})
.col-md-3
=
render
'shared/milestones/
merge_requests'
,
args
.
merge
({
title:
'Waiting for merge (open and assigned)'
,
merge_request
s:
assigned
,
id:
'ongoing'
})
=
render
'shared/milestones/
records'
,
args
.
merge
({
title:
'Waiting for merge (open and assigned)'
,
record
s:
assigned
,
id:
'ongoing'
})
.col-md-3
=
render
'shared/milestones/
merge_requests'
,
args
.
merge
({
title:
'Rejected (closed)'
,
merge_request
s:
closed
,
id:
'closed'
})
=
render
'shared/milestones/
records'
,
args
.
merge
({
title:
'Rejected (closed)'
,
record
s:
closed
,
id:
'closed'
})
.col-md-3
=
render
'shared/milestones/
merge_requests'
,
args
.
merge
({
title:
'Merged'
,
merge_request
s:
merged
,
id:
'merged'
,
primary:
true
})
=
render
'shared/milestones/
records'
,
args
.
merge
({
title:
'Merged'
,
record
s:
merged
,
id:
'merged'
,
primary:
true
})
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录