projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14874-protected-collection-properties
[arvados.git]
/
services
/
api
/
app
/
models
/
repository.rb
diff --git
a/services/api/app/models/repository.rb
b/services/api/app/models/repository.rb
index ac89ecf6b06e5b3df40cd4e1728448f86474dd77..5e0e39f9bedb090d7b566b3ddf9389c8f10f95dd 100644
(file)
--- a/
services/api/app/models/repository.rb
+++ b/
services/api/app/models/repository.rb
@@
-49,7
+49,7
@@
class Repository < ArvadosModel
# prefers bare repositories over checkouts.
[["%s.git"], ["%s", ".git"]].each do |repo_base, *join_args|
[:uuid, :name].each do |path_attr|
# prefers bare repositories over checkouts.
[["%s.git"], ["%s", ".git"]].each do |repo_base, *join_args|
[:uuid, :name].each do |path_attr|
- git_dir = File.join(Rails.configuration.
Containers["Git"]["Repositories"]
,
+ git_dir = File.join(Rails.configuration.
Git.Repositories
,
repo_base % send(path_attr), *join_args)
return git_dir if File.exist?(git_dir)
end
repo_base % send(path_attr), *join_args)
return git_dir if File.exist?(git_dir)
end
@@
-98,21
+98,27
@@
class Repository < ArvadosModel
end
def ssh_clone_url
end
def ssh_clone_url
- _clone_url Rails.configuration.Services
["GitSSH"]["ExternalURL"], 'git@git.%s.arvadosapi.com:
'
+ _clone_url Rails.configuration.Services
.GitSSH.andand.ExternalURL, 'ssh://git@git.%s.arvadosapi.com
'
end
def https_clone_url
end
def https_clone_url
- _clone_url Rails.configuration.Services
["GitHTTP"]["ExternalURL"]
, 'https://git.%s.arvadosapi.com/'
+ _clone_url Rails.configuration.Services
.GitHTTP.andand.ExternalURL
, 'https://git.%s.arvadosapi.com/'
end
def _clone_url config_var, default_base_fmt
end
def _clone_url config_var, default_base_fmt
- configured_base = config_var
+ if not config_var
+ return ""
+ end
prefix = new_record? ? Rails.configuration.ClusterID : uuid[0,5]
prefix = new_record? ? Rails.configuration.ClusterID : uuid[0,5]
- if prefix == Rails.configuration.ClusterID and configured_base != true
- base = configured_base
+ if prefix == Rails.configuration.ClusterID and config_var != URI("")
+ base = config_var
+ else
+ base = URI(default_base_fmt % prefix)
+ end
+ if base.scheme == "ssh"
+ '%s@%s:%s.git' % [base.user, base.host, name]
else
else
- base = default_base_fmt % prefix
+ '%s%s.git' % [base, name]
end
end
- '%s%s.git' % [base, name]
end
end
end
end