From dee11dadad88ed83300c7684aab52e5508f29f24 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 10 Feb 2014 09:55:38 +0200 Subject: [PATCH] Fix submodules Signed-off-by: Dmitriy Zaporozhets --- app/helpers/submodule_helper.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb index 285f4081bf9..319bf35327f 100644 --- a/app/helpers/submodule_helper.rb +++ b/app/helpers/submodule_helper.rb @@ -3,7 +3,10 @@ module SubmoduleHelper # links to files listing for submodule if submodule is a project on this server def submodule_links(submodule_item) - url = submodule_item.submodule_url + submodule = @repository.submodules(@ref)[submodule_item.path] + + url = submodule['url'] if submodule + return url, nil unless url =~ /([^\/:]+\/[^\/]+\.git)\Z/ project = $1 @@ -19,7 +22,7 @@ module SubmoduleHelper return url, nil end end - + protected def github_dot_com_url?(url) @@ -29,14 +32,14 @@ module SubmoduleHelper def gitlab_dot_com_url?(url) url =~ /gitlab\.com[\/:][^\/]+\/[^\/]+\Z/ end - + def self_url?(url, project) return true if url == [ Gitlab.config.gitlab.url, '/', project, '.git' ].join('') url == gitlab_shell.url_to_repo(project) end - + def standard_links(host, project, commit) base = [ 'https://', host, '/', project ].join('') return base, [ base, '/tree/', commit ].join('') end -end \ No newline at end of file +end