From febc637ca98cb72901745fc125154bcffc517e46 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 31 Aug 2022 18:10:17 +0000
Subject: Add latest changes from gitlab-org/gitlab@master
---
workhorse/internal/upstream/routes.go | 4 ++++
workhorse/upload_test.go | 3 +++
2 files changed, 7 insertions(+)
(limited to 'workhorse')
diff --git a/workhorse/internal/upstream/routes.go b/workhorse/internal/upstream/routes.go
index 288871d558d..057d3e7470c 100644
--- a/workhorse/internal/upstream/routes.go
+++ b/workhorse/internal/upstream/routes.go
@@ -329,6 +329,10 @@ func configureRoutes(u *upstream) {
u.route("POST", apiPattern+`v4/projects\z`, tempfileMultipartProxy),
u.route("PUT", apiProjectPattern+`\z`, tempfileMultipartProxy),
+ // Group Avatar
+ u.route("POST", apiPattern+`v4/groups\z`, tempfileMultipartProxy),
+ u.route("PUT", apiPattern+`v4/groups/[^/]+\z`, tempfileMultipartProxy),
+
// Explicitly proxy API requests
u.route("", apiPattern, proxy),
u.route("", ciAPIPattern, proxy),
diff --git a/workhorse/upload_test.go b/workhorse/upload_test.go
index fd4844220b9..81df444d158 100644
--- a/workhorse/upload_test.go
+++ b/workhorse/upload_test.go
@@ -135,6 +135,9 @@ func TestAcceleratedUpload(t *testing.T) {
{"POST", `/api/graphql`, false},
{"POST", `/api/v4/topics`, false},
{"PUT", `/api/v4/topics`, false},
+ {"POST", `/api/v4/groups`, false},
+ {"PUT", `/api/v4/groups/5`, false},
+ {"PUT", `/api/v4/groups/group%2Fsubgroup`, false},
{"PUT", "/api/v4/projects/9001/packages/nuget/v1/files", true},
{"PUT", "/api/v4/projects/group%2Fproject/packages/nuget/v1/files", true},
{"PUT", "/api/v4/projects/group%2Fsubgroup%2Fproject/packages/nuget/v1/files", true},
--
cgit v1.2.1