Skip to content

Commit f79fca7

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

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
@@ -1202,7 +1202,7 @@ func Routes() *web.Router {
12021202
m.Delete("", user.Unstar)
12031203
}
12041204
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1205-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1205+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
12061206
}, reqStarsEnabled(), tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
12071207
m.Get("/times", repo.ListMyTrackedTimes)
12081208
m.Get("/stopwatches", repo.GetStopwatches)
@@ -1537,13 +1537,13 @@ func Routes() *web.Router {
15371537
m.Methods("HEAD,GET", "/{ball_type:tarball|zipball|bundle}/*", reqRepoReader(unit.TypeCode), repo.DownloadArchive)
15381538
}
15391539
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1540-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1540+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
15411541
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
15421542

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

15481548
// Notifications (requires notifications scope)
15491549
m.Group("/repos", func() {
@@ -1553,7 +1553,7 @@ func Routes() *web.Router {
15531553
Put(notify.ReadRepoNotifications)
15541554
}
15551555
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1556-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1556+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
15571557
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryNotification))
15581558

15591559
// Issue (requires issue scope)
@@ -1673,7 +1673,7 @@ func Routes() *web.Router {
16731673
})
16741674
}
16751675
m.Group("/{username}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1676-
m.Group("/{username}/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
1676+
m.Group("/{username}/group/{group_id}/{reponame}", fn, repoAssignment(), checkTokenPublicOnly())
16771677
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryIssue))
16781678

16791679
// NOTE: these are Gitea package management API - see packages.CommonRoutes and packages.DockerContainerRoutes for endpoints that implement package manager APIs
@@ -1820,8 +1820,8 @@ func Routes() *web.Router {
18201820
m.Group("/{username}", func() {
18211821
m.Post("/{reponame}", admin.AdoptRepository)
18221822
m.Delete("/{reponame}", admin.DeleteUnadoptedRepository)
1823-
m.Post("/{group_id}/{reponame}", admin.AdoptGroupRepository)
1824-
m.Delete("/{group_id}/{reponame}", admin.DeleteUnadoptedRepositoryInGroup)
1823+
m.Post("/group/{group_id}/{reponame}", admin.AdoptGroupRepository)
1824+
m.Delete("/group/{group_id}/{reponame}", admin.DeleteUnadoptedRepositoryInGroup)
18251825
})
18261826

18271827
})

‎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
@@ -1077,7 +1077,7 @@ func registerWebRoutes(m *web.Router) {
10771077
})
10781078
}
10791079
m.Group("/{username}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1080-
m.Group("/{username}/{group_id}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1080+
m.Group("/{username}/group/{group_id}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
10811081
// end "/{username}/{group_id}/{reponame}/-": migrate
10821082

10831083
settingsFn := func() {
@@ -1173,18 +1173,18 @@ func registerWebRoutes(m *web.Router) {
11731173
reqSignIn, context.RepoAssignment, reqRepoAdmin,
11741174
ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
11751175
)
1176-
m.Group("/{username}/{group_id}/{reponame}/settings", settingsFn,
1176+
m.Group("/{username}/group/{group_id}/{reponame}/settings", settingsFn,
11771177
reqSignIn, context.RepoAssignment, reqRepoAdmin,
11781178
ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
11791179
)
11801180
// end "/{username}/{group_id}/{reponame}/settings"
11811181

11821182
// user/org home, including rss feeds like "/{username}/{group_id}/{reponame}.rss"
11831183
m.Get("/{username}/{reponame}", optSignIn, context.RepoAssignment, context.RepoRefByType(git.RefTypeBranch), repo.SetEditorconfigIfExists, repo.Home)
1184-
m.Get("/{username}/{group_id}/{reponame}", optSignIn, context.RepoAssignment, context.RepoRefByType(git.RefTypeBranch), repo.SetEditorconfigIfExists, repo.Home)
1184+
m.Get("/{username}/group/{group_id}/{reponame}", optSignIn, context.RepoAssignment, context.RepoRefByType(git.RefTypeBranch), repo.SetEditorconfigIfExists, repo.Home)
11851185

11861186
m.Post("/{username}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1187-
m.Post("/{username}/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1187+
m.Post("/{username}/group/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
11881188
rootRepoFn := func() {
11891189
m.Get("/find/*", repo.FindFiles)
11901190
m.Group("/tree-list", func() {
@@ -1204,7 +1204,7 @@ func registerWebRoutes(m *web.Router) {
12041204
m.Get("/pulls/new/*", repo.PullsNewRedirect)
12051205
}
12061206
m.Group("/{username}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1207-
m.Group("/{username}/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1207+
m.Group("/{username}/group/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
12081208
// end "/{username}/{group_id}/{reponame}": repo code: find, compare, list
12091209

12101210
addIssuesPullsViewRoutes := func() {
@@ -1222,9 +1222,9 @@ func registerWebRoutes(m *web.Router) {
12221222
})
12231223
}
12241224
// FIXME: many "pulls" requests are sent to "issues" endpoints correctly, so the issue endpoints have to tolerate pull request permissions at the moment
1225-
m.Group("/{username}/{group_id}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
1225+
m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
12261226
m.Group("/{username}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
1227-
m.Group("/{username}/{group_id}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
1227+
m.Group("/{username}/group/{group_id}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
12281228
m.Group("/{username}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
12291229

12301230
repoIssueAttachmentFn := func() {
@@ -1235,15 +1235,15 @@ func registerWebRoutes(m *web.Router) {
12351235
m.Get("/issues/suggestions", repo.IssueSuggestions)
12361236
}
12371237

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

12421242
issueViewFn := func() {
12431243
m.Get("", repo.Issues)
12441244
m.Get("/{index}", repo.ViewIssue)
12451245
}
1246-
m.Group("/{username}/{group_id}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
1246+
m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
12471247
m.Group("/{username}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
12481248
// end "/{username}/{group_id}/{reponame}": issue/pull list, issue/pull view, external tracker
12491249

@@ -1335,7 +1335,7 @@ func registerWebRoutes(m *web.Router) {
13351335
}, reqUnitPullsReader)
13361336
m.Post("/pull/{index}/target_branch", reqUnitPullsReader, repo.UpdatePullRequestTarget)
13371337
}
1338-
m.Group("/{username}/{group_id}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
1338+
m.Group("/{username}/group/{group_id}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
13391339
m.Group("/{username}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
13401340
// end "/{username}/{group_id}/{reponame}": create or edit issues, pulls, labels, milestones
13411341

@@ -1388,7 +1388,7 @@ func registerWebRoutes(m *web.Router) {
13881388

13891389
m.Combo("/fork").Get(repo.Fork).Post(web.Bind(forms.CreateRepoForm{}), repo.ForkPost)
13901390
}
1391-
m.Group("/{username}/{group_id}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
1391+
m.Group("/{username}/group/{group_id}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
13921392
m.Group("/{username}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
13931393
// end "/{username}/{group_id}/{reponame}": repo code
13941394

@@ -1401,7 +1401,7 @@ func registerWebRoutes(m *web.Router) {
14011401
}, ctxDataSet("EnableFeed", setting.Other.EnableFeed))
14021402
m.Post("/tags/delete", reqSignIn, reqRepoCodeWriter, context.RepoMustNotBeArchived(), repo.DeleteTag)
14031403
}
1404-
m.Group("/{username}/{group_id}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
1404+
m.Group("/{username}/group/{group_id}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
14051405
m.Group("/{username}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
14061406
// end "/{username}/{group_id}/{reponame}": repo tags
14071407

@@ -1427,29 +1427,29 @@ func registerWebRoutes(m *web.Router) {
14271427
m.Post("/edit/*", web.Bind(forms.EditReleaseForm{}), repo.EditReleasePost)
14281428
}, reqSignIn, context.RepoMustNotBeArchived(), reqRepoReleaseWriter, repo.CommitInfoCache)
14291429
}
1430-
m.Group("/{username}/{group_id}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
1430+
m.Group("/{username}/group/{group_id}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
14311431
m.Group("/{username}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
14321432
// end "/{username}/{group_id}/{reponame}": repo releases
14331433

14341434
repoAttachmentsFn := func() { // to maintain compatibility with old attachments
14351435
m.Get("/attachments/{uuid}", repo.GetAttachment)
14361436
}
1437-
m.Group("/{username}/{group_id}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
1437+
m.Group("/{username}/group/{group_id}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
14381438
m.Group("/{username}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
14391439
// end "/{username}/{group_id}/{reponame}": compatibility with old attachments
14401440

14411441
repoTopicFn := func() {
14421442
m.Post("/topics", repo.TopicsPost)
14431443
}
1444-
m.Group("/{username}/{group_id}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
1444+
m.Group("/{username}/group/{group_id}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
14451445
m.Group("/{username}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
14461446

14471447
repoPackageFn := func() {
14481448
if setting.Packages.Enabled {
14491449
m.Get("/packages", repo.Packages)
14501450
}
14511451
}
1452-
m.Group("/{username}/{group_id}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
1452+
m.Group("/{username}/group/{group_id}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
14531453
m.Group("/{username}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
14541454

14551455
repoProjectsFn := func() {
@@ -1477,7 +1477,7 @@ func registerWebRoutes(m *web.Router) {
14771477
})
14781478
}, reqRepoProjectsWriter, context.RepoMustNotBeArchived())
14791479
}
1480-
m.Group("/{username}/{group_id}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
1480+
m.Group("/{username}/group/{group_id}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
14811481
m.Group("/{username}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
14821482
// end "/{username}/{group_id}/{reponame}/projects"
14831483

@@ -1511,7 +1511,7 @@ func registerWebRoutes(m *web.Router) {
15111511
m.Get("/badge.svg", actions.GetWorkflowBadge)
15121512
})
15131513
}
1514-
m.Group("/{username}/{group_id}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
1514+
m.Group("/{username}/group/{group_id}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
15151515
m.Group("/{username}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
15161516
// end "/{username}/{group_id}/{reponame}/actions"
15171517

@@ -1527,7 +1527,7 @@ func registerWebRoutes(m *web.Router) {
15271527
m.Get("/commit/{sha:[a-f0-9]{7,64}}.{ext:patch|diff}", repo.RawDiff)
15281528
m.Get("/raw/*", repo.WikiRaw)
15291529
}
1530-
m.Group("/{username}/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
1530+
m.Group("/{username}/group/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
15311531
ctx.Data["PageIsWiki"] = true
15321532
ctx.Data["CloneButtonOriginLink"] = ctx.Repo.Repository.WikiCloneLink(ctx, ctx.Doer)
15331533
})
@@ -1557,7 +1557,7 @@ func registerWebRoutes(m *web.Router) {
15571557
})
15581558
}, reqUnitCodeReader)
15591559
}
1560-
m.Group("/{username}/{group_id}/{reponame}/activity", activityFn,
1560+
m.Group("/{username}/group/{group_id}/{reponame}/activity", activityFn,
15611561
optSignIn, context.RepoAssignment, repo.MustBeNotEmpty,
15621562
context.RequireUnitReader(unit.TypeCode, unit.TypeIssues, unit.TypePullRequests, unit.TypeReleases),
15631563
)
@@ -1595,7 +1595,7 @@ func registerWebRoutes(m *web.Router) {
15951595
})
15961596
})
15971597
}
1598-
m.Group("/{username}/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
1598+
m.Group("/{username}/group/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
15991599
m.Group("/{username}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
16001600
// end "/{username}/{group_id}/{reponame}/pulls/{index}": repo pull request
16011601

@@ -1679,7 +1679,7 @@ func registerWebRoutes(m *web.Router) {
16791679
m.Get("/commit/{sha:([a-f0-9]{7,64})}.{ext:patch|diff}", repo.MustBeNotEmpty, repo.RawDiff)
16801680
m.Post("/lastcommit/*", context.RepoRefByType(git.RefTypeCommit), repo.LastCommit)
16811681
}
1682-
m.Group("/{username}/{group_id}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1682+
m.Group("/{username}/group/{group_id}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
16831683
m.Group("/{username}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
16841684
// end "/{username}/{group_id}/{reponame}": repo code
16851685

@@ -1691,7 +1691,7 @@ func registerWebRoutes(m *web.Router) {
16911691
m.Post("/action/{action:watch|unwatch}", reqSignIn, repo.ActionWatch)
16921692
m.Post("/action/{action:accept_transfer|reject_transfer}", reqSignIn, repo.ActionTransfer)
16931693
}
1694-
m.Group("/{username}/{group_id}/{reponame}", fn, optSignIn, context.RepoAssignment)
1694+
m.Group("/{username}/group/{group_id}/{reponame}", fn, optSignIn, context.RepoAssignment)
16951695
m.Group("/{username}/{reponame}", fn, optSignIn, context.RepoAssignment)
16961696

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

0 commit comments

Comments
 (0)