summaryrefslogtreecommitdiff
path: root/app/controllers/projects/artifacts_controller.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2015-12-31 12:21:56 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-01-14 12:48:15 +0100
commit3de8a4620a70c886c815576dc0a30a745cbb8ccb (patch)
tree7cad0174855a338bab620068f005f78fa804fce7 /app/controllers/projects/artifacts_controller.rb
parent447f56036e837fc9a9c2bcaf382d38dc513a9733 (diff)
downloadgitlab-ce-3de8a4620a70c886c815576dc0a30a745cbb8ccb.tar.gz
Parse artifacts metadata stored in JSON format
Diffstat (limited to 'app/controllers/projects/artifacts_controller.rb')
-rw-r--r--app/controllers/projects/artifacts_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index 3a112587f72..5bd0c8cd780 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -18,8 +18,8 @@ class Projects::ArtifactsController < Projects::ApplicationController
return render_404 unless build.artifacts?
current_path = params[:path] ? "./#{params[:path]}/" : './'
- metadata = build.artifacts_metadata_for_path(current_path)
- @path = Gitlab::StringPath.new(current_path, metadata)
+ paths, metadata = build.artifacts_metadata_for_path(current_path)
+ @path = Gitlab::StringPath.new(current_path, paths, metadata)
end
private