Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fe6ec80e
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 搜索 >>
未验证
提交
fe6ec80e
编写于
10月 23, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Render CI status on merge requests index page
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
61fcb3c5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
3 deletion
+14
-3
CHANGELOG
CHANGELOG
+1
-0
app/models/merge_request.rb
app/models/merge_request.rb
+8
-2
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+4
-0
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
fe6ec80e
...
...
@@ -11,6 +11,7 @@ v 8.2.0 (unreleased)
- Show "Empty Repository Page" for repository without branches (Artem V. Navrotskiy)
- Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork
- Use git follow flag for commits page when retrieve history for file or directory
- Show merge request CI status on merge requests index page
v 8.1.0
- Ensure MySQL CI limits DB migrations occur after the fields have been created (Stan Hu)
...
...
app/models/merge_request.rb
浏览文件 @
fe6ec80e
...
...
@@ -159,11 +159,11 @@ class MergeRequest < ActiveRecord::Base
def
last_commit
merge_request_diff
?
merge_request_diff
.
last_commit
:
compare_commits
.
last
end
end
def
first_commit
merge_request_diff
?
merge_request_diff
.
first_commit
:
compare_commits
.
first
end
end
def
last_commit_short_sha
last_commit
.
short_id
...
...
@@ -470,4 +470,10 @@ class MergeRequest < ActiveRecord::Base
unlock_mr
if
locked?
end
end
def
ci_commit
if
last_commit
source_project
.
ci_commit
(
last_commit
.
id
)
end
end
end
app/views/projects/merge_requests/_merge_request.html.haml
浏览文件 @
fe6ec80e
-
ci_commit
=
merge_request
.
ci_commit
%li
{
class:
mr_css_classes
(
merge_request
)
}
.merge-request-title
%span
.merge-request-title-text
...
...
@@ -6,6 +7,9 @@
-
merge_request
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
,
project:
merge_request
.
project
)
.pull-right.light
-
if
ci_commit
=
link_to
ci_status_path
(
ci_commit
),
class:
"c
#{
ci_status_color
(
ci_commit
)
}
"
do
=
ci_status_icon
(
ci_commit
)
-
if
merge_request
.
merged?
%span
%i
.fa.fa-check
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
浏览文件 @
fe6ec80e
-
ci_commit
=
@merge_request
.
source_project
.
ci_commit
(
@merge_request
.
source_sha
)
-
ci_commit
=
@merge_request
.
ci_commit
-
if
ci_commit
-
status
=
ci_commit
.
status
.mr-widget-heading
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录