diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 05:29:35 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:00:27 +0100 |
| commit | 52c3b8f31264230814d2ffa79d0987c1491676b3 (patch) | |
| tree | d5827bc9bd891c1dd602eb3cdd4e4062d2e85589 /app/views | |
| parent | 64701b51aeacf4f4f932f205a2d831880b757a43 (diff) | |
| download | gitlab-ce-52c3b8f31264230814d2ffa79d0987c1491676b3.tar.gz | |
Merge branch 'zj-object-store-artifacts' into 'master'
Object store for artifacts
Closes gitlab-ce#29203
See merge request !1762
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/artifacts/_tree_file.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/views/projects/artifacts/_tree_file.html.haml b/app/views/projects/artifacts/_tree_file.html.haml index 8edb9be049a..28f7a52df25 100644 --- a/app/views/projects/artifacts/_tree_file.html.haml +++ b/app/views/projects/artifacts/_tree_file.html.haml @@ -1,10 +1,13 @@ -- path_to_file = file_project_job_artifacts_path(@project, @build, path: file.path) +- path_to_file = file_namespace_project_job_artifacts_path(@project.namespace, @project, @build, path: file.path) if @build.downloadable_single_artifacts_file? %tr.tree-item{ 'data-link' => path_to_file } - blob = file.blob %td.tree-item-file-name = tree_icon('file', blob.mode, blob.name) - = link_to path_to_file do - %span.str-truncated= blob.name + %span.str-truncated + - if path_to_file + = link_to file.name, path_to_file + - else + = file.name %td = number_to_human_size(blob.size, precision: 2) diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index bddb587ddc6..408c1511683 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -32,8 +32,8 @@ = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do Download - - if @build.artifacts_metadata? - = link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do + - if @build.browsable_artifacts? + = link_to browse_namespace_project_job_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do Browse - if @build.trigger_request |