Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2a8a0bc

Browse files
update API routes as well
1 parent 252b145 commit 2a8a0bc

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

‎routers/api/v1/api.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ func Routes() *web.Router {
11961196
// (repo scope)
11971197
m.Group("/starred", func() {
11981198
m.Get("", user.GetMyStarredRepos)
1199-
m.Group("/{username}/{reponame}", func() {
1199+
m.Group("/{username}/{group_id}?/{reponame}", func() {
12001200
m.Get("", user.IsStarring)
12011201
m.Put("", user.Star)
12021202
m.Delete("", user.Unstar)
@@ -1248,7 +1248,7 @@ func Routes() *web.Router {
12481248
// (repo scope)
12491249
m.Post("/migrate", reqToken(), bind(api.MigrateRepoOptions{}), repo.Migrate)
12501250

1251-
m.Group("/{username}/{reponame}", func() {
1251+
m.Group("/{username}/{group_id}?/{reponame}", func() {
12521252
m.Get("/compare/*", reqRepoReader(unit.TypeCode), repo.CompareDiff)
12531253

12541254
m.Combo("").Get(reqAnyRepoReader(), repo.Get).
@@ -1539,11 +1539,11 @@ func Routes() *web.Router {
15391539

15401540
// Artifacts direct download endpoint authenticates via signed url
15411541
// it is protected by the "sig" parameter (to help to access private repo), so no need to use other middlewares
1542-
m.Get("/repos/{username}/{reponame}/actions/artifacts/{artifact_id}/zip/raw", repo.DownloadArtifactRaw)
1542+
m.Get("/repos/{username}/{group_id}?/{reponame}/actions/artifacts/{artifact_id}/zip/raw", repo.DownloadArtifactRaw)
15431543

15441544
// Notifications (requires notifications scope)
15451545
m.Group("/repos", func() {
1546-
m.Group("/{username}/{reponame}", func() {
1546+
m.Group("/{username}/{group_id}?/{reponame}", func() {
15471547
m.Combo("/notifications", reqToken()).
15481548
Get(notify.ListRepoNotifications).
15491549
Put(notify.ReadRepoNotifications)
@@ -1554,7 +1554,7 @@ func Routes() *web.Router {
15541554
m.Group("/repos", func() {
15551555
m.Get("/issues/search", repo.SearchIssues)
15561556

1557-
m.Group("/{username}/{reponame}", func() {
1557+
m.Group("/{username}/{group_id}?/{reponame}", func() {
15581558
m.Group("/issues", func() {
15591559
m.Combo("").Get(repo.ListIssues).
15601560
Post(reqToken(), mustNotBeArchived, bind(api.CreateIssueOption{}), reqRepoReader(unit.TypeIssues), repo.CreateIssue)

‎tests/integration/pull_merge_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ func TestCantMergeUnrelated(t *testing.T) {
293293
OwnerID: user1.ID,
294294
Name: "repo1",
295295
})
296-
path := repo_model.RepoPath(user1.Name, repo1.Name)
296+
path := repo_model.RepoPath(user1.Name, repo1.Name, repo1.GroupID)
297297

298298
err := git.NewCommand("read-tree", "--empty").Run(git.DefaultContext, &git.RunOpts{Dir: path})
299299
assert.NoError(t, err)

‎tests/integration/repo_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ func TestGenerateRepository(t *testing.T) {
534534
assert.NoError(t, err)
535535
assert.NotNil(t, generatedRepo)
536536

537-
exist, err := util.IsExist(repo_model.RepoPath(user2.Name, generatedRepo.Name))
537+
exist, err := util.IsExist(repo_model.RepoPath(user2.Name, generatedRepo.Name, generatedRepo.GroupID))
538538
assert.NoError(t, err)
539539
assert.True(t, exist)
540540

@@ -545,7 +545,7 @@ func TestGenerateRepository(t *testing.T) {
545545

546546
// a failed creating because some mock data
547547
// create the repository directory so that the creation will fail after database record created.
548-
assert.NoError(t, os.MkdirAll(repo_model.RepoPath(user2.Name, "generated-from-template-44"), os.ModePerm))
548+
assert.NoError(t, os.MkdirAll(repo_model.RepoPath(user2.Name, "generated-from-template-44", generatedRepo.GroupID), os.ModePerm))
549549

550550
generatedRepo2, err := repo_service.GenerateRepository(db.DefaultContext, user2, user2, repo44, repo_service.GenerateRepoOptions{
551551
Name: "generated-from-template-44",
@@ -557,7 +557,7 @@ func TestGenerateRepository(t *testing.T) {
557557
// assert the cleanup is successful
558558
unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: generatedRepo.Name})
559559

560-
exist, err = util.IsExist(repo_model.RepoPath(user2.Name, generatedRepo.Name))
560+
exist, err = util.IsExist(repo_model.RepoPath(user2.Name, generatedRepo.Name, generatedRepo.GroupID))
561561
assert.NoError(t, err)
562562
assert.False(t, exist)
563563
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /