Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7469b58e
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,发现更多精彩内容 >>
未验证
提交
7469b58e
编写于
6月 11, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix IDE pipelines eTagPoll not stopping
Closes #47678
上级
ba4dc01e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
10 deletion
+22
-10
app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
.../javascripts/ide/stores/modules/merge_requests/actions.js
+7
-2
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
...ssets/javascripts/ide/stores/modules/pipelines/actions.js
+8
-4
spec/javascripts/ide/components/pipelines/list_spec.js
spec/javascripts/ide/components/pipelines/list_spec.js
+7
-4
未找到文件。
app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
浏览文件 @
7469b58e
...
@@ -31,10 +31,15 @@ export const openMergeRequest = ({ commit, dispatch }, { projectPath, id }) => {
...
@@ -31,10 +31,15 @@ export const openMergeRequest = ({ commit, dispatch }, { projectPath, id }) => {
commit
(
rootTypes
.
CLEAR_PROJECTS
,
null
,
{
root
:
true
});
commit
(
rootTypes
.
CLEAR_PROJECTS
,
null
,
{
root
:
true
});
commit
(
rootTypes
.
SET_CURRENT_MERGE_REQUEST
,
`
${
id
}
`
,
{
root
:
true
});
commit
(
rootTypes
.
SET_CURRENT_MERGE_REQUEST
,
`
${
id
}
`
,
{
root
:
true
});
commit
(
rootTypes
.
RESET_OPEN_FILES
,
null
,
{
root
:
true
});
commit
(
rootTypes
.
RESET_OPEN_FILES
,
null
,
{
root
:
true
});
dispatch
(
'
pipelines/stopPipelinePolling
'
,
null
,
{
root
:
true
});
dispatch
(
'
pipelines/clearEtagPoll
'
,
null
,
{
root
:
true
});
dispatch
(
'
pipelines/resetLatestPipeline
'
,
null
,
{
root
:
true
});
dispatch
(
'
pipelines/resetLatestPipeline
'
,
null
,
{
root
:
true
});
dispatch
(
'
setCurrentBranchId
'
,
''
,
{
root
:
true
});
dispatch
(
'
setCurrentBranchId
'
,
''
,
{
root
:
true
});
dispatch
(
'
pipelines/stopPipelinePolling
'
,
null
,
{
root
:
true
})
.
then
(()
=>
{
dispatch
(
'
pipelines/clearEtagPoll
'
,
null
,
{
root
:
true
});
})
.
catch
(
e
=>
{
throw
e
;
});
router
.
push
(
`/project/
${
projectPath
}
/merge_requests/
${
id
}
`
);
router
.
push
(
`/project/
${
projectPath
}
/merge_requests/
${
id
}
`
);
};
};
...
...
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
浏览文件 @
7469b58e
...
@@ -12,8 +12,12 @@ let eTagPoll;
...
@@ -12,8 +12,12 @@ let eTagPoll;
export
const
clearEtagPoll
=
()
=>
{
export
const
clearEtagPoll
=
()
=>
{
eTagPoll
=
null
;
eTagPoll
=
null
;
};
};
export
const
stopPipelinePolling
=
()
=>
eTagPoll
&&
eTagPoll
.
stop
();
export
const
stopPipelinePolling
=
()
=>
{
export
const
restartPipelinePolling
=
()
=>
eTagPoll
&&
eTagPoll
.
restart
();
if
(
eTagPoll
)
eTagPoll
.
stop
();
};
export
const
restartPipelinePolling
=
()
=>
{
if
(
eTagPoll
)
eTagPoll
.
restart
();
};
export
const
requestLatestPipeline
=
({
commit
})
=>
commit
(
types
.
REQUEST_LATEST_PIPELINE
);
export
const
requestLatestPipeline
=
({
commit
})
=>
commit
(
types
.
REQUEST_LATEST_PIPELINE
);
export
const
receiveLatestPipelineError
=
({
commit
,
dispatch
})
=>
{
export
const
receiveLatestPipelineError
=
({
commit
,
dispatch
})
=>
{
...
@@ -51,9 +55,9 @@ export const fetchLatestPipeline = ({ dispatch, rootGetters }) => {
...
@@ -51,9 +55,9 @@ export const fetchLatestPipeline = ({ dispatch, rootGetters }) => {
Visibility
.
change
(()
=>
{
Visibility
.
change
(()
=>
{
if
(
!
Visibility
.
hidden
())
{
if
(
!
Visibility
.
hidden
())
{
eTagPoll
.
restart
(
);
dispatch
(
'
restartPipelinePolling
'
);
}
else
{
}
else
{
eTagPoll
.
stop
(
);
dispatch
(
'
stopPipelinePolling
'
);
}
}
});
});
};
};
...
...
spec/javascripts/ide/components/pipelines/list_spec.js
浏览文件 @
7469b58e
...
@@ -45,12 +45,15 @@ describe('IDE pipelines list', () => {
...
@@ -45,12 +45,15 @@ describe('IDE pipelines list', () => {
setTimeout
(
done
);
setTimeout
(
done
);
});
});
afterEach
(()
=>
{
afterEach
(
done
=>
{
vm
.
$store
.
dispatch
(
'
pipelines/stopPipelinePolling
'
);
vm
.
$store
.
dispatch
(
'
pipelines/clearEtagPoll
'
);
vm
.
$destroy
();
vm
.
$destroy
();
mock
.
restore
();
mock
.
restore
();
vm
.
$store
.
dispatch
(
'
pipelines/stopPipelinePolling
'
)
.
then
(()
=>
vm
.
$store
.
dispatch
(
'
pipelines/clearEtagPoll
'
))
.
then
(
done
)
.
catch
(
done
.
fail
);
});
});
it
(
'
renders pipeline data
'
,
()
=>
{
it
(
'
renders pipeline data
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录