Skip to content

Commit 6c6a413

Browse files
GamerGirlandCoGamerGirlandCo
committed
make it more apparent in URLs that a repo is part of a group
1 parent 9b9eba8 commit 6c6a413

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

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

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

11851185
m.Post("/{username}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1186-
m.Post("/{username}/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1186+
m.Post("/{username}/group/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
11871187
rootRepoFn := func() {
11881188
m.Get("/find/*", repo.FindFiles)
11891189
m.Group("/tree-list", func() {
@@ -1203,7 +1203,7 @@ func registerWebRoutes(m *web.Router) {
12031203
m.Get("/pulls/new/*", repo.PullsNewRedirect)
12041204
}
12051205
m.Group("/{username}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1206-
m.Group("/{username}/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1206+
m.Group("/{username}/group/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
12071207
// end "/{username}/{group_id}/{reponame}": repo code: find, compare, list
12081208

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

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

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

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

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

@@ -1387,7 +1387,7 @@ func registerWebRoutes(m *web.Router) {
13871387

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

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

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

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

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

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

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

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

@@ -1526,7 +1526,7 @@ func registerWebRoutes(m *web.Router) {
15261526
m.Get("/commit/{sha:[a-f0-9]{7,64}}.{ext:patch|diff}", repo.RawDiff)
15271527
m.Get("/raw/*", repo.WikiRaw)
15281528
}
1529-
m.Group("/{username}/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
1529+
m.Group("/{username}/group/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
15301530
ctx.Data["PageIsWiki"] = true
15311531
ctx.Data["CloneButtonOriginLink"] = ctx.Repo.Repository.WikiCloneLink(ctx, ctx.Doer)
15321532
})
@@ -1556,7 +1556,7 @@ func registerWebRoutes(m *web.Router) {
15561556
})
15571557
}, reqUnitCodeReader)
15581558
}
1559-
m.Group("/{username}/{group_id}/{reponame}/activity", activityFn,
1559+
m.Group("/{username}/group/{group_id}/{reponame}/activity", activityFn,
15601560
optSignIn, context.RepoAssignment, repo.MustBeNotEmpty,
15611561
context.RequireUnitReader(unit.TypeCode, unit.TypeIssues, unit.TypePullRequests, unit.TypeReleases),
15621562
)
@@ -1594,7 +1594,7 @@ func registerWebRoutes(m *web.Router) {
15941594
})
15951595
})
15961596
}
1597-
m.Group("/{username}/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
1597+
m.Group("/{username}/group/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
15981598
m.Group("/{username}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
15991599
// end "/{username}/{group_id}/{reponame}/pulls/{index}": repo pull request
16001600

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

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

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

0 commit comments

Comments
 (0)