Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1b313e8d
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,发现更多精彩内容 >>
提交
1b313e8d
编写于
12月 15, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make CI/CD detailed status group concept explicit
上级
b1120fc3
变更
15
显示空白变更内容
内联
并排
Showing
15 changed file
with
64 addition
and
10 deletion
+64
-10
app/views/ci/status/_badge.html.haml
app/views/ci/status/_badge.html.haml
+3
-2
lib/gitlab/ci/status/build/play.rb
lib/gitlab/ci/status/build/play.rb
+4
-0
lib/gitlab/ci/status/build/stop.rb
lib/gitlab/ci/status/build/stop.rb
+4
-0
lib/gitlab/ci/status/core.rb
lib/gitlab/ci/status/core.rb
+1
-8
spec/lib/gitlab/ci/status/build/cancelable_spec.rb
spec/lib/gitlab/ci/status/build/cancelable_spec.rb
+8
-0
spec/lib/gitlab/ci/status/build/play_spec.rb
spec/lib/gitlab/ci/status/build/play_spec.rb
+4
-0
spec/lib/gitlab/ci/status/build/retryable_spec.rb
spec/lib/gitlab/ci/status/build/retryable_spec.rb
+8
-0
spec/lib/gitlab/ci/status/build/stop_spec.rb
spec/lib/gitlab/ci/status/build/stop_spec.rb
+4
-0
spec/lib/gitlab/ci/status/canceled_spec.rb
spec/lib/gitlab/ci/status/canceled_spec.rb
+4
-0
spec/lib/gitlab/ci/status/created_spec.rb
spec/lib/gitlab/ci/status/created_spec.rb
+4
-0
spec/lib/gitlab/ci/status/failed_spec.rb
spec/lib/gitlab/ci/status/failed_spec.rb
+4
-0
spec/lib/gitlab/ci/status/pending_spec.rb
spec/lib/gitlab/ci/status/pending_spec.rb
+4
-0
spec/lib/gitlab/ci/status/running_spec.rb
spec/lib/gitlab/ci/status/running_spec.rb
+4
-0
spec/lib/gitlab/ci/status/skipped_spec.rb
spec/lib/gitlab/ci/status/skipped_spec.rb
+4
-0
spec/lib/gitlab/ci/status/success_spec.rb
spec/lib/gitlab/ci/status/success_spec.rb
+4
-0
未找到文件。
app/views/ci/status/_badge.html.haml
浏览文件 @
1b313e8d
-
status
=
local_assigns
.
fetch
(
:status
)
-
status
=
local_assigns
.
fetch
(
:status
)
-
css_classes
=
"ci-status ci-
#{
status
.
group
}
"
-
if
status
.
has_details?
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
class:
"ci-status ci-
#{
status
}
"
do
=
link_to
status
.
details_path
,
class:
css_classes
do
=
custom_icon
(
status
.
icon
)
=
custom_icon
(
status
.
icon
)
=
status
.
text
=
status
.
text
-
else
-
else
%span
{
class:
"ci-status ci-#{status}"
}
%span
{
class:
css_classes
}
=
custom_icon
(
status
.
icon
)
=
custom_icon
(
status
.
icon
)
=
status
.
text
=
status
.
text
lib/gitlab/ci/status/build/play.rb
浏览文件 @
1b313e8d
...
@@ -17,6 +17,10 @@ module Gitlab
...
@@ -17,6 +17,10 @@ module Gitlab
'icon_status_manual'
'icon_status_manual'
end
end
def
group
'manual'
end
def
has_action?
def
has_action?
can?
(
user
,
:update_build
,
subject
)
can?
(
user
,
:update_build
,
subject
)
end
end
...
...
lib/gitlab/ci/status/build/stop.rb
浏览文件 @
1b313e8d
...
@@ -17,6 +17,10 @@ module Gitlab
...
@@ -17,6 +17,10 @@ module Gitlab
'icon_status_manual'
'icon_status_manual'
end
end
def
group
'manual'
end
def
has_action?
def
has_action?
can?
(
user
,
:update_build
,
subject
)
can?
(
user
,
:update_build
,
subject
)
end
end
...
...
lib/gitlab/ci/status/core.rb
浏览文件 @
1b313e8d
...
@@ -22,14 +22,7 @@ module Gitlab
...
@@ -22,14 +22,7 @@ module Gitlab
raise
NotImplementedError
raise
NotImplementedError
end
end
# Deprecation warning: this method is here because we need to maintain
def
group
# backwards compatibility with legacy statuses. We often do something
# like "ci-status ci-status-#{status}" to set CSS class.
#
# `to_s` method should be renamed to `group` at some point, after
# phasing legacy satuses out.
#
def
to_s
self
.
class
.
name
.
demodulize
.
downcase
.
underscore
self
.
class
.
name
.
demodulize
.
downcase
.
underscore
end
end
...
...
spec/lib/gitlab/ci/status/build/cancelable_spec.rb
浏览文件 @
1b313e8d
...
@@ -32,6 +32,14 @@ describe Gitlab::Ci::Status::Build::Cancelable do
...
@@ -32,6 +32,14 @@ describe Gitlab::Ci::Status::Build::Cancelable do
end
end
end
end
describe
'#group'
do
it
'does not override status group'
do
expect
(
status
).
to
receive
(
:group
)
subject
.
group
end
end
describe
'action details'
do
describe
'action details'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
...
...
spec/lib/gitlab/ci/status/build/play_spec.rb
浏览文件 @
1b313e8d
...
@@ -18,6 +18,10 @@ describe Gitlab::Ci::Status::Build::Play do
...
@@ -18,6 +18,10 @@ describe Gitlab::Ci::Status::Build::Play do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_manual'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_manual'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'manual'
}
end
describe
'action details'
do
describe
'action details'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
...
...
spec/lib/gitlab/ci/status/build/retryable_spec.rb
浏览文件 @
1b313e8d
...
@@ -32,6 +32,14 @@ describe Gitlab::Ci::Status::Build::Retryable do
...
@@ -32,6 +32,14 @@ describe Gitlab::Ci::Status::Build::Retryable do
end
end
end
end
describe
'#group'
do
it
'does not override status group'
do
expect
(
status
).
to
receive
(
:group
)
subject
.
group
end
end
describe
'action details'
do
describe
'action details'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
...
...
spec/lib/gitlab/ci/status/build/stop_spec.rb
浏览文件 @
1b313e8d
...
@@ -20,6 +20,10 @@ describe Gitlab::Ci::Status::Build::Stop do
...
@@ -20,6 +20,10 @@ describe Gitlab::Ci::Status::Build::Stop do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_manual'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_manual'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'manual'
}
end
describe
'action details'
do
describe
'action details'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
...
...
spec/lib/gitlab/ci/status/canceled_spec.rb
浏览文件 @
1b313e8d
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Canceled do
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Canceled do
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_canceled'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_canceled'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'canceled'
}
end
end
end
spec/lib/gitlab/ci/status/created_spec.rb
浏览文件 @
1b313e8d
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Created do
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Created do
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_created'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_created'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'created'
}
end
end
end
spec/lib/gitlab/ci/status/failed_spec.rb
浏览文件 @
1b313e8d
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Failed do
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Failed do
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_failed'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_failed'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'failed'
}
end
end
end
spec/lib/gitlab/ci/status/pending_spec.rb
浏览文件 @
1b313e8d
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Pending do
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Pending do
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_pending'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_pending'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'pending'
}
end
end
end
spec/lib/gitlab/ci/status/running_spec.rb
浏览文件 @
1b313e8d
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Running do
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Running do
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_running'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_running'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'running'
}
end
end
end
spec/lib/gitlab/ci/status/skipped_spec.rb
浏览文件 @
1b313e8d
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Skipped do
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Skipped do
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_skipped'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_skipped'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'skipped'
}
end
end
end
spec/lib/gitlab/ci/status/success_spec.rb
浏览文件 @
1b313e8d
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Success do
...
@@ -16,4 +16,8 @@ describe Gitlab::Ci::Status::Success do
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_success'
}
it
{
expect
(
subject
.
icon
).
to
eq
'icon_status_success'
}
end
end
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'success'
}
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录