diff options
| author | Christian E. Hopps <chopps@gmail.com> | 2014-12-14 21:01:02 -0500 |
|---|---|---|
| committer | Christian E. Hopps <chopps@gmail.com> | 2014-12-15 07:02:07 -0500 |
| commit | 0ed4ae7295ef1cf5d3a63be64315738a19a178b1 (patch) | |
| tree | 4d70100965b99c41f1c484a82940c77b09edbd87 /config | |
| parent | be206a514235fe1ca7f35cf018c44202a331cb87 (diff) | |
| download | gitlab-ce-0ed4ae7295ef1cf5d3a63be64315738a19a178b1.tar.gz | |
Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 27bb83784ba..d7af4e10cdc 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -13,7 +13,11 @@ class Settings < Settingslogic if gitlab_shell.ssh_port != 22 "ssh://#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:#{gitlab_shell.ssh_port}/" else - "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:" + if gitlab_shell.ssh_host.include? ':' + "[#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}]:" + else + "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:" + end end end |