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/models/ci | |
| 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/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index c9506dd3057..4a3f92ad34a 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -95,8 +95,12 @@ module Ci end def trace_html - html = Ci::Ansi2html::convert(trace) if trace.present? - html || '' + trace_with_state[:html] || '' + end + + def trace_with_state(state = nil) + trace_with_state = Ci::Ansi2html::convert(trace, state) if trace.present? + trace_with_state || {} end def timeout |