BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
64d7772b
Commit
64d7772b
authored
Dec 19, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a separate method to skip validation
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8091#note_20222666
parent
4bf59f87
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
builds.rb
lib/ci/api/builds.rb
+1
-1
helpers.rb
lib/ci/api/helpers.rb
+7
-2
No files found.
lib/ci/api/builds.rb
View file @
64d7772b
...
@@ -41,7 +41,7 @@ module Ci
...
@@ -41,7 +41,7 @@ module Ci
put
":id"
do
put
":id"
do
authenticate_runner!
authenticate_runner!
build
=
Ci
::
Build
.
where
(
runner_id:
current_runner
.
id
).
running
.
find
(
params
[
:id
])
build
=
Ci
::
Build
.
where
(
runner_id:
current_runner
.
id
).
running
.
find
(
params
[
:id
])
authenticate_build!
(
build
,
verify_token:
false
)
validate_build!
(
build
)
update_runner_info
update_runner_info
...
...
lib/ci/api/helpers.rb
View file @
64d7772b
...
@@ -13,9 +13,14 @@ module Ci
...
@@ -13,9 +13,14 @@ module Ci
forbidden!
unless
current_runner
forbidden!
unless
current_runner
end
end
def
authenticate_build!
(
build
,
verify_token:
true
)
def
authenticate_build!
(
build
)
not_found!
unless
build
forbidden!
if
!
build_token_valid?
(
build
)
validate_build!
(
build
)
end
def
validate_build!
(
build
)
not_found!
unless
build
not_found!
unless
build
forbidden!
if
verify_token
&&
!
build_token_valid?
(
build
)
forbidden!
(
'Project has been deleted!'
)
unless
build
.
project
forbidden!
(
'Project has been deleted!'
)
unless
build
.
project
forbidden!
(
'Build has been erased!'
)
if
build
.
erased?
forbidden!
(
'Build has been erased!'
)
if
build
.
erased?
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment