diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-12 16:48:42 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-12 16:48:42 +0000 |
| commit | f2303f9df061d6ff85d0ff0fee9e3aa54df97ea7 (patch) | |
| tree | 72383406de96e7c4ae10994d556a8cdb90f7592a /app/controllers | |
| parent | 95163307ae0c363d309b02c624c40b1ad9a03f06 (diff) | |
| parent | 5bd356eb31fb4684199f6f681f4901ebe025ed92 (diff) | |
| download | gitlab-ce-f2303f9df061d6ff85d0ff0fee9e3aa54df97ea7.tar.gz | |
Merge branch 'send-incremental-build-log' into 'master'
Update build log incrementally
Proof of concept implementation of incremental sending of build log to browser.
cc @jschatz1 @vsizov @grzesiek @tmaczukin
See merge request !3737
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/builds_controller.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index b8b9e78427d..bb1f6c5e980 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -38,6 +38,14 @@ class Projects::BuildsController < Projects::ApplicationController end end + def trace + respond_to do |format| + format.json do + render json: @build.trace_with_state(params[:state]).merge!(id: @build.id, status: @build.status) + end + end + end + def retry unless @build.retryable? return render_404 |