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

Former-commit-id: b9a4b348

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?