From abe69f895411c4ce357650f7a96073a1ee8bc610 Mon Sep 17 00:00:00 2001 From: bellatriks Date: Sat, 11 Jul 2020 04:02:21 +0300 Subject: [PATCH 1/2] Add ssh port to repository access url --- app/models/concerns/gitolitable/urls.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/gitolitable/urls.rb b/app/models/concerns/gitolitable/urls.rb index 46c90be01..e71a5cbb8 100644 --- a/app/models/concerns/gitolitable/urls.rb +++ b/app/models/concerns/gitolitable/urls.rb @@ -23,7 +23,7 @@ def go_access_path def ssh_url - "ssh://#{RedmineGitHosting::Config.gitolite_user}@#{RedmineGitHosting::Config.ssh_server_domain}/#{git_access_path}" + "ssh://#{RedmineGitHosting::Config.gitolite_user}@#{RedmineGitHosting::Config.ssh_server_domain}:#{RedmineGitHosting::Config.gitolite_server_port}/#{git_access_path}" end From 8235640a293608c59aeca94f9ce2a2280bc19977 Mon Sep 17 00:00:00 2001 From: bellatriks Date: Sat, 11 Jul 2020 09:38:55 +0300 Subject: [PATCH 2/2] Repository ssh url will have a ssh port number only if it is not default one(22) --- app/models/concerns/gitolitable/urls.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/gitolitable/urls.rb b/app/models/concerns/gitolitable/urls.rb index e71a5cbb8..bdcac73f8 100644 --- a/app/models/concerns/gitolitable/urls.rb +++ b/app/models/concerns/gitolitable/urls.rb @@ -23,7 +23,11 @@ def go_access_path def ssh_url - "ssh://#{RedmineGitHosting::Config.gitolite_user}@#{RedmineGitHosting::Config.ssh_server_domain}:#{RedmineGitHosting::Config.gitolite_server_port}/#{git_access_path}" + if RedmineGitHosting::Config.gitolite_server_port == '22' + "ssh://#{RedmineGitHosting::Config.gitolite_user}@#{RedmineGitHosting::Config.ssh_server_domain}/#{git_access_path}" + else + "ssh://#{RedmineGitHosting::Config.gitolite_user}@#{RedmineGitHosting::Config.ssh_server_domain}:#{RedmineGitHosting::Config.gitolite_server_port}/#{git_access_path}" + end end