Commit 028b58a9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #8449 from choppsv1/ipv6_addr_fix

Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
parents 72db0c4d 0ed4ae72
...@@ -12,10 +12,14 @@ class Settings < Settingslogic ...@@ -12,10 +12,14 @@ class Settings < Settingslogic
def build_gitlab_shell_ssh_path_prefix def build_gitlab_shell_ssh_path_prefix
if gitlab_shell.ssh_port != 22 if gitlab_shell.ssh_port != 22
"ssh://#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:#{gitlab_shell.ssh_port}/" "ssh://#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:#{gitlab_shell.ssh_port}/"
else
if gitlab_shell.ssh_host.include? ':'
"[#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}]:"
else else
"#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:" "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:"
end end
end end
end
def build_gitlab_url def build_gitlab_url
custom_port = gitlab_on_standard_port? ? nil : ":#{gitlab.port}" custom_port = gitlab_on_standard_port? ? nil : ":#{gitlab.port}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment