simplify link url

c0744e5b · Timm Drevensek · e9356356 · c0744e5b
Commit c0744e5b authored Feb 28, 2014 by Timm Drevensek
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

app/helpers/submodule_helper.rb app/helpers/submodule_helper.rb +3 -4

No files found.
--- a/app/helpers/submodule_helper.rb
+++ b/app/helpers/submodule_helper.rb
@@ -50,11 +50,10 @@ module SubmoduleHelper
  def relative_self_links(url, commit)
    if url.scan(/(\.\.\/)/).size == 2
-      base = [ Gitlab.config.gitlab.url, '/', url[/.*\/(.*)\/.*\.git/, 1] ].join('')
+      base = url[/([^\/]*\/[^\/]*)\.git/, 1]
    else
-      base = [ Gitlab.config.gitlab.url, '/', @project.group.path ].join('')
+      base = [ @project.group.path, '/', url[/([^\/]*)\.git/, 1] ].join('')
    end
-    base = [ base, '/', url[/.*\/(.*)\.git/, 1] ].join('')
+    return project_path(base), project_tree_path(base, commit)
-    return base, [ base, '/tree/', commit ].join('')
  end
 end