Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0e9c2e72
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 搜索 >>
提交
0e9c2e72
编写于
5月 04, 2016
作者:
B
Benedikt Huss
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Feedback from stanhu
上级
655b2640
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
14 deletion
+26
-14
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+8
-11
spec/javascripts/merge_request_widget_spec.js.coffee
spec/javascripts/merge_request_widget_spec.js.coffee
+17
-3
未找到文件。
CHANGELOG
浏览文件 @
0e9c2e72
...
...
@@ -22,6 +22,7 @@ v 8.8.0 (unreleased)
- API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
- Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
- Expire repository exists? and has_visible_content? caches after a push if necessary
- Merge request widget displays TeamCity build state and code coverage correctly again.
v 8.7.3
- Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
...
...
app/assets/javascripts/merge_request_widget.js.coffee
浏览文件 @
0e9c2e72
...
...
@@ -68,20 +68,18 @@ class @MergeRequestWidget
$
.
getJSON
@
opts
.
ci_status_url
,
(
data
)
=>
@
readyForCICheck
=
true
if
@
firstCICheck
||
@
opts
.
ci_status
is
''
if
@
firstCICheck
@
firstCICheck
=
false
@
opts
.
ci_status
=
data
.
status
@
showCIStatus
data
.
status
if
data
.
coverage
@
showCICoverage
data
.
coverage
if
data
.
status
is
''
return
if
data
.
status
isnt
@
opts
.
ci_status
and
data
.
status
?
if
@
firstCiCheck
||
data
.
status
isnt
@
opts
.
ci_status
and
data
.
status
?
@
opts
.
ci_status
=
data
.
status
@
showCIStatus
data
.
status
if
data
.
coverage
@
showCICoverage
data
.
coverage
if
showNotification
# The first check should only update the UI, a notification
# should only be displayed on status changes
if
showNotification
and
not
@
firstCiCheck
status
=
@
ciLabelForStatus
(
data
.
status
)
if
status
is
"preparing"
...
...
@@ -104,8 +102,7 @@ class @MergeRequestWidget
@
close
()
Turbolinks
.
visit
_this
.
opts
.
builds_path
)
@
opts
.
ci_status
=
data
.
status
@
firstCiCheck
=
false
showCIStatus
:
(
state
)
->
$
(
'.ci_widget'
).
hide
()
...
...
spec/javascripts/merge_request_widget_spec.js.coffee
浏览文件 @
0e9c2e72
...
...
@@ -4,7 +4,21 @@ describe 'MergeRequestWidget', ->
beforeEach
->
window
.
notifyPermissions
=
()
->
@
opts
=
{
ci_status_url
:
"http://sampledomain.local/ci/getstatus"
,
ci_status
:
""
}
window
.
notify
=
()
->
@
opts
=
{
ci_status_url
:
"http://sampledomain.local/ci/getstatus"
,
ci_status
:
""
,
ci_message
:
{
normal
:
"Build {{status}} for
\"
{{title}}
\"
"
,
preparing
:
"{{status}} build for
\"
{{title}}
\"
"
},
ci_title
:
{
preparing
:
"{{status}} build"
,
normal
:
"Build {{status}}"
},
gitlab_icon
:
"gitlab_logo.png"
,
builds_path
:
"http://sampledomain.local/sampleBuildsPath"
}
@
class
=
new
MergeRequestWidget
(
@
opts
)
@
ciStatusData
=
{
"title"
:
"Sample MR title"
,
"sha"
:
"12a34bc5"
,
"status"
:
"success"
,
"coverage"
:
98
}
...
...
@@ -25,11 +39,11 @@ describe 'MergeRequestWidget', ->
it
'should call showCICoverage when the coverage rate is set'
,
->
spy
=
spyOn
(
@
class
,
'showCICoverage'
).
and
.
stub
()
@
class
.
getCIStatus
(
tru
e
)
@
class
.
getCIStatus
(
fals
e
)
expect
(
spy
).
toHaveBeenCalledWith
(
@
ciStatusData
.
coverage
)
it
'should not call showCICoverage when the coverage rate is not set'
,
->
@
ciStatusData
.
coverage
=
null
spy
=
spyOn
(
@
class
,
'showCICoverage'
).
and
.
stub
()
@
class
.
getCIStatus
(
tru
e
)
@
class
.
getCIStatus
(
fals
e
)
expect
(
spy
).
not
.
toHaveBeenCalled
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录