summaryrefslogtreecommitdiff
path: root/app/views/projects/tree
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-09-07 15:21:30 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-09-07 15:21:30 +0200
commite5e0acfc4dd65503b89e652beca5b973141c4032 (patch)
tree3123b4f7b9fbde403b417417d452f78f9db0eb25 /app/views/projects/tree
parent83c1bb688c9fff5c146dcc5fb74fe74c1d948d34 (diff)
parent62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf (diff)
downloadgitlab-ce-e5e0acfc4dd65503b89e652beca5b973141c4032.tar.gz
Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into 37158-autodevops-banner
Diffstat (limited to 'app/views/projects/tree')
-rw-r--r--app/views/projects/tree/_tree_item.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/tree/_tree_item.html.haml b/app/views/projects/tree/_tree_item.html.haml
index 0c9c8750f2c..56197382a70 100644
--- a/app/views/projects/tree/_tree_item.html.haml
+++ b/app/views/projects/tree/_tree_item.html.haml
@@ -1,7 +1,7 @@
%tr{ class: "tree-item #{tree_hex_class(tree_item)}" }
%td.tree-item-file-name
= tree_icon(type, tree_item.mode, tree_item.name)
- - path = flatten_tree(tree_item)
+ - path = flatten_tree(@path, tree_item)
= link_to project_tree_path(@project, tree_join(@id || @commit.id, path)), title: path do
%span.str-truncated= path
%td.hidden-xs.tree-commit