From 0c872e02b2c822e3397515ec324051ff540f0cd5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Dec 2022 14:22:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-7-stable-ee --- config/settings.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'config/settings.rb') diff --git a/config/settings.rb b/config/settings.rb index 51d54817646..34acb09b9ed 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -42,12 +42,10 @@ class Settings < Settingslogic if gitlab_shell.ssh_port != 22 "ssh://#{user_host}:#{gitlab_shell.ssh_port}/" + elsif gitlab_shell.ssh_host.include? ':' + "[#{user_host}]:" else - if gitlab_shell.ssh_host.include? ':' - "[#{user_host}]:" - else - "#{user_host}:" - end + "#{user_host}:" end end -- cgit v1.2.3