Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
28a4e9d8
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 搜索 >>
提交
28a4e9d8
编写于
4月 06, 2017
作者:
K
Kushal Pandya
提交者:
Jacob Schatz
4月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Show CI status as Favicon on Pipelines, Job and MR pages
上级
32db15b2
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
109 addition
and
3 deletion
+109
-3
app/assets/images/ci_favicons/icon_status_canceled.ico
app/assets/images/ci_favicons/icon_status_canceled.ico
+0
-0
app/assets/images/ci_favicons/icon_status_created.ico
app/assets/images/ci_favicons/icon_status_created.ico
+0
-0
app/assets/images/ci_favicons/icon_status_failed.ico
app/assets/images/ci_favicons/icon_status_failed.ico
+0
-0
app/assets/images/ci_favicons/icon_status_manual.ico
app/assets/images/ci_favicons/icon_status_manual.ico
+0
-0
app/assets/images/ci_favicons/icon_status_not_found.ico
app/assets/images/ci_favicons/icon_status_not_found.ico
+0
-0
app/assets/images/ci_favicons/icon_status_pending.ico
app/assets/images/ci_favicons/icon_status_pending.ico
+0
-0
app/assets/images/ci_favicons/icon_status_running.ico
app/assets/images/ci_favicons/icon_status_running.ico
+0
-0
app/assets/images/ci_favicons/icon_status_skipped.ico
app/assets/images/ci_favicons/icon_status_skipped.ico
+0
-0
app/assets/images/ci_favicons/icon_status_success.ico
app/assets/images/ci_favicons/icon_status_success.ico
+0
-0
app/assets/images/ci_favicons/icon_status_warning.ico
app/assets/images/ci_favicons/icon_status_warning.ico
+0
-0
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+1
-0
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+2
-0
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+31
-0
app/assets/javascripts/merge_request_widget.js
app/assets/javascripts/merge_request_widget.js
+5
-2
app/assets/javascripts/pipelines.js
app/assets/javascripts/pipelines.js
+4
-0
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+1
-1
app/views/projects/merge_requests/widget/_show.html.haml
app/views/projects/merge_requests/widget/_show.html.haml
+1
-0
changelogs/unreleased/12818-ci-status-as-favicon.yml
changelogs/unreleased/12818-ci-status-as-favicon.yml
+4
-0
spec/javascripts/build_spec.js
spec/javascripts/build_spec.js
+2
-0
spec/javascripts/lib/utils/common_utils_spec.js
spec/javascripts/lib/utils/common_utils_spec.js
+51
-0
spec/javascripts/merge_request_widget_spec.js
spec/javascripts/merge_request_widget_spec.js
+7
-0
未找到文件。
app/assets/images/ci_favicons/icon_status_canceled.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_created.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_failed.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_manual.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_not_found.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_pending.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_running.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_skipped.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_success.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/images/ci_favicons/icon_status_warning.ico
0 → 100755
浏览文件 @
28a4e9d8
5.3 KB
app/assets/javascripts/build.js
浏览文件 @
28a4e9d8
...
...
@@ -88,6 +88,7 @@ window.Build = (function() {
dataType
:
'
json
'
,
success
:
function
(
buildData
)
{
$
(
'
.js-build-output
'
).
html
(
buildData
.
trace_html
);
gl
.
utils
.
setCiStatusFavicon
(
`
${
this
.
pageUrl
}
/status.json`
);
if
(
window
.
location
.
hash
===
DOWN_BUILD_TRACE
)
{
$
(
"
html,body
"
).
scrollTop
(
this
.
$buildTrace
.
height
());
}
...
...
app/assets/javascripts/dispatcher.js
浏览文件 @
28a4e9d8
...
...
@@ -226,9 +226,11 @@ const ShortcutsBlob = require('./shortcuts_blob');
case
'
projects:pipelines:builds
'
:
case
'
projects:pipelines:show
'
:
const
{
controllerAction
}
=
document
.
querySelector
(
'
.js-pipeline-container
'
).
dataset
;
const
pipelineStatusUrl
=
`
${
document
.
querySelector
(
'
.js-pipeline-tab-link a
'
).
getAttribute
(
'
href
'
)}
/status.json`
;
new
gl
.
Pipelines
({
initTabs
:
true
,
pipelineStatusUrl
,
tabsOptions
:
{
action
:
controllerAction
,
defaultAction
:
'
pipelines
'
,
...
...
app/assets/javascripts/lib/utils/common_utils.js
浏览文件 @
28a4e9d8
...
...
@@ -2,6 +2,8 @@
(
function
()
{
(
function
(
w
)
{
var
base
;
const
faviconEl
=
document
.
getElementById
(
'
favicon
'
);
const
originalFavicon
=
faviconEl
?
faviconEl
.
getAttribute
(
'
href
'
)
:
null
;
w
.
gl
||
(
w
.
gl
=
{});
(
base
=
w
.
gl
).
utils
||
(
base
.
utils
=
{});
w
.
gl
.
utils
.
isInGroupsPage
=
function
()
{
...
...
@@ -361,5 +363,34 @@
fn
(
next
,
stop
);
});
};
w
.
gl
.
utils
.
setFavicon
=
(
iconName
)
=>
{
if
(
faviconEl
&&
iconName
)
{
faviconEl
.
setAttribute
(
'
href
'
,
`/assets/
${
iconName
}
.ico`
);
}
};
w
.
gl
.
utils
.
resetFavicon
=
()
=>
{
if
(
faviconEl
)
{
faviconEl
.
setAttribute
(
'
href
'
,
originalFavicon
);
}
};
w
.
gl
.
utils
.
setCiStatusFavicon
=
(
pageUrl
)
=>
{
$
.
ajax
({
url
:
pageUrl
,
dataType
:
'
json
'
,
success
:
function
(
data
)
{
if
(
data
&&
data
.
icon
)
{
gl
.
utils
.
setFavicon
(
`ci_favicons/
${
data
.
icon
}
`
);
}
else
{
gl
.
utils
.
resetFavicon
();
}
},
error
:
function
()
{
gl
.
utils
.
resetFavicon
();
}
});
};
})(
window
);
}).
call
(
window
);
app/assets/javascripts/merge_request_widget.js
浏览文件 @
28a4e9d8
...
...
@@ -38,11 +38,13 @@ import MiniPipelineGraph from './mini_pipeline_graph_dropdown';
function
MergeRequestWidget
(
opts
)
{
// Initialize MergeRequestWidget behavior
//
// check_enable
- Boolean, whether to check automerge status
// merge_check_url - String, URL to use to check automerge status
// check_enable - Boolean, whether to check automerge status
// merge_check_url
- String, URL to use to check automerge status
// ci_status_url - String, URL to use to check CI status
// pipeline_status_url - String, URL to use to get CI status for Favicon
//
this
.
opts
=
opts
;
this
.
opts
.
pipeline_status_url
=
`
${
this
.
opts
.
pipeline_status_url
}
.json`
;
this
.
$widgetBody
=
$
(
'
.mr-widget-body
'
);
$
(
'
#modal_merge_info
'
).
modal
({
show
:
false
...
...
@@ -159,6 +161,7 @@ import MiniPipelineGraph from './mini_pipeline_graph_dropdown';
_this
.
status
=
data
.
status
;
_this
.
hasCi
=
data
.
has_ci
;
_this
.
updateMergeButton
(
_this
.
status
,
_this
.
hasCi
);
gl
.
utils
.
setCiStatusFavicon
(
_this
.
opts
.
pipeline_status_url
);
if
(
data
.
environments
&&
data
.
environments
.
length
)
_this
.
renderEnvironments
(
data
.
environments
);
if
(
data
.
status
!==
_this
.
opts
.
ci_status
||
data
.
sha
!==
_this
.
opts
.
ci_sha
||
...
...
app/assets/javascripts/pipelines.js
浏览文件 @
28a4e9d8
...
...
@@ -9,6 +9,10 @@ require('./lib/utils/bootstrap_linked_tabs');
new
global
.
LinkedTabs
(
options
.
tabsOptions
);
}
if
(
options
.
pipelineStatusUrl
)
{
gl
.
utils
.
setCiStatusFavicon
(
options
.
pipelineStatusUrl
);
}
this
.
addMarginToBuildColumns
();
}
...
...
app/views/layouts/_head.html.haml
浏览文件 @
28a4e9d8
...
...
@@ -23,7 +23,7 @@
%title
=
page_title
(
site_name
)
%meta
{
name:
"description"
,
content:
page_description
}
=
favicon_link_tag
favicon
=
favicon_link_tag
favicon
,
id:
'favicon'
=
stylesheet_link_tag
"application"
,
media:
"all"
=
stylesheet_link_tag
"print"
,
media:
"print"
...
...
app/views/projects/merge_requests/widget/_show.html.haml
浏览文件 @
28a4e9d8
...
...
@@ -12,6 +12,7 @@
merge_check_url
:
"
#{
merge_check_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
}
"
,
check_enable
:
#{
@merge_request
.
unchecked?
?
"true"
:
"false"
}
,
ci_status_url
:
"
#{
ci_status_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
}
"
,
pipeline_status_url
:
"
#{
pipeline_status_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
}
"
,
ci_environments_status_url
:
"
#{
ci_environments_status_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
}
"
,
gitlab_icon
:
"
#{
asset_path
'gitlab_logo.png'
}
"
,
ci_status
:
"
#{
@merge_request
.
head_pipeline
?
@merge_request
.
head_pipeline
.
status
:
''
}
"
,
...
...
changelogs/unreleased/12818-ci-status-as-favicon.yml
0 → 100644
浏览文件 @
28a4e9d8
---
title
:
Show CI status as Favicon on Pipelines, Job and MR pages
merge_request
:
10144
author
:
spec/javascripts/build_spec.js
浏览文件 @
28a4e9d8
...
...
@@ -75,6 +75,7 @@ describe('Build', () => {
expect
(
url
).
toBe
(
`
${
BUILD_URL
}
.json`
);
expect
(
dataType
).
toBe
(
'
json
'
);
expect
(
success
).
toEqual
(
jasmine
.
any
(
Function
));
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
success
.
call
(
context
,
{
trace_html
:
'
<span>Example</span>
'
,
status
:
'
running
'
});
...
...
@@ -83,6 +84,7 @@ describe('Build', () => {
it
(
'
removes the spinner
'
,
()
=>
{
const
[{
success
,
context
}]
=
$
.
ajax
.
calls
.
argsFor
(
0
);
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
success
.
call
(
context
,
{
trace_html
:
'
<span>Example</span>
'
,
status
:
'
success
'
});
expect
(
$
(
'
.js-build-refresh
'
).
length
).
toBe
(
0
);
...
...
spec/javascripts/lib/utils/common_utils_spec.js
浏览文件 @
28a4e9d8
...
...
@@ -310,5 +310,56 @@ require('~/lib/utils/common_utils');
});
},
10000
);
});
describe
(
'
gl.utils.setFavicon
'
,
()
=>
{
it
(
'
should set page favicon to provided favicon
'
,
()
=>
{
const
faviconName
=
'
custom_favicon
'
;
const
fakeLink
=
{
setAttribute
()
{},
};
spyOn
(
window
.
document
,
'
getElementById
'
).
and
.
callFake
(()
=>
fakeLink
);
spyOn
(
fakeLink
,
'
setAttribute
'
).
and
.
callFake
((
attr
,
val
)
=>
{
expect
(
attr
).
toEqual
(
'
href
'
);
expect
(
val
.
indexOf
(
'
/assets/custom_favicon.ico
'
)
>
-
1
).
toBe
(
true
);
});
gl
.
utils
.
setFavicon
(
faviconName
);
});
});
describe
(
'
gl.utils.resetFavicon
'
,
()
=>
{
it
(
'
should reset page favicon to tanuki
'
,
()
=>
{
const
fakeLink
=
{
setAttribute
()
{},
};
spyOn
(
window
.
document
,
'
getElementById
'
).
and
.
callFake
(()
=>
fakeLink
);
spyOn
(
fakeLink
,
'
setAttribute
'
).
and
.
callFake
((
attr
,
val
)
=>
{
expect
(
attr
).
toEqual
(
'
href
'
);
expect
(
val
).
toMatch
(
/favicon/
);
});
gl
.
utils
.
resetFavicon
();
});
});
describe
(
'
gl.utils.setCiStatusFavicon
'
,
()
=>
{
it
(
'
should set page favicon to CI status favicon based on provided status
'
,
()
=>
{
const
BUILD_URL
=
`
${
gl
.
TEST_HOST
}
/frontend-fixtures/builds-project/builds/1/status.json`
;
const
FAVICON_PATH
=
'
ci_favicons/
'
;
const
FAVICON
=
'
icon_status_success
'
;
const
spySetFavicon
=
spyOn
(
gl
.
utils
,
'
setFavicon
'
).
and
.
stub
();
const
spyResetFavicon
=
spyOn
(
gl
.
utils
,
'
resetFavicon
'
).
and
.
stub
();
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
(
options
)
{
options
.
success
({
icon
:
FAVICON
});
expect
(
spySetFavicon
).
toHaveBeenCalledWith
(
FAVICON_PATH
+
FAVICON
);
options
.
success
();
expect
(
spyResetFavicon
).
toHaveBeenCalled
();
options
.
error
();
expect
(
spyResetFavicon
).
toHaveBeenCalled
();
});
gl
.
utils
.
setCiStatusFavicon
(
BUILD_URL
);
});
});
});
})();
spec/javascripts/merge_request_widget_spec.js
浏览文件 @
28a4e9d8
...
...
@@ -142,18 +142,21 @@ require('~/lib/utils/datetime_utility');
it
(
'
should call showCIStatus even if a notification should not be displayed
'
,
function
()
{
var
spy
;
spy
=
spyOn
(
this
[
"
class
"
],
'
showCIStatus
'
).
and
.
stub
();
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
this
[
"
class
"
].
getCIStatus
(
false
);
return
expect
(
spy
).
toHaveBeenCalledWith
(
this
.
ciStatusData
.
status
);
});
it
(
'
should call showCIStatus when a notification should be displayed
'
,
function
()
{
var
spy
;
spy
=
spyOn
(
this
[
"
class
"
],
'
showCIStatus
'
).
and
.
stub
();
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
this
[
"
class
"
].
getCIStatus
(
true
);
return
expect
(
spy
).
toHaveBeenCalledWith
(
this
.
ciStatusData
.
status
);
});
it
(
'
should call showCICoverage when the coverage rate is set
'
,
function
()
{
var
spy
;
spy
=
spyOn
(
this
[
"
class
"
],
'
showCICoverage
'
).
and
.
stub
();
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
this
[
"
class
"
].
getCIStatus
(
false
);
return
expect
(
spy
).
toHaveBeenCalledWith
(
this
.
ciStatusData
.
coverage
);
});
...
...
@@ -161,12 +164,14 @@ require('~/lib/utils/datetime_utility');
var
spy
;
this
.
ciStatusData
.
coverage
=
null
;
spy
=
spyOn
(
this
[
"
class
"
],
'
showCICoverage
'
).
and
.
stub
();
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
this
[
"
class
"
].
getCIStatus
(
false
);
return
expect
(
spy
).
not
.
toHaveBeenCalled
();
});
it
(
'
should not display a notification on the first check after the widget has been created
'
,
function
()
{
var
spy
;
spy
=
spyOn
(
window
,
'
notify
'
);
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
this
[
"
class
"
]
=
new
window
.
gl
.
MergeRequestWidget
(
this
.
opts
);
this
[
"
class
"
].
getCIStatus
(
true
);
return
expect
(
spy
).
not
.
toHaveBeenCalled
();
...
...
@@ -174,6 +179,7 @@ require('~/lib/utils/datetime_utility');
it
(
'
should update the pipeline URL when the pipeline changes
'
,
function
()
{
var
spy
;
spy
=
spyOn
(
this
[
"
class
"
],
'
updatePipelineUrls
'
).
and
.
stub
();
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
this
[
"
class
"
].
getCIStatus
(
false
);
this
.
ciStatusData
.
pipeline
+=
1
;
this
[
"
class
"
].
getCIStatus
(
false
);
...
...
@@ -182,6 +188,7 @@ require('~/lib/utils/datetime_utility');
it
(
'
should update the commit URL when the sha changes
'
,
function
()
{
var
spy
;
spy
=
spyOn
(
this
[
"
class
"
],
'
updateCommitUrls
'
).
and
.
stub
();
spyOn
(
gl
.
utils
,
'
setCiStatusFavicon
'
).
and
.
callFake
(()
=>
{});
this
[
"
class
"
].
getCIStatus
(
false
);
this
.
ciStatusData
.
sha
=
"
9b50b99a
"
;
this
[
"
class
"
].
getCIStatus
(
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录