deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2706 from jfut/gh-issue-2602

Browse source 
Remove relative_url_root from path. Fixes #2602
This commit is contained in:
Dmitriy Zaporozhets 2013-01-23 10:14:28 -08:00
parent aa99660fe1 79b9249ff4
commit d9027df5b5
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/extracts_path.rb
View file

@ -50,6 +50,8 @@ module ExtractsPath
return pair unless @project return pair unless @project
# Remove relative_url_root from path
input.gsub!(/^#{Gitlab.config.gitlab.relative_url_root}/, "")
# Remove project, actions and all other staff from path # Remove project, actions and all other staff from path
input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "") input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "")
input.gsub!(/^\/(tree|commits|blame|blob|refs)\//, "") # remove actions input.gsub!(/^\/(tree|commits|blame|blob|refs)\//, "") # remove actions

23
spec/lib/extracts_path_spec.rb
View file

@ -73,5 +73,28 @@ describe ExtractsPath do
extract_ref('/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG?_=12354435').should == ['v2.0.0', 'CHANGELOG'] extract_ref('/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG?_=12354435').should == ['v2.0.0', 'CHANGELOG']
end end
end end
context "with a fullpath and a relative_url_root" do
before do
Gitlab.config.gitlab.stub(relative_url_root: '/relative')
end
it "extracts a valid branch with relative_url_root" do
extract_ref('/relative/gitlab/gitlab-ci/tree/foo/bar/baz/CHANGELOG').should == ['foo/bar/baz', 'CHANGELOG']
end
it "extracts a valid tag" do
extract_ref('/relative/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG').should == ['v2.0.0', 'CHANGELOG']
end
it "extracts a valid commit SHA" do
extract_ref('/relative/gitlab/gitlab-ci/tree/f4b14494ef6abf3d144c28e4af0c20143383e062/CHANGELOG').should ==
['f4b14494ef6abf3d144c28e4af0c20143383e062', 'CHANGELOG']
end
it "extracts a timestamp" do
extract_ref('/relative/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG?_=12354435').should == ['v2.0.0', 'CHANGELOG']
end
end
end end
end end