From f57218411f9f45771f41c50399aa0d9507893749 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 10 May 2017 13:29:20 +0000
Subject: Merge branch 'patch-5' into 'master'

Update tree_helper.rb to fix #31784, which broken file browse where paths deeper than 6:'/'.

Closes #31784

See merge request !11197
---
 app/helpers/tree_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index a91e3da309c..e0d3e9b88f3 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -81,7 +81,7 @@ module TreeHelper
       part_path = ""
       parts = @path.split('/')
 
-      yield('..', nil) if parts.count > max_links
+      yield('..', File.join(*parts.first(parts.count - 2))) if parts.count > max_links
 
       parts.each do |part|
         part_path = File.join(part_path, part) unless part_path.empty?
-- 
cgit v1.2.1