summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-01-11 09:57:03 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-01-14 12:48:16 +0100
commit09a4a5aff8c53dd5930044ddbb285a95ef177d8a (patch)
tree16d4e877364b0d1480f83fd2faffe9cf8c1cfe82 /app/models
parent61fb47a43202332fe9ac57847996da929ba42d3f (diff)
downloadgitlab-ce-09a4a5aff8c53dd5930044ddbb285a95ef177d8a.tar.gz
Render only valid paths in artifacts metadata
In this version we will support only relative paths in artifacts metadata. Support for absolute paths will be introduced later.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/build.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 2d2206cc4d7..7593ceda488 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -347,10 +347,8 @@ module Ci
artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists?
end
-
def artifacts_metadata_path(path)
- metadata_file = artifacts_metadata.path
- Gitlab::Ci::Build::Artifacts::Metadata.new(metadata_file, path).to_path
+ Gitlab::Ci::Build::Artifacts::Metadata.new(artifacts_metadata.path, path).to_path
end
private