Merge pull request #8449 from choppsv1/ipv6_addr_fix

Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
2015-02-04 14:51:06 -08:00 · 2015-02-04 14:51:06 -08:00 · 028b58a987
parent 72db0c4dc0 0ed4ae7295
commit 028b58a987
1 changed files with 5 additions and 1 deletions
--- 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