Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-07 12:10:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-07 12:10:00 +0300
commitf4a9d976cf03888fbfd81ab9813720f4e8ec8056 (patch)
treed67ce5ca8885d3f836b89be0a96d52ba602aa533 /workhorse/internal/upstream
parent28b137b0948e74805040b0c069ea09ff91f06143 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/upstream')
-rw-r--r--workhorse/internal/upstream/routes.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/workhorse/internal/upstream/routes.go b/workhorse/internal/upstream/routes.go
index 95c9b99b833..c889f87ed96 100644
--- a/workhorse/internal/upstream/routes.go
+++ b/workhorse/internal/upstream/routes.go
@@ -3,7 +3,6 @@ package upstream
import (
"net/http"
"net/url"
- "path"
"regexp"
"github.com/gorilla/websocket"
@@ -222,8 +221,7 @@ func configureRoutes(u *upstream) {
requestBodyUploader := upload.RequestBody(api, signingProxy, preparer)
mimeMultipartUploader := upload.Multipart(api, signingProxy, preparer)
- uploadPath := path.Join(u.DocumentRoot, "uploads/tmp")
- tempfileMultipartProxy := upload.SkipRailsPreAuthMultipart(uploadPath, api, proxy, preparer)
+ tempfileMultipartProxy := upload.FixedPreAuthMultipart(api, proxy, preparer)
ciAPIProxyQueue := queueing.QueueRequests("ci_api_job_requests", tempfileMultipartProxy, u.APILimit, u.APIQueueLimit, u.APIQueueTimeout)
ciAPILongPolling := builds.RegisterHandler(ciAPIProxyQueue, redis.WatchKey, u.APICILongPollingDuration)