Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6d80b94a
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,发现更多精彩内容 >>
提交
6d80b94a
编写于
12月 05, 2016
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix handling of skipped vs success status
上级
13cee6d7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
5 deletion
+5
-5
app/models/concerns/has_status.rb
app/models/concerns/has_status.rb
+3
-3
app/services/ci/process_pipeline_service.rb
app/services/ci/process_pipeline_service.rb
+2
-2
未找到文件。
app/models/concerns/has_status.rb
浏览文件 @
6d80b94a
...
@@ -4,7 +4,7 @@ module HasStatus
...
@@ -4,7 +4,7 @@ module HasStatus
AVAILABLE_STATUSES
=
%w[created pending running success failed canceled skipped]
AVAILABLE_STATUSES
=
%w[created pending running success failed canceled skipped]
STARTED_STATUSES
=
%w[running success failed skipped]
STARTED_STATUSES
=
%w[running success failed skipped]
ACTIVE_STATUSES
=
%w[pending running]
ACTIVE_STATUSES
=
%w[pending running]
COMPLETED_STATUSES
=
%w[success failed canceled]
COMPLETED_STATUSES
=
%w[success failed canceled
skipped
]
ORDERED_STATUSES
=
%w[failed pending running canceled success skipped]
ORDERED_STATUSES
=
%w[failed pending running canceled success skipped]
class_methods
do
class_methods
do
...
@@ -23,9 +23,9 @@ module HasStatus
...
@@ -23,9 +23,9 @@ module HasStatus
canceled
=
scope
.
canceled
.
select
(
'count(*)'
).
to_sql
canceled
=
scope
.
canceled
.
select
(
'count(*)'
).
to_sql
"(CASE
"(CASE
WHEN (
#{
builds
}
)=(
#{
s
uccess
}
) THEN 'success
'
WHEN (
#{
builds
}
)=(
#{
s
kipped
}
) THEN 'skipped
'
WHEN (
#{
builds
}
)=(
#{
created
}
) THEN 'created'
WHEN (
#{
builds
}
)=(
#{
created
}
) THEN 'created'
WHEN (
#{
builds
}
)=(
#{
success
}
)+(
#{
skipped
}
) THEN 's
kipped
'
WHEN (
#{
builds
}
)=(
#{
success
}
)+(
#{
skipped
}
) THEN 's
uccess
'
WHEN (
#{
builds
}
)=(
#{
success
}
)+(
#{
skipped
}
)+(
#{
canceled
}
) THEN 'canceled'
WHEN (
#{
builds
}
)=(
#{
success
}
)+(
#{
skipped
}
)+(
#{
canceled
}
) THEN 'canceled'
WHEN (
#{
builds
}
)=(
#{
created
}
)+(
#{
skipped
}
)+(
#{
pending
}
) THEN 'pending'
WHEN (
#{
builds
}
)=(
#{
created
}
)+(
#{
skipped
}
)+(
#{
pending
}
) THEN 'pending'
WHEN (
#{
running
}
)+(
#{
pending
}
)+(
#{
created
}
)>0 THEN 'running'
WHEN (
#{
running
}
)+(
#{
pending
}
)+(
#{
created
}
)>0 THEN 'running'
...
...
app/services/ci/process_pipeline_service.rb
浏览文件 @
6d80b94a
...
@@ -44,11 +44,11 @@ module Ci
...
@@ -44,11 +44,11 @@ module Ci
def
valid_statuses_for_when
(
value
)
def
valid_statuses_for_when
(
value
)
case
value
case
value
when
'on_success'
when
'on_success'
%w[success]
%w[success
skipped
]
when
'on_failure'
when
'on_failure'
%w[failed]
%w[failed]
when
'always'
when
'always'
%w[success failed]
%w[success failed
skipped
]
else
else
[]
[]
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录