mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-11-02 07:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'forgejo/v1.20/forgejo-moderation' into v1.20/forgejo

Browse source
This commit is contained in:
Earl Warren 2023-07-17 08:01:23 +02:00
commit 1371196064
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
56 changed files with 1642 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

11
routers/web/web.go
View file

@ -518,6 +518,11 @@ func registerRoutes(m *web.Route) {
})
addWebhookEditRoutes()
}, webhooksEnabled)
m.Group("/blocked_users", func() {
m.Get("", user_setting.BlockedUsers)
m.Post("/unblock", user_setting.UnblockUser)
})
}, reqSignIn, ctxDataSet("PageIsUserSettings", true, "AllThemes", setting.UI.Themes, "EnablePackages", setting.Packages.Enabled))
m.Group("/user", func() {
@ -770,6 +775,12 @@ func registerRoutes(m *web.Route) {
addSettingsSecretsRoutes()
}, actions.MustEnableActions)
m.Group("/blocked_users", func() {
m.Get("", org_setting.BlockedUsers)
m.Post("/block", org_setting.BlockedUsersBlock)
m.Post("/unblock", org_setting.BlockedUsersUnblock)
})
m.RouteMethods("/delete", "GET,POST", org.SettingsDelete)
m.Group("/packages", func() {