summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-08-29 14:27:05 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-08-29 14:27:05 +0000
commitb51770c66acf4ed7f1aa1df0019abcdb0e4cc130 (patch)
tree7558d9ca4740891f73304db199a52f3b2fa1bfc8 /spec/lib
parent4e2af302f69367b54375aa696d40db0cdb79ed5f (diff)
parent6391eeec3078f97fac6f6ef92ca0d8c8f0068667 (diff)
downloadgitlab-ce-b51770c66acf4ed7f1aa1df0019abcdb0e4cc130.tar.gz
Merge branch 'local-test-failures' into 'master'
git-user-related local test failures See merge request gitlab-org/gitlab-ce!31437
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/middleware/go_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/middleware/go_spec.rb b/spec/lib/gitlab/middleware/go_spec.rb
index f52095bf633..16595102375 100644
--- a/spec/lib/gitlab/middleware/go_spec.rb
+++ b/spec/lib/gitlab/middleware/go_spec.rb
@@ -202,7 +202,7 @@ describe Gitlab::Middleware::Go do
def expect_response_with_path(response, protocol, path)
repository_url = case protocol
when :ssh
- "ssh://git@#{Gitlab.config.gitlab.host}/#{path}.git"
+ "ssh://#{Gitlab.config.gitlab.user}@#{Gitlab.config.gitlab.host}/#{path}.git"
when :http, nil
"http://#{Gitlab.config.gitlab.host}/#{path}.git"
end