Commit 403e5582 authored by Alessio Caiazza's avatar Alessio Caiazza

Merge branch 'jh-group_import_ui' into 'master'

Add route for group imports via the UI

See merge request gitlab-org/gitlab-workhorse!493
parents 86f05c25 d2a1b602
No related merge requests found
---
title: Add routes for Group import via the UI
merge_request: 493
author:
type: added
......@@ -227,6 +227,8 @@ func (u *upstream) configureRoutes() {
// Project Import via UI upload acceleration
route("POST", importPattern+`gitlab_project`, upload.Accelerate(api, signingProxy)),
// Group Import via UI upload acceleration
route("POST", importPattern+`gitlab_group`, upload.Accelerate(api, signingProxy)),
// Explicitly proxy API requests
route("", apiPattern, proxy),
......
......@@ -124,6 +124,7 @@ func TestAcceleratedUpload(t *testing.T) {
{"POST", `/api/v4/groups/import`, true},
{"POST", `/api/v4/projects/import`, true},
{"POST", `/import/gitlab_project`, true},
{"POST", `/import/gitlab_group`, true},
{"POST", `/api/v4/projects/9001/packages/pypi`, true},
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment