Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ffd50e8c
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,发现更多精彩内容 >>
未验证
提交
ffd50e8c
编写于
6月 05, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add merged mrs list to milestone page
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
7e41eca3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
5 deletion
+12
-5
app/models/merge_request.rb
app/models/merge_request.rb
+1
-0
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+11
-5
未找到文件。
app/models/merge_request.rb
浏览文件 @
ffd50e8c
...
...
@@ -113,6 +113,7 @@ class MergeRequest < ActiveRecord::Base
# Closed scope for merge request should return
# both merged and closed mr's
scope
:closed
,
->
{
with_states
(
:closed
,
:merged
)
}
scope
:declined
,
->
{
with_states
(
:closed
)
}
def
validate_branches
if
target_project
==
source_project
&&
target_branch
==
source_branch
...
...
app/views/projects/milestones/show.html.haml
浏览文件 @
ffd50e8c
...
...
@@ -84,12 +84,18 @@
.tab-pane
#tab-merge-requests
.row
.col-md-
4
.col-md-
3
=
render
(
'merge_requests'
,
title:
'Work in progress (open and unassigned)'
,
merge_requests:
@merge_requests
.
opened
.
unassigned
,
id:
'unassigned'
)
.col-md-4
=
render
(
'merge_requests'
,
title:
'Assigned (open and assigned)'
,
merge_requests:
@merge_requests
.
opened
.
assigned
,
id:
'ongoing'
)
.col-md-4
=
render
(
'merge_requests'
,
title:
'Declined (closed)'
,
merge_requests:
@merge_requests
.
closed
,
id:
'closed'
)
.col-md-3
=
render
(
'merge_requests'
,
title:
'Waiting for merge (open and assigned)'
,
merge_requests:
@merge_requests
.
opened
.
assigned
,
id:
'ongoing'
)
.col-md-3
=
render
(
'merge_requests'
,
title:
'Declined (closed)'
,
merge_requests:
@merge_requests
.
declined
,
id:
'closed'
)
.col-md-3
.panel.panel-primary
.panel-heading
Merged
%ul
.well-list
-
@merge_requests
.
merged
.
each
do
|
merge_request
|
=
render
'merge_request'
,
merge_request:
merge_request
.tab-pane
#tab-participants
%ul
.bordered-list
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录