summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-27 21:08:24 +0900
committerShinya Maeda <shinya@gitlab.com>2018-05-28 14:17:38 +0900
commit88b93f55a13f51776991d0437d8a63e18e777419 (patch)
tree1ba34ddb14c184ee7a42e90c350c55eea14be383
parentffacc06efb0f71d8aed18c6517fc18d168873cf2 (diff)
downloadgitlab-ce-88b93f55a13f51776991d0437d8a63e18e777419.tar.gz
Revert trace change
-rw-r--r--lib/gitlab/ci/trace.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index 58a0ec6dea4..30e3b523470 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -59,9 +59,7 @@ module Gitlab
def read
stream = Gitlab::Ci::Trace::Stream.new do
- if trace_artifact
- trace_artifact.open
- elsif job.trace_chunks.any?
+ if job.trace_chunks.any?
Gitlab::Ci::Trace::ChunkedIO.new(job)
elsif current_path
File.open(current_path, "rb")