diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-04 14:51:06 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-04 14:51:06 -0800 |
| commit | 028b58a987b955529a9f82a853a6cf5645742eb9 (patch) | |
| tree | cd7a20fe953ea23e94c129a34788f6e6f01bf519 /config | |
| parent | 72db0c4dc0a3810503ae7b0517d3aa925d88dc1c (diff) | |
| parent | 0ed4ae7295ef1cf5d3a63be64315738a19a178b1 (diff) | |
| download | gitlab-ce-028b58a987b955529a9f82a853a6cf5645742eb9.tar.gz | |
Merge pull request #8449 from choppsv1/ipv6_addr_fix
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 24f39f5b3c1..4e015f1646b 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 |