kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix submodules 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-02-10 09:55:38 +02:00
parent 8b6a14b505
commit dee11dadad
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/submodule_helper.rb
View File

@ -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
end