Skip to content

Commit ea2d306

Browse files
GamerGirlandCoGamerGirlandCo
committed
make it more apparent in URLs that a repo is part of a group
1 parent 1bba81a commit ea2d306

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎routers/api/v1/api.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ func Routes() *web.Router {
11851185
m.Delete("", user.Unstar)
11861186
}
11871187
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1188-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1188+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
11891189
}, reqStarsEnabled(), tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
11901190
m.Get("/times", repo.ListMyTrackedTimes)
11911191
m.Get("/stopwatches", repo.GetStopwatches)
@@ -1520,13 +1520,13 @@ func Routes() *web.Router {
15201520
m.Methods("HEAD,GET", "/{ball_type:tarball|zipball|bundle}/*", reqRepoReader(unit.TypeCode), context.ReferencesGitRepo(true), repo.DownloadArchive)
15211521
}
15221522
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1523-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1523+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
15241524
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
15251525

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

15311531
// Notifications (requires notifications scope)
15321532
m.Group("/repos", func() {
@@ -1536,7 +1536,7 @@ func Routes() *web.Router {
15361536
Put(notify.ReadRepoNotifications)
15371537
}
15381538
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1539-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1539+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
15401540
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryNotification))
15411541

15421542
// Issue (requires issue scope)
@@ -1656,7 +1656,7 @@ func Routes() *web.Router {
16561656
})
16571657
}
16581658
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1659-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1659+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
16601660
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryIssue))
16611661

16621662
// NOTE: these are Gitea package management API - see packages.CommonRoutes and packages.DockerContainerRoutes for endpoints that implement package manager APIs
@@ -1803,8 +1803,8 @@ func Routes() *web.Router {
18031803
m.Group("/{username}", func() {
18041804
m.Post("/{reponame}", admin.AdoptRepository)
18051805
m.Delete("/{reponame}", admin.DeleteUnadoptedRepository)
1806-
m.Post("/{group_id}/{reponame}", admin.AdoptGroupRepository)
1807-
m.Delete("/{group_id}/{reponame}", admin.DeleteUnadoptedRepositoryInGroup)
1806+
m.Post("/group/{group_id}/{reponame}", admin.AdoptGroupRepository)
1807+
m.Delete("/group/{group_id}/{reponame}", admin.DeleteUnadoptedRepositoryInGroup)
18081808
})
18091809

18101810
})

‎routers/common/lfs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ func AddOwnerRepoGitLFSRoutes(m *web.Router, middlewares ...any) {
2929
m.Any("/*", http.NotFound)
3030
}
3131
m.Group("/{username}/{reponame}/info/lfs", fn, append([]any{web.RouterMockPoint(RouterMockPointCommonLFS)}, middlewares...)...)
32-
m.Group("/{username}/{group_id}/{reponame}/info/lfs", fn, append([]any{web.RouterMockPoint(RouterMockPointCommonLFS)}, middlewares...)...)
32+
m.Group("/{username}/group/{group_id}/{reponame}/info/lfs", fn, append([]any{web.RouterMockPoint(RouterMockPointCommonLFS)}, middlewares...)...)
3333
}

‎routers/private/internal.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ func Routes() *web.Router {
6262
r.Post("/ssh/authorized_keys", AuthorizedPublicKeyByContent)
6363
r.Post("/ssh/{id}/update/{repoid}", UpdatePublicKeyInRepo)
6464
r.Post("/ssh/log", bind(private.SSHLogOption{}), SSHLog)
65-
r.Post("/hook/pre-receive/{owner}/{group_id}/{repo}", RepoAssignment, bind(private.HookOptions{}), HookPreReceive)
65+
r.Post("/hook/pre-receive/{owner}/group/{group_id}/{repo}", RepoAssignment, bind(private.HookOptions{}), HookPreReceive)
6666
r.Post("/hook/pre-receive/{owner}/{repo}", RepoAssignment, bind(private.HookOptions{}), HookPreReceive)
67-
r.Post("/hook/post-receive/{owner}/{group_id}/{repo}", context.OverrideContext(), bind(private.HookOptions{}), HookPostReceive)
67+
r.Post("/hook/post-receive/{owner}/group/{group_id}/{repo}", context.OverrideContext(), bind(private.HookOptions{}), HookPostReceive)
6868
r.Post("/hook/post-receive/{owner}/{repo}", context.OverrideContext(), bind(private.HookOptions{}), HookPostReceive)
69-
r.Post("/hook/proc-receive/{owner}/{group_id}/{repo}", context.OverrideContext(), RepoAssignment, bind(private.HookOptions{}), HookProcReceive)
69+
r.Post("/hook/proc-receive/{owner}/group/{group_id}/{repo}", context.OverrideContext(), RepoAssignment, bind(private.HookOptions{}), HookProcReceive)
7070
r.Post("/hook/proc-receive/{owner}/{repo}", context.OverrideContext(), RepoAssignment, bind(private.HookOptions{}), HookProcReceive)
71-
r.Post("/hook/set-default-branch/{owner}/{group_id}/{repo}/{branch}", RepoAssignment, SetDefaultBranch)
71+
r.Post("/hook/set-default-branch/{owner}/group/{group_id}/{repo}/{branch}", RepoAssignment, SetDefaultBranch)
7272
r.Post("/hook/set-default-branch/{owner}/{repo}/{branch}", RepoAssignment, SetDefaultBranch)
7373
r.Get("/serv/none/{keyid}", ServNoCommand)
7474
r.Get("/serv/command/{keyid}/{owner}/{repo}", ServCommand)

‎routers/web/githttp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ func addOwnerRepoGitHTTPRouters(m *web.Router) {
2424
m.Methods("GET,OPTIONS", "/objects/pack/pack-{file:[0-9a-f]{40,64}}.idx", repo.GetIdxFile)
2525
}
2626
m.Group("/{username}/{reponame}", fn, optSignInIgnoreCsrf, repo.HTTPGitEnabledHandler, repo.CorsHandler(), context.UserAssignmentWeb())
27-
m.Group("/{username}/{group_id}/{reponame}", fn, optSignInIgnoreCsrf, repo.HTTPGitEnabledHandler, repo.CorsHandler(), context.UserAssignmentWeb())
27+
m.Group("/{username}/group/{group_id}/{reponame}", fn, optSignInIgnoreCsrf, repo.HTTPGitEnabledHandler, repo.CorsHandler(), context.UserAssignmentWeb())
2828
}

‎routers/web/web.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ func registerWebRoutes(m *web.Router) {
10781078
})
10791079
}
10801080
m.Group("/{username}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1081-
m.Group("/{username}/{group_id}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1081+
m.Group("/{username}/group/{group_id}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
10821082
// end "/{username}/{group_id}/{reponame}/-": migrate
10831083

10841084
settingsFn := func() {
@@ -1184,18 +1184,18 @@ func registerWebRoutes(m *web.Router) {
11841184
reqSignIn, context.RepoAssignment, reqRepoAdmin,
11851185
ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
11861186
)
1187-
m.Group("/{username}/{group_id}/{reponame}/settings", settingsFn,
1187+
m.Group("/{username}/group/{group_id}/{reponame}/settings", settingsFn,
11881188
reqSignIn, context.RepoAssignment, reqRepoAdmin,
11891189
ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
11901190
)
11911191
// end "/{username}/{reponame}/settings"
11921192

11931193
// user/org home, including rss feeds like "/{username}/{reponame}.rss"
11941194
m.Get("/{username}/{reponame}", optSignIn, context.RepoAssignment, context.RepoRefByType(git.RefTypeBranch), repo.SetEditorconfigIfExists, repo.Home)
1195+
m.Get("/{username}/group/{group_id}/{reponame}", optSignIn, context.RepoAssignment, context.RepoRefByType(git.RefTypeBranch), repo.SetEditorconfigIfExists, repo.Home)
11951196

11961197
m.Post("/{username}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1197-
m.Post("/{username}/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1198-
1198+
m.Post("/{username}/group/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
11991199
rootRepoFn := func() {
12001200
m.Get("/find/*", repo.FindFiles)
12011201
m.Group("/tree-list", func() {
@@ -1215,7 +1215,7 @@ func registerWebRoutes(m *web.Router) {
12151215
m.Get("/pulls/new/*", repo.PullsNewRedirect)
12161216
}
12171217
m.Group("/{username}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1218-
m.Group("/{username}/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1218+
m.Group("/{username}/group/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
12191219
// end "/{username}/{group_id}/{reponame}": repo code: find, compare, list
12201220

12211221
addIssuesPullsViewRoutes := func() {
@@ -1233,9 +1233,9 @@ func registerWebRoutes(m *web.Router) {
12331233
})
12341234
}
12351235
// FIXME: many "pulls" requests are sent to "issues" endpoints correctly, so the issue endpoints have to tolerate pull request permissions at the moment
1236-
m.Group("/{username}/{group_id}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
1236+
m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
12371237
m.Group("/{username}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
1238-
m.Group("/{username}/{group_id}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
1238+
m.Group("/{username}/group/{group_id}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
12391239
m.Group("/{username}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
12401240

12411241
repoIssueAttachmentFn := func() {
@@ -1246,15 +1246,15 @@ func registerWebRoutes(m *web.Router) {
12461246
m.Get("/issues/suggestions", repo.IssueSuggestions)
12471247
}
12481248

1249-
m.Group("/{username}/{group_id}/{reponame}", repoIssueAttachmentFn, optSignIn, context.RepoAssignment, reqRepoIssuesOrPullsReader) // issue/pull attachments, labels, milestones
1250-
m.Group("/{username}/{reponame}", repoIssueAttachmentFn, optSignIn, context.RepoAssignment, reqRepoIssuesOrPullsReader) // issue/pull attachments, labels, milestones
1249+
m.Group("/{username}/group/{group_id}/{reponame}", repoIssueAttachmentFn, optSignIn, context.RepoAssignment, reqRepoIssuesOrPullsReader) // issue/pull attachments, labels, milestones
1250+
m.Group("/{username}/{reponame}", repoIssueAttachmentFn, optSignIn, context.RepoAssignment, reqRepoIssuesOrPullsReader) // issue/pull attachments, labels, milestones
12511251
// end "/{username}/{group_id}/{reponame}": view milestone, label, issue, pull, etc
12521252

12531253
issueViewFn := func() {
12541254
m.Get("", repo.Issues)
12551255
m.Get("/{index}", repo.ViewIssue)
12561256
}
1257-
m.Group("/{username}/{group_id}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
1257+
m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
12581258
m.Group("/{username}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
12591259
// end "/{username}/{group_id}/{reponame}": issue/pull list, issue/pull view, external tracker
12601260

@@ -1346,7 +1346,7 @@ func registerWebRoutes(m *web.Router) {
13461346
}, reqUnitPullsReader)
13471347
m.Post("/pull/{index}/target_branch", reqUnitPullsReader, repo.UpdatePullRequestTarget)
13481348
}
1349-
m.Group("/{username}/{group_id}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
1349+
m.Group("/{username}/group/{group_id}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
13501350
m.Group("/{username}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
13511351
// end "/{username}/{group_id}/{reponame}": create or edit issues, pulls, labels, milestones
13521352

@@ -1399,7 +1399,7 @@ func registerWebRoutes(m *web.Router) {
13991399

14001400
m.Combo("/fork").Get(repo.Fork).Post(web.Bind(forms.CreateRepoForm{}), repo.ForkPost)
14011401
}
1402-
m.Group("/{username}/{group_id}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
1402+
m.Group("/{username}/group/{group_id}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
14031403
m.Group("/{username}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
14041404
// end "/{username}/{group_id}/{reponame}": repo code
14051405

@@ -1412,7 +1412,7 @@ func registerWebRoutes(m *web.Router) {
14121412
}, ctxDataSet("EnableFeed", setting.Other.EnableFeed))
14131413
m.Post("/tags/delete", reqSignIn, reqRepoCodeWriter, context.RepoMustNotBeArchived(), repo.DeleteTag)
14141414
}
1415-
m.Group("/{username}/{group_id}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
1415+
m.Group("/{username}/group/{group_id}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
14161416
m.Group("/{username}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
14171417
// end "/{username}/{group_id}/{reponame}": repo tags
14181418

@@ -1438,29 +1438,29 @@ func registerWebRoutes(m *web.Router) {
14381438
m.Post("/edit/*", web.Bind(forms.EditReleaseForm{}), repo.EditReleasePost)
14391439
}, reqSignIn, context.RepoMustNotBeArchived(), reqRepoReleaseWriter, repo.CommitInfoCache)
14401440
}
1441-
m.Group("/{username}/{group_id}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
1441+
m.Group("/{username}/group/{group_id}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
14421442
m.Group("/{username}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
14431443
// end "/{username}/{group_id}/{reponame}": repo releases
14441444

14451445
repoAttachmentsFn := func() { // to maintain compatibility with old attachments
14461446
m.Get("/attachments/{uuid}", repo.GetAttachment)
14471447
}
1448-
m.Group("/{username}/{group_id}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
1448+
m.Group("/{username}/group/{group_id}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
14491449
m.Group("/{username}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
14501450
// end "/{username}/{group_id}/{reponame}": compatibility with old attachments
14511451

14521452
repoTopicFn := func() {
14531453
m.Post("/topics", repo.TopicsPost)
14541454
}
1455-
m.Group("/{username}/{group_id}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
1455+
m.Group("/{username}/group/{group_id}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
14561456
m.Group("/{username}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
14571457

14581458
repoPackageFn := func() {
14591459
if setting.Packages.Enabled {
14601460
m.Get("/packages", repo.Packages)
14611461
}
14621462
}
1463-
m.Group("/{username}/{group_id}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
1463+
m.Group("/{username}/group/{group_id}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
14641464
m.Group("/{username}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
14651465

14661466
repoProjectsFn := func() {
@@ -1488,7 +1488,7 @@ func registerWebRoutes(m *web.Router) {
14881488
})
14891489
}, reqRepoProjectsWriter, context.RepoMustNotBeArchived())
14901490
}
1491-
m.Group("/{username}/{group_id}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
1491+
m.Group("/{username}/group/{group_id}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
14921492
m.Group("/{username}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
14931493
// end "/{username}/{group_id}/{reponame}/projects"
14941494

@@ -1523,7 +1523,7 @@ func registerWebRoutes(m *web.Router) {
15231523
m.Get("/badge.svg", actions.GetWorkflowBadge)
15241524
})
15251525
}
1526-
m.Group("/{username}/{group_id}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
1526+
m.Group("/{username}/group/{group_id}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
15271527
m.Group("/{username}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
15281528
// end "/{username}/{group_id}/{reponame}/actions"
15291529

@@ -1539,7 +1539,7 @@ func registerWebRoutes(m *web.Router) {
15391539
m.Get("/commit/{sha:[a-f0-9]{7,64}}.{ext:patch|diff}", repo.RawDiff)
15401540
m.Get("/raw/*", repo.WikiRaw)
15411541
}
1542-
m.Group("/{username}/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
1542+
m.Group("/{username}/group/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
15431543
ctx.Data["PageIsWiki"] = true
15441544
ctx.Data["CloneButtonOriginLink"] = ctx.Repo.Repository.WikiCloneLink(ctx, ctx.Doer)
15451545
})
@@ -1569,7 +1569,7 @@ func registerWebRoutes(m *web.Router) {
15691569
})
15701570
}, reqUnitCodeReader)
15711571
}
1572-
m.Group("/{username}/{group_id}/{reponame}/activity", activityFn,
1572+
m.Group("/{username}/group/{group_id}/{reponame}/activity", activityFn,
15731573
optSignIn, context.RepoAssignment, repo.MustBeNotEmpty,
15741574
context.RequireUnitReader(unit.TypeCode, unit.TypeIssues, unit.TypePullRequests, unit.TypeReleases),
15751575
)
@@ -1607,7 +1607,7 @@ func registerWebRoutes(m *web.Router) {
16071607
})
16081608
})
16091609
}
1610-
m.Group("/{username}/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
1610+
m.Group("/{username}/group/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
16111611
m.Group("/{username}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
16121612
// end "/{username}/{group_id}/{reponame}/pulls/{index}": repo pull request
16131613

@@ -1691,7 +1691,7 @@ func registerWebRoutes(m *web.Router) {
16911691
m.Get("/commit/{sha:([a-f0-9]{7,64})}.{ext:patch|diff}", repo.MustBeNotEmpty, repo.RawDiff)
16921692
m.Post("/lastcommit/*", context.RepoRefByType(git.RefTypeCommit), repo.LastCommit)
16931693
}
1694-
m.Group("/{username}/{group_id}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1694+
m.Group("/{username}/group/{group_id}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
16951695
m.Group("/{username}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
16961696
// end "/{username}/{group_id}/{reponame}": repo code
16971697

@@ -1703,7 +1703,7 @@ func registerWebRoutes(m *web.Router) {
17031703
m.Post("/action/{action:watch|unwatch}", reqSignIn, repo.ActionWatch)
17041704
m.Post("/action/{action:accept_transfer|reject_transfer}", reqSignIn, repo.ActionTransfer)
17051705
}
1706-
m.Group("/{username}/{group_id}/{reponame}", fn, optSignIn, context.RepoAssignment)
1706+
m.Group("/{username}/group/{group_id}/{reponame}", fn, optSignIn, context.RepoAssignment)
17071707
m.Group("/{username}/{reponame}", fn, optSignIn, context.RepoAssignment)
17081708

17091709
common.AddOwnerRepoGitLFSRoutes(m, optSignInIgnoreCsrf, lfsServerEnabled) // "/{username}/{group_id}/{reponame}/{lfs-paths}": git-lfs support

0 commit comments

Comments
 (0)