Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")

0ed4ae72 · Christian E. Hopps · be206a51 · 0ed4ae72
Commit 0ed4ae72 authored Dec 14, 2014 by Christian E. Hopps
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

1_settings.rb config/initializers/1_settings.rb +5 -1

No files found.
--- 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