Simplify `build_gitlab_shell_ssh_path_prefix`

e1522ec8 · Robert Speicher · 15291c89 · e1522ec8
Commit e1522ec8 authored Nov 29, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

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

No files found.
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -33,13 +33,15 @@ class Settings < Settingslogic
    end

    def build_gitlab_shell_ssh_path_prefix
+      user_host = "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}"
+
      if gitlab_shell.ssh_port != 22
-        "ssh://#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:#{gitlab_shell.ssh_port}/"
+        "ssh://#{user_host}:#{gitlab_shell.ssh_port}/"
      else
        if gitlab_shell.ssh_host.include? ':'
-          "[#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}]:"
+          "[#{user_host}]:"
        else
-          "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}:"
+          "#{user_host}:"
        end
      end
    end