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

Improve Extract path

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-02 22:39:02 +02:00
parent 07a5cb2ef8
commit 1b25a8f437
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/extracts_path.rb
View file

@ -51,7 +51,7 @@ module ExtractsPath
return pair unless @project return pair unless @project
# Remove project, actions and all other staff from path # Remove project, actions and all other staff from path
input.gsub!("/#{@project.path_with_namespace}", "") input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "")
input.gsub!(/^\/(tree|commits|blame|blob)\//, "") # remove actions input.gsub!(/^\/(tree|commits|blame|blob)\//, "") # remove actions
input.gsub!(/\?.*$/, "") # remove stamps suffix input.gsub!(/\?.*$/, "") # remove stamps suffix
input.gsub!(/.atom$/, "") # remove rss feed input.gsub!(/.atom$/, "") # remove rss feed
@ -108,7 +108,9 @@ module ExtractsPath
request.format = :atom request.format = :atom
end end
@ref, @path = extract_ref(request.fullpath) path = request.fullpath.dup
@ref, @path = extract_ref(path)
@id = File.join(@ref, @path) @id = File.join(@ref, @path)