提交 028b58a9 编写于 作者: D Dmitriy Zaporozhets

Merge pull request #8449 from choppsv1/ipv6_addr_fix

Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册