summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/trace
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-04-06 04:48:26 +0900
committerShinya Maeda <shinya@gitlab.com>2018-04-06 04:48:26 +0900
commitddf74e513feec2c35ab7c65517c3d661a128c32c (patch)
tree37b31fccce639570e7838f668266e03a507f47e2 /lib/gitlab/ci/trace
parent7297a06cb6d9a73c721b27fdc1941e04b17f5433 (diff)
parente9e800f5239f5b45984d49615bbc67e823a117ab (diff)
downloadgitlab-ce-ddf74e513feec2c35ab7c65517c3d661a128c32c.tar.gz
Merge branch 'master' into live-trace-v2
Diffstat (limited to 'lib/gitlab/ci/trace')
-rw-r--r--lib/gitlab/ci/trace/stream.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/ci/trace/stream.rb b/lib/gitlab/ci/trace/stream.rb
index 8519dab82d2..68919e317a1 100644
--- a/lib/gitlab/ci/trace/stream.rb
+++ b/lib/gitlab/ci/trace/stream.rb
@@ -26,7 +26,11 @@ module Gitlab
end
def file?
- self.path if self.stream.respond_to?(:path)
+ self.path
+ end
+
+ def path
+ self.stream.path if self.stream.respond_to?(:path)
end
def limit(last_bytes = LIMIT_SIZE)