diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 15:08:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 15:08:16 +0300 |
| commit | 1fa79760ad2d4bd67f5c5a27f372a7533b9b7c69 (patch) | |
| tree | ffdfbd9113743831ff4f1290959a62cf6567fde5 /config/settings.rb | |
| parent | 82fa8a3d1e8466ef36b58604d20fcc145ea12118 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/settings.rb')
| -rw-r--r-- | config/settings.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/settings.rb b/config/settings.rb index b6225be4b54..144a068ef2a 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -44,7 +44,8 @@ class Settings < Settingslogic end def build_gitlab_shell_ssh_path_prefix - user_host = "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}" + user = "#{gitlab_shell.ssh_user}@" unless gitlab_shell.ssh_user.empty? + user_host = "#{user}#{gitlab_shell.ssh_host}" if gitlab_shell.ssh_port != 22 "ssh://#{user_host}:#{gitlab_shell.ssh_port}/" |