Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ff1e3a47
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,发现更多精彩内容 >>
提交
ff1e3a47
编写于
10月 30, 2017
作者:
M
Mark Fletcher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
上级
bb63ee68
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
30 addition
and
1 deletion
+30
-1
changelogs/unreleased/39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails.yml
...ancel-merge-when-pipeline-succeeds-from-the-api-fails.yml
+5
-0
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+1
-1
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+24
-0
未找到文件。
changelogs/unreleased/39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails.yml
0 → 100644
浏览文件 @
ff1e3a47
---
title
:
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
merge_request
:
author
:
type
:
fixed
lib/api/merge_requests.rb
浏览文件 @
ff1e3a47
...
...
@@ -295,7 +295,7 @@ module API
unauthorized!
unless
merge_request
.
can_cancel_merge_when_pipeline_succeeds?
(
current_user
)
::
MergeRequest
::
MergeWhenPipelineSucceedsService
::
MergeRequest
s
::
MergeWhenPipelineSucceedsService
.
new
(
merge_request
.
target_project
,
current_user
)
.
cancel
(
merge_request
)
end
...
...
spec/requests/api/merge_requests_spec.rb
浏览文件 @
ff1e3a47
...
...
@@ -1061,6 +1061,30 @@ describe API::MergeRequests do
end
end
describe
'POST :id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds'
do
before
do
::
MergeRequests
::
MergeWhenPipelineSucceedsService
.
new
(
merge_request
.
target_project
,
user
).
execute
(
merge_request
)
end
it
'removes the merge_when_pipeline_succeeds status'
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/cancel_merge_when_pipeline_succeeds"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
201
)
end
it
'returns 404 if the merge request is not found'
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/123/merge_when_pipeline_succeeds"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
it
'returns 404 if the merge request id is used instead of iid'
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/merge_when_pipeline_succeeds"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
describe
'Time tracking'
do
let
(
:issuable
)
{
merge_request
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录