summaryrefslogtreecommitdiff
path: root/app/views/projects/artifacts
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2015-12-22 11:05:22 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-01-14 12:48:13 +0100
commitb19e958d86f5363057f006c8dbf9a8e8762618b9 (patch)
tree2f0239396ee98841374c99f73439c81a0939dad9 /app/views/projects/artifacts
parentaae674c3a2bbe3e3c2303be0174fda785abb11d4 (diff)
downloadgitlab-ce-b19e958d86f5363057f006c8dbf9a8e8762618b9.tar.gz
Add support for parent directories in `StringPath`
This support is not completed though, as parent directory that is first in collection returned by `directories!` is not iterable yet.
Diffstat (limited to 'app/views/projects/artifacts')
-rw-r--r--app/views/projects/artifacts/_tree_directory.html.haml4
-rw-r--r--app/views/projects/artifacts/browse.html.haml2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/artifacts/_tree_directory.html.haml b/app/views/projects/artifacts/_tree_directory.html.haml
index ec68c45865e..481a2cb072f 100644
--- a/app/views/projects/artifacts/_tree_directory.html.haml
+++ b/app/views/projects/artifacts/_tree_directory.html.haml
@@ -1,6 +1,6 @@
%tr{ class: 'tree-item' }
%td.tree-item-file-name
- = tree_icon('folder', '755', directory.basename)
+ = tree_icon('folder', '755', directory.name)
%span.str-truncated
- = link_to directory.basename, browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build, path: directory.path)
+ = link_to directory.name, browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build, path: directory.path)
%td
diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml
index ddca02d2bed..141fea9a6d4 100644
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
@@ -16,5 +16,5 @@
%tr
%th Name
%th Download
- = render partial: 'tree_directory', collection: @path.directories, as: :directory
+ = render partial: 'tree_directory', collection: @path.directories!, as: :directory
= render partial: 'tree_file', collection: @path.files, as: :file