Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
53219857
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,发现更多精彩内容 >>
提交
53219857
编写于
5月 05, 2017
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Check ability to update build on the API resource
上级
3264e09c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
14 addition
and
5 deletion
+14
-5
lib/api/jobs.rb
lib/api/jobs.rb
+7
-2
lib/api/v3/builds.rb
lib/api/v3/builds.rb
+7
-3
未找到文件。
lib/api/jobs.rb
浏览文件 @
53219857
...
@@ -132,6 +132,7 @@ module API
...
@@ -132,6 +132,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:job_id
])
build
=
get_build!
(
params
[
:job_id
])
authorize!
(
:update_build
,
build
)
build
.
cancel
build
.
cancel
...
@@ -148,6 +149,7 @@ module API
...
@@ -148,6 +149,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:job_id
])
build
=
get_build!
(
params
[
:job_id
])
authorize!
(
:update_build
,
build
)
return
forbidden!
(
'Job is not retryable'
)
unless
build
.
retryable?
return
forbidden!
(
'Job is not retryable'
)
unless
build
.
retryable?
build
=
Ci
::
Build
.
retry
(
build
,
current_user
)
build
=
Ci
::
Build
.
retry
(
build
,
current_user
)
...
@@ -165,6 +167,7 @@ module API
...
@@ -165,6 +167,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:job_id
])
build
=
get_build!
(
params
[
:job_id
])
authorize!
(
:update_build
,
build
)
return
forbidden!
(
'Job is not erasable!'
)
unless
build
.
erasable?
return
forbidden!
(
'Job is not erasable!'
)
unless
build
.
erasable?
build
.
erase
(
erased_by:
current_user
)
build
.
erase
(
erased_by:
current_user
)
...
@@ -181,6 +184,7 @@ module API
...
@@ -181,6 +184,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:job_id
])
build
=
get_build!
(
params
[
:job_id
])
authorize!
(
:update_build
,
build
)
return
not_found!
(
build
)
unless
build
.
artifacts?
return
not_found!
(
build
)
unless
build
.
artifacts?
build
.
keep_artifacts!
build
.
keep_artifacts!
...
@@ -201,6 +205,7 @@ module API
...
@@ -201,6 +205,7 @@ module API
build
=
get_build!
(
params
[
:job_id
])
build
=
get_build!
(
params
[
:job_id
])
authorize!
(
:update_build
,
build
)
bad_request!
(
"Unplayable Job"
)
unless
build
.
playable?
bad_request!
(
"Unplayable Job"
)
unless
build
.
playable?
build
.
play
(
current_user
)
build
.
play
(
current_user
)
...
@@ -211,12 +216,12 @@ module API
...
@@ -211,12 +216,12 @@ module API
end
end
helpers
do
helpers
do
def
get
_build
(
id
)
def
find
_build
(
id
)
user_project
.
builds
.
find_by
(
id:
id
.
to_i
)
user_project
.
builds
.
find_by
(
id:
id
.
to_i
)
end
end
def
get_build!
(
id
)
def
get_build!
(
id
)
get
_build
(
id
)
||
not_found!
find
_build
(
id
)
||
not_found!
end
end
def
present_artifacts!
(
artifacts_file
)
def
present_artifacts!
(
artifacts_file
)
...
...
lib/api/v3/builds.rb
浏览文件 @
53219857
...
@@ -134,6 +134,7 @@ module API
...
@@ -134,6 +134,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:build_id
])
build
=
get_build!
(
params
[
:build_id
])
authorize!
(
:update_build
,
build
)
build
.
cancel
build
.
cancel
...
@@ -150,6 +151,7 @@ module API
...
@@ -150,6 +151,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:build_id
])
build
=
get_build!
(
params
[
:build_id
])
authorize!
(
:update_build
,
build
)
return
forbidden!
(
'Build is not retryable'
)
unless
build
.
retryable?
return
forbidden!
(
'Build is not retryable'
)
unless
build
.
retryable?
build
=
Ci
::
Build
.
retry
(
build
,
current_user
)
build
=
Ci
::
Build
.
retry
(
build
,
current_user
)
...
@@ -167,6 +169,7 @@ module API
...
@@ -167,6 +169,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:build_id
])
build
=
get_build!
(
params
[
:build_id
])
authorize!
(
:update_build
,
build
)
return
forbidden!
(
'Build is not erasable!'
)
unless
build
.
erasable?
return
forbidden!
(
'Build is not erasable!'
)
unless
build
.
erasable?
build
.
erase
(
erased_by:
current_user
)
build
.
erase
(
erased_by:
current_user
)
...
@@ -183,6 +186,7 @@ module API
...
@@ -183,6 +186,7 @@ module API
authorize_update_builds!
authorize_update_builds!
build
=
get_build!
(
params
[
:build_id
])
build
=
get_build!
(
params
[
:build_id
])
authorize!
(
:update_build
,
build
)
return
not_found!
(
build
)
unless
build
.
artifacts?
return
not_found!
(
build
)
unless
build
.
artifacts?
build
.
keep_artifacts!
build
.
keep_artifacts!
...
@@ -202,7 +206,7 @@ module API
...
@@ -202,7 +206,7 @@ module API
authorize_read_builds!
authorize_read_builds!
build
=
get_build!
(
params
[
:build_id
])
build
=
get_build!
(
params
[
:build_id
])
authorize!
(
:update_build
,
build
)
bad_request!
(
"Unplayable Job"
)
unless
build
.
playable?
bad_request!
(
"Unplayable Job"
)
unless
build
.
playable?
build
.
play
(
current_user
)
build
.
play
(
current_user
)
...
@@ -213,12 +217,12 @@ module API
...
@@ -213,12 +217,12 @@ module API
end
end
helpers
do
helpers
do
def
get
_build
(
id
)
def
find
_build
(
id
)
user_project
.
builds
.
find_by
(
id:
id
.
to_i
)
user_project
.
builds
.
find_by
(
id:
id
.
to_i
)
end
end
def
get_build!
(
id
)
def
get_build!
(
id
)
get
_build
(
id
)
||
not_found!
find
_build
(
id
)
||
not_found!
end
end
def
present_artifacts!
(
artifacts_file
)
def
present_artifacts!
(
artifacts_file
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录