summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-05-04 15:01:54 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-05-04 15:01:54 +0000
commitd3768dd79698ae17cd0c82b7c78a8ead11b7e157 (patch)
tree5c98075e5a54fe3cb5f542487750a5fe3e9f40f3 /lib
parenta07d03e7c777ed9e169576e8bb92edc4b5557a79 (diff)
parent0f58eb6bde35009b69ef871534d9ff80fc38bbf7 (diff)
downloadgitlab-ce-d3768dd79698ae17cd0c82b7c78a8ead11b7e157.tar.gz
Merge branch 'dm-artifact-blob-viewer' into 'master'
Use blob viewer for job artifacts Closes #31297 See merge request !11018
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/build/artifacts/metadata/entry.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gitlab/ci/build/artifacts/metadata/entry.rb b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
index 6f799c2f031..2e073334abc 100644
--- a/lib/gitlab/ci/build/artifacts/metadata/entry.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
@@ -37,6 +37,12 @@ module Gitlab
!directory?
end
+ def blob
+ return unless file?
+
+ @blob ||= Blob.decorate(::Ci::ArtifactBlob.new(self), nil)
+ end
+
def has_parent?
nodes > 0
end