kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Allow RelativeLinkFilter to go up multiple directories

This commit is contained in:
Robert Speicher 2015-09-20 19:21:33 -04:00
parent 619f04c196
commit 2b94f5fb06
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/gitlab/markdown/relative_link_filter.rb
View File

@ -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

8
spec/lib/gitlab/markdown/relative_link_filter_spec.rb
View File

@ -85,6 +85,14 @@ module Gitlab::Markdown
to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
end
it 'rebuilds relative URL for a file in the repo up multiple directories' do
relative_link = link('../../../api/README.md')
doc = filter(relative_link, requested_path: 'doc/foo/bar/baz/README.md')
expect(doc.at_css('a')['href']).
to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
end
it 'rebuilds relative URL for a file in the repo with an anchor' do
doc = filter(link('README.md#section'))
expect(doc.at_css('a')['href']).