diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-21 13:33:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-21 13:33:48 +0000 |
| commit | 592b8d716f77944e61a7b532028ccf27c8401755 (patch) | |
| tree | 9c258d7d57adb7ba3abea749ca631b35d28fe60d /lib/api | |
| parent | 09beebd7943cf6987df32b742b8dbe719632d20a (diff) | |
| parent | c94b607ae6150808a063fc6b2916bda0dc4850ab (diff) | |
| download | gitlab-ce-592b8d716f77944e61a7b532028ccf27c8401755.tar.gz | |
Merge branch 'create-live-trace-only-if-job-is-complete' into 'master'
Append trace chunk only if job is running
Closes #46383
See merge request gitlab-org/gitlab-ce!18969
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/runner.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 649feba1036..a7f1cb1131f 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -149,6 +149,7 @@ module API end patch '/:id/trace' do job = authenticate_job! + forbidden!('Job is not running') unless job.running? error!('400 Missing header Content-Range', 400) unless request.headers.key?('Content-Range') content_range = request.headers['Content-Range'] |