summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-07 19:31:40 +0200
committerRémy Coutable <remy@rymai.me>2017-09-07 19:31:40 +0200
commit09d323dece07c68db4d019f0c5b42061a76a8892 (patch)
tree4ac848b8686ae8bb454a2e6fe138e18b66be102a /app/helpers
parent4ae8e20c9c860e5d5d6a148e9f4ee0ae7b8c8946 (diff)
downloadgitlab-ce-09d323dece07c68db4d019f0c5b42061a76a8892.tar.gz
Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/tree_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 95dbdc8ec46..c4ea0f5ac53 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -104,7 +104,7 @@ module TreeHelper
subtree = Gitlab::Git::Tree.where(@repository, @commit.id, tree.path)
if subtree.count == 1 && subtree.first.dir?
- return tree_join(tree.name, flatten_tree(subtree.first))
+ return tree_join(tree.name, flatten_tree(root_path, subtree.first))
else
return tree.name
end