Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c07180f3
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,发现更多精彩内容 >>
提交
c07180f3
编写于
11月 15, 2016
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix broken pipeline rendering [ci skip]
上级
0541bffa
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
12 addition
and
13 deletion
+12
-13
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+1
-1
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+6
-4
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+5
-8
未找到文件。
app/controllers/projects/pipelines_controller.rb
浏览文件 @
c07180f3
...
...
@@ -20,7 +20,7 @@ class Projects::PipelinesController < Projects::ApplicationController
pipelines:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
incremental
(
@pipelines
,
@last_updated
),
updated_at:
Time
.
now
,
updated_at:
Time
.
now
.
utc
,
count:
{
all:
@pipelines_count
,
running_or_pending:
@running_or_pending_count
...
...
app/models/ci/pipeline.rb
浏览文件 @
c07180f3
...
...
@@ -21,8 +21,6 @@ module Ci
after_create
:keep_around_commits
,
unless: :importing?
delegate
:stages
,
to: :statuses
state_machine
:status
,
initial: :created
do
event
:enqueue
do
transition
created: :pending
...
...
@@ -102,15 +100,19 @@ module Ci
where
.
not
(
duration:
nil
).
sum
(
:duration
)
end
def
stages
def
stages
_query
statuses
.
group
(
'stage'
).
select
(
:stage
)
.
order
(
'max(stage_idx)'
)
end
def
stages
self
.
stages_query
.
pluck
(
:stage
)
end
def
stages_with_statuses
status_sql
=
statuses
.
latest
.
where
(
'stage=sg.stage'
).
status_sql
stages_with_statuses
=
CommitStatus
.
from
(
self
.
stages
,
:sg
).
stages_with_statuses
=
CommitStatus
.
from
(
self
.
stages
_query
,
:sg
).
pluck
(
'sg.stage'
,
status_sql
)
stages_with_statuses
.
map
do
|
stage
|
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
浏览文件 @
c07180f3
...
...
@@ -41,16 +41,13 @@
-
else
Cant find HEAD commit for this branch
-
stages_status
=
pipeline
.
statuses
.
latest
.
stages_status
%td
.stage-cell
-
pipeline
.
statuses
.
latest
.
stages_status
.
each
do
|
stage
|
-
name
=
stage
.
first
-
status
=
stage
.
last
-
tooltip
=
"
#{
name
.
titleize
}
:
#{
status
||
'not found'
}
"
-
if
status
-
pipeline
.
stages_with_statuses
.
each
do
|
stage
|
-
if
stage
.
status
-
tooltip
=
"
#{
stage
.
name
.
titleize
}
:
#{
stage
.
status
||
'not found'
}
"
.stage-container
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
,
anchor:
stage
),
class:
"has-tooltip ci-status-icon-
#{
status
}
"
,
title:
tooltip
do
=
ci_icon_for_status
(
status
)
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
,
anchor:
stage
.
name
),
class:
"has-tooltip ci-status-icon-
#{
stage
.
status
}
"
,
title:
tooltip
do
=
ci_icon_for_status
(
sta
ge
.
sta
tus
)
%td
-
if
pipeline
.
duration
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录