diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-31 18:10:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-31 18:10:17 +0000 |
| commit | febc637ca98cb72901745fc125154bcffc517e46 (patch) | |
| tree | 02bd564235b5df4529377aacdc05ad73f09c387c /workhorse | |
| parent | 19044caf6695065ff64e26355e830dbdc6719e54 (diff) | |
| download | gitlab-ce-febc637ca98cb72901745fc125154bcffc517e46.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse')
| -rw-r--r-- | workhorse/internal/upstream/routes.go | 4 | ||||
| -rw-r--r-- | workhorse/upload_test.go | 3 |
2 files changed, 7 insertions, 0 deletions
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}, |