diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-08 12:10:58 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-12 13:50:56 +0300 |
| commit | a04eedaeba3b44f5c82b884bc4bc2d462d031534 (patch) | |
| tree | 1cffd411a97dfc28407e8b6f07a2c030e4a8250d /app | |
| parent | acfd426162347a47327132fcc1f9a6da28c7ac83 (diff) | |
Merge branch '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree' into 'master'
Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree
Closes #37569
See merge request !14119
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/tree_helper.rb | 2 |
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 |