Fix submodules
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
8b6a14b505
commit
dee11dadad
|
@ -3,7 +3,10 @@ module SubmoduleHelper
|
||||||
|
|
||||||
# links to files listing for submodule if submodule is a project on this server
|
# links to files listing for submodule if submodule is a project on this server
|
||||||
def submodule_links(submodule_item)
|
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/
|
return url, nil unless url =~ /([^\/:]+\/[^\/]+\.git)\Z/
|
||||||
|
|
||||||
project = $1
|
project = $1
|
||||||
|
@ -19,7 +22,7 @@ module SubmoduleHelper
|
||||||
return url, nil
|
return url, nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def github_dot_com_url?(url)
|
def github_dot_com_url?(url)
|
||||||
|
@ -29,14 +32,14 @@ module SubmoduleHelper
|
||||||
def gitlab_dot_com_url?(url)
|
def gitlab_dot_com_url?(url)
|
||||||
url =~ /gitlab\.com[\/:][^\/]+\/[^\/]+\Z/
|
url =~ /gitlab\.com[\/:][^\/]+\/[^\/]+\Z/
|
||||||
end
|
end
|
||||||
|
|
||||||
def self_url?(url, project)
|
def self_url?(url, project)
|
||||||
return true if url == [ Gitlab.config.gitlab.url, '/', project, '.git' ].join('')
|
return true if url == [ Gitlab.config.gitlab.url, '/', project, '.git' ].join('')
|
||||||
url == gitlab_shell.url_to_repo(project)
|
url == gitlab_shell.url_to_repo(project)
|
||||||
end
|
end
|
||||||
|
|
||||||
def standard_links(host, project, commit)
|
def standard_links(host, project, commit)
|
||||||
base = [ 'https://', host, '/', project ].join('')
|
base = [ 'https://', host, '/', project ].join('')
|
||||||
return base, [ base, '/tree/', commit ].join('')
|
return base, [ base, '/tree/', commit ].join('')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue