Merge branch 'gitaly-post-upload-pack' into 'master'

Make explicit that upload-pack is in Gitaly now

See merge request !189

internal/git/git-http_test.go

@@ -40,6 +40,11 @@ func TestHandleReceivePack(t *testing.T) {
 }
 
 func testHandlePostRpc(t *testing.T, action string, handler func(*GitHttpResponseWriter, *http.Request, *api.Response) error) {
+	defer func(oldTesting bool) {
+		Testing = oldTesting
+	}(Testing)
+	Testing = true
+
 	execCommand = fakeExecCommand
 	defer func() { execCommand = exec.Command }()
 

internal/git/upload-pack.go

@@ -28,7 +28,8 @@ func handleUploadPack(w *GitHttpResponseWriter, r *http.Request, a *api.Response
 	action := getService(r)
 	writePostRPCHeader(w, action)
 
-	if a.GitalyServer.Address == "" {
+	if Testing && a.GitalyServer.Address == "" {
+		// This code path is no longer reachable in GitLab 10.0
 		err = handleUploadPackLocally(a, r, buffer, w, action)
 	} else {
 		err = handleUploadPackWithGitaly(r.Context(), a, buffer, w)