diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 15:08:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 15:08:16 +0300 |
| commit | 1fa79760ad2d4bd67f5c5a27f372a7533b9b7c69 (patch) | |
| tree | ffdfbd9113743831ff4f1290959a62cf6567fde5 /lib/gitlab/middleware | |
| parent | 82fa8a3d1e8466ef36b58604d20fcc145ea12118 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/middleware')
| -rw-r--r-- | lib/gitlab/middleware/go.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/middleware/go.rb b/lib/gitlab/middleware/go.rb index 53508938c49..abdbccd3aa8 100644 --- a/lib/gitlab/middleware/go.rb +++ b/lib/gitlab/middleware/go.rb @@ -53,8 +53,9 @@ module Gitlab repository_url = if Gitlab::CurrentSettings.enabled_git_access_protocol == 'ssh' shell = config.gitlab_shell + user = "#{shell.ssh_user}@" unless shell.ssh_user.empty? port = ":#{shell.ssh_port}" unless shell.ssh_port == 22 - "ssh://#{shell.ssh_user}@#{shell.ssh_host}#{port}/#{path}.git" + "ssh://#{user}#{shell.ssh_host}#{port}/#{path}.git" else "#{project_url}.git" end |