Download as
Browse Code »

Commit fe8c9021266c579127cf52f6456eb0090e400e63

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

Add support for relative submodules

Showing 2 changed files with 18 additions and 0 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @fe8c902
... ... @@ -3,6 +3,7 @@ v 6.7.0
3 3 - Add edit file button to MergeRequest diff
4 4 - Public groups (Jason Hollingsworth)
5 5 - Cleaner headers in Notification Emails (Pierre de La Morinerie)
  6 + - Add support for relative submodules
6 7  
7 8 v 6.6.2
8 9 - Fix 500 error on branch/tag create or remove via UI
... ...
app/helpers/submodule_helper.rb 100644 → 100755
  Diff comments   View file @fe8c902
... ... @@ -12,6 +12,8 @@ module SubmoduleHelper
12 12  
13 13 if self_url?(url, project)
14 14 return project_path(project), project_tree_path(project, submodule_item.id)
  15 + elsif relative_self_url?(url)
  16 + relative_self_links(url, submodule_item.id)
15 17 elsif github_dot_com_url?(url)
16 18 standard_links('github.com', project, submodule_item.id)
17 19 elsif gitlab_dot_com_url?(url)
... ... @@ -36,8 +38,23 @@ module SubmoduleHelper
36 38 url == gitlab_shell.url_to_repo(project)
37 39 end
38 40  
  41 + def relative_self_url?(url)
  42 + # (./)? ( (../repo.git) | (../../project/repo.git) )
  43 + url =~ /(^((\.\/)?(((\.\.)\/)|((\.\.)\/(\.\.)\/.*\/)))[^\.\/]*\.git)\Z/
  44 + end
  45 +
39 46 def standard_links(host, project, commit)
40 47 base = [ 'https://', host, '/', project ].join('')
41 48 return base, [ base, '/tree/', commit ].join('')
42 49 end
  50 +
  51 + def relative_self_links(url, commit)
  52 + if url.scan(/(\.\.)/).size == 2
  53 + base = [ Gitlab.config.gitlab.url, '/', url[/.*\/(.*)\/.*\.git/, 1] ].join('')
  54 + else
  55 + base = [ Gitlab.config.gitlab.url, '/', @project.group.path ].join('')
  56 + end
  57 + base = [ base, '/', url[/.*\/(.*)\.git/, 1] ].join('')
  58 + return base, [ base, '/tree/', commit ].join('')
  59 + end
43 60 end
... ...