diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-31 13:56:27 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-31 13:56:53 +0200 |
| commit | d2283f4f0e98b86800ba6a222593647e4991375d (patch) | |
| tree | ecdc3040ce46957b28a4a8f9343afeec0751604b /lib/api/helpers | |
| parent | 53b21c1e8e27a284a8691a73276204a85694eeb8 (diff) | |
| download | gitlab-ce-d2283f4f0e98b86800ba6a222593647e4991375d.tar.gz | |
Backport API changes needed to fix sticking in EEbackport-sticking-api-helper-changes
These changes are ported over from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1502 to reduce
the number of merge conflicts that may occur.
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/runner.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index 74848a6e144..1369b021ea4 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -50,10 +50,14 @@ module API forbidden!('Job has been erased!') if job.erased? end - def authenticate_job!(job) + def authenticate_job! + job = Ci::Build.find_by_id(params[:id]) + validate_job!(job) do forbidden! unless job_token_valid?(job) end + + job end def job_token_valid?(job) |