Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d50fe9e4
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,发现更多精彩内容 >>
未验证
提交
d50fe9e4
编写于
3月 11, 2019
作者:
P
Paul Slaughter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update merge status timeout to 0
- Also stop polling if we get a bad response from the server.
上级
8c4d6ea2
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
31 addition
and
4 deletion
+31
-4
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+7
-3
changelogs/unreleased/56970-fix-mr-stuck-loading-on-error.yml
...gelogs/unreleased/56970-fix-mr-stuck-loading-on-error.yml
+5
-0
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
...widget/components/states/mr_widget_ready_to_merge_spec.js
+19
-1
未找到文件。
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
浏览文件 @
d50fe9e4
...
...
@@ -159,9 +159,12 @@ export default {
});
},
initiateMergePolling
()
{
simplePoll
((
continuePolling
,
stopPolling
)
=>
{
simplePoll
(
(
continuePolling
,
stopPolling
)
=>
{
this
.
handleMergePolling
(
continuePolling
,
stopPolling
);
});
},
{
timeout
:
0
},
);
},
handleMergePolling
(
continuePolling
,
stopPolling
)
{
this
.
service
...
...
@@ -192,6 +195,7 @@ export default {
})
.
catch
(()
=>
{
new
Flash
(
__
(
'
Something went wrong while merging this merge request. Please try again.
'
));
// eslint-disable-line
stopPolling
();
});
},
initiateRemoveSourceBranchPolling
()
{
...
...
changelogs/unreleased/56970-fix-mr-stuck-loading-on-error.yml
0 → 100644
浏览文件 @
d50fe9e4
---
title
:
Disable timeout on merge request merging poll
merge_request
:
25988
author
:
type
:
fixed
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
浏览文件 @
d50fe9e4
...
...
@@ -376,11 +376,29 @@ describe('ReadyToMerge', () => {
});
describe
(
'
initiateMergePolling
'
,
()
=>
{
beforeEach
(()
=>
{
jasmine
.
clock
().
install
();
});
afterEach
(()
=>
{
jasmine
.
clock
().
uninstall
();
});
it
(
'
should call simplePoll
'
,
()
=>
{
const
simplePoll
=
spyOnDependency
(
ReadyToMerge
,
'
simplePoll
'
);
vm
.
initiateMergePolling
();
expect
(
simplePoll
).
toHaveBeenCalled
();
expect
(
simplePoll
).
toHaveBeenCalledWith
(
jasmine
.
any
(
Function
),
{
timeout
:
0
});
});
it
(
'
should call handleMergePolling
'
,
()
=>
{
spyOn
(
vm
,
'
handleMergePolling
'
);
vm
.
initiateMergePolling
();
jasmine
.
clock
().
tick
(
2000
);
expect
(
vm
.
handleMergePolling
).
toHaveBeenCalled
();
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录