Download as
Browse Code »

Commit e935635620cbc4a3f2f18303f12891cc997f1cb1

Authored by Timm Drevensek
1 parent fe8c9021
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

fixed regex to match url pointing to a user repo

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/helpers/submodule_helper.rb
  Diff comments   View file @e935635
@@ -39,8 +39,8 @@ module SubmoduleHelper @@ -39,8 +39,8 @@ module SubmoduleHelper
39 end 39 end
40 40
41 def relative_self_url?(url) 41 def relative_self_url?(url)
42 - # (./)? ( (../repo.git) | (../../project/repo.git) )  
43 - url =~ /(^((\.\/)?(((\.\.)\/)|((\.\.)\/(\.\.)\/.*\/)))[^\.\/]*\.git)\Z/ 42 + # (./)?(../repo.git) || (./)?(../../project/repo.git) )
  43 + url =~ /^((\.\/)?(\.\.\/))(?!(\.\.)|(.*\/)).*\.git\Z/ || url =~ /^((\.\/)?(\.\.\/){2})(?!(\.\.))([^\/]*)\/(?!(\.\.)|(.*\/)).*\.git\Z/
44 end 44 end
45 45
46 def standard_links(host, project, commit) 46 def standard_links(host, project, commit)
@@ -49,7 +49,7 @@ module SubmoduleHelper @@ -49,7 +49,7 @@ module SubmoduleHelper
49 end 49 end
50 50
51 def relative_self_links(url, commit) 51 def relative_self_links(url, commit)
52 - if url.scan(/(\.\.)/).size == 2 52 + if url.scan(/(\.\.\/)/).size == 2
53 base = [ Gitlab.config.gitlab.url, '/', url[/.*\/(.*)\/.*\.git/, 1] ].join('') 53 base = [ Gitlab.config.gitlab.url, '/', url[/.*\/(.*)\/.*\.git/, 1] ].join('')
54 else 54 else
55 base = [ Gitlab.config.gitlab.url, '/', @project.group.path ].join('') 55 base = [ Gitlab.config.gitlab.url, '/', @project.group.path ].join('')