Skip to content

Commit cf1eb3a

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

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
@@ -1124,7 +1124,7 @@ func registerWebRoutes(m *web.Router) {
11241124
})
11251125
}
11261126
m.Group("/{username}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1127-
m.Group("/{username}/{group_id}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1127+
m.Group("/{username}/group/{group_id}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
11281128
// end "/{username}/{group_id}/{reponame}/-": migrate
11291129

11301130
settingsFn := func() {
@@ -1220,18 +1220,18 @@ func registerWebRoutes(m *web.Router) {
12201220
reqSignIn, context.RepoAssignment, reqRepoAdmin,
12211221
ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
12221222
)
1223-
m.Group("/{username}/{group_id}/{reponame}/settings", settingsFn,
1223+
m.Group("/{username}/group/{group_id}/{reponame}/settings", settingsFn,
12241224
reqSignIn, context.RepoAssignment, reqRepoAdmin,
12251225
ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
12261226
)
12271227
// end "/{username}/{group_id}/{reponame}/settings"
12281228

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

12331233
m.Post("/{username}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1234-
m.Post("/{username}/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
1234+
m.Post("/{username}/group/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
12351235
rootRepoFn := func() {
12361236
m.Get("/find/*", repo.FindFiles)
12371237
m.Group("/tree-list", func() {
@@ -1251,7 +1251,7 @@ func registerWebRoutes(m *web.Router) {
12511251
m.Get("/pulls/new/*", repo.PullsNewRedirect)
12521252
}
12531253
m.Group("/{username}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1254-
m.Group("/{username}/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1254+
m.Group("/{username}/group/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
12551255
// end "/{username}/{group_id}/{reponame}": repo code: find, compare, list
12561256

12571257
addIssuesPullsViewRoutes := func() {
@@ -1269,9 +1269,9 @@ func registerWebRoutes(m *web.Router) {
12691269
})
12701270
}
12711271
// FIXME: many "pulls" requests are sent to "issues" endpoints correctly, so the issue endpoints have to tolerate pull request permissions at the moment
1272-
m.Group("/{username}/{group_id}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
1272+
m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
12731273
m.Group("/{username}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
1274-
m.Group("/{username}/{group_id}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
1274+
m.Group("/{username}/group/{group_id}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
12751275
m.Group("/{username}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
12761276

12771277
repoIssueAttachmentFn := func() {
@@ -1282,15 +1282,15 @@ func registerWebRoutes(m *web.Router) {
12821282
m.Get("/issues/suggestions", repo.IssueSuggestions)
12831283
}
12841284

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

12891289
issueViewFn := func() {
12901290
m.Get("", repo.Issues)
12911291
m.Get("/{index}", repo.ViewIssue)
12921292
}
1293-
m.Group("/{username}/{group_id}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
1293+
m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
12941294
m.Group("/{username}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
12951295
// end "/{username}/{group_id}/{reponame}": issue/pull list, issue/pull view, external tracker
12961296

@@ -1382,7 +1382,7 @@ func registerWebRoutes(m *web.Router) {
13821382
}, reqUnitPullsReader)
13831383
m.Post("/pull/{index}/target_branch", reqUnitPullsReader, repo.UpdatePullRequestTarget)
13841384
}
1385-
m.Group("/{username}/{group_id}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
1385+
m.Group("/{username}/group/{group_id}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
13861386
m.Group("/{username}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
13871387
// end "/{username}/{group_id}/{reponame}": create or edit issues, pulls, labels, milestones
13881388

@@ -1435,7 +1435,7 @@ func registerWebRoutes(m *web.Router) {
14351435

14361436
m.Combo("/fork").Get(repo.Fork).Post(web.Bind(forms.CreateRepoForm{}), repo.ForkPost)
14371437
}
1438-
m.Group("/{username}/{group_id}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
1438+
m.Group("/{username}/group/{group_id}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
14391439
m.Group("/{username}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
14401440
// end "/{username}/{group_id}/{reponame}": repo code
14411441

@@ -1448,7 +1448,7 @@ func registerWebRoutes(m *web.Router) {
14481448
}, ctxDataSet("EnableFeed", setting.Other.EnableFeed))
14491449
m.Post("/tags/delete", reqSignIn, reqRepoCodeWriter, context.RepoMustNotBeArchived(), repo.DeleteTag)
14501450
}
1451-
m.Group("/{username}/{group_id}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
1451+
m.Group("/{username}/group/{group_id}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
14521452
m.Group("/{username}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
14531453
// end "/{username}/{group_id}/{reponame}": repo tags
14541454

@@ -1474,29 +1474,29 @@ func registerWebRoutes(m *web.Router) {
14741474
m.Post("/edit/*", web.Bind(forms.EditReleaseForm{}), repo.EditReleasePost)
14751475
}, reqSignIn, context.RepoMustNotBeArchived(), reqRepoReleaseWriter, repo.CommitInfoCache)
14761476
}
1477-
m.Group("/{username}/{group_id}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
1477+
m.Group("/{username}/group/{group_id}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
14781478
m.Group("/{username}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
14791479
// end "/{username}/{group_id}/{reponame}": repo releases
14801480

14811481
repoAttachmentsFn := func() { // to maintain compatibility with old attachments
14821482
m.Get("/attachments/{uuid}", repo.GetAttachment)
14831483
}
1484-
m.Group("/{username}/{group_id}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
1484+
m.Group("/{username}/group/{group_id}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
14851485
m.Group("/{username}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
14861486
// end "/{username}/{group_id}/{reponame}": compatibility with old attachments
14871487

14881488
repoTopicFn := func() {
14891489
m.Post("/topics", repo.TopicsPost)
14901490
}
1491-
m.Group("/{username}/{group_id}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
1491+
m.Group("/{username}/group/{group_id}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
14921492
m.Group("/{username}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
14931493

14941494
repoPackageFn := func() {
14951495
if setting.Packages.Enabled {
14961496
m.Get("/packages", repo.Packages)
14971497
}
14981498
}
1499-
m.Group("/{username}/{group_id}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
1499+
m.Group("/{username}/group/{group_id}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
15001500
m.Group("/{username}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
15011501

15021502
repoProjectsFn := func() {
@@ -1524,7 +1524,7 @@ func registerWebRoutes(m *web.Router) {
15241524
})
15251525
}, reqRepoProjectsWriter, context.RepoMustNotBeArchived())
15261526
}
1527-
m.Group("/{username}/{group_id}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
1527+
m.Group("/{username}/group/{group_id}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
15281528
m.Group("/{username}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
15291529
// end "/{username}/{group_id}/{reponame}/projects"
15301530

@@ -1558,7 +1558,7 @@ func registerWebRoutes(m *web.Router) {
15581558
m.Get("/badge.svg", actions.GetWorkflowBadge)
15591559
})
15601560
}
1561-
m.Group("/{username}/{group_id}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
1561+
m.Group("/{username}/group/{group_id}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
15621562
m.Group("/{username}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
15631563
// end "/{username}/{group_id}/{reponame}/actions"
15641564

@@ -1574,7 +1574,7 @@ func registerWebRoutes(m *web.Router) {
15741574
m.Get("/commit/{sha:[a-f0-9]{7,64}}.{ext:patch|diff}", repo.RawDiff)
15751575
m.Get("/raw/*", repo.WikiRaw)
15761576
}
1577-
m.Group("/{username}/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
1577+
m.Group("/{username}/group/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
15781578
ctx.Data["PageIsWiki"] = true
15791579
ctx.Data["CloneButtonOriginLink"] = ctx.Repo.Repository.WikiCloneLink(ctx, ctx.Doer)
15801580
})
@@ -1604,7 +1604,7 @@ func registerWebRoutes(m *web.Router) {
16041604
})
16051605
}, reqUnitCodeReader)
16061606
}
1607-
m.Group("/{username}/{group_id}/{reponame}/activity", activityFn,
1607+
m.Group("/{username}/group/{group_id}/{reponame}/activity", activityFn,
16081608
optSignIn, context.RepoAssignment, repo.MustBeNotEmpty,
16091609
context.RequireUnitReader(unit.TypeCode, unit.TypeIssues, unit.TypePullRequests, unit.TypeReleases),
16101610
)
@@ -1642,7 +1642,7 @@ func registerWebRoutes(m *web.Router) {
16421642
})
16431643
})
16441644
}
1645-
m.Group("/{username}/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
1645+
m.Group("/{username}/group/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
16461646
m.Group("/{username}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
16471647
// end "/{username}/{group_id}/{reponame}/pulls/{index}": repo pull request
16481648

@@ -1726,7 +1726,7 @@ func registerWebRoutes(m *web.Router) {
17261726
m.Get("/commit/{sha:([a-f0-9]{7,64})}.{ext:patch|diff}", repo.MustBeNotEmpty, repo.RawDiff)
17271727
m.Post("/lastcommit/*", context.RepoRefByType(git.RefTypeCommit), repo.LastCommit)
17281728
}
1729-
m.Group("/{username}/{group_id}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
1729+
m.Group("/{username}/group/{group_id}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
17301730
m.Group("/{username}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
17311731
// end "/{username}/{group_id}/{reponame}": repo code
17321732

@@ -1738,7 +1738,7 @@ func registerWebRoutes(m *web.Router) {
17381738
m.Post("/action/{action:watch|unwatch}", reqSignIn, repo.ActionWatch)
17391739
m.Post("/action/{action:accept_transfer|reject_transfer}", reqSignIn, repo.ActionTransfer)
17401740
}
1741-
m.Group("/{username}/{group_id}/{reponame}", fn, optSignIn, context.RepoAssignment)
1741+
m.Group("/{username}/group/{group_id}/{reponame}", fn, optSignIn, context.RepoAssignment)
17421742
m.Group("/{username}/{reponame}", fn, optSignIn, context.RepoAssignment)
17431743

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

0 commit comments

Comments
 (0)