summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-20 19:21:33 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-20 19:21:33 -0400
commit2b94f5fb06ef061fb49a7dadcbb95c0954bc9860 (patch)
treed44b697c910b7bdecdbfee932aec015db1f7feb2 /lib
parent619f04c196731b2a274802dfb4b4d3c3664e5465 (diff)
downloadgitlab-ce-2b94f5fb06ef061fb49a7dadcbb95c0954bc9860.tar.gz
Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-one
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/markdown/relative_link_filter.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb
index d613c205509..6ee3d1ce039 100644
--- a/lib/gitlab/markdown/relative_link_filter.rb
+++ b/lib/gitlab/markdown/relative_link_filter.rb
@@ -91,8 +91,7 @@ module Gitlab
parts = request_path.split('/')
parts.pop if path_type(request_path) != 'tree'
- # Allow for going up one directory
- if parts.length > 1 && path.start_with?('../')
+ while parts.length > 1 && path.start_with?('../')
parts.pop
path.sub!('../', '')
end