pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-24 22:06:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix lint & co

Browse source
This commit is contained in:
6543 2023-03-30 23:31:15 +02:00
parent 794e497f21
commit ff0bc0f0ae
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
integration/get_test.go
View file

@ -1,4 +1,5 @@
//go:build integration
// +build integration
package integration package integration

8
server/upstream/redirects.go
View file

@ -68,8 +68,8 @@ func (o *Options) matchRedirects(ctx *context.Context, giteaClient *gitea.Client
for _, redirect := range redirects { for _, redirect := range redirects {
reqUrl := ctx.Req.RequestURI reqUrl := ctx.Req.RequestURI
// remove repo and branch from request url // remove repo and branch from request url
reqUrl = strings.TrimPrefix(reqUrl, "/" + o.TargetRepo) reqUrl = strings.TrimPrefix(reqUrl, "/"+o.TargetRepo)
reqUrl = strings.TrimPrefix(reqUrl, "/@" + o.TargetBranch) reqUrl = strings.TrimPrefix(reqUrl, "/@"+o.TargetBranch)
// check if from url matches request url // check if from url matches request url
if strings.TrimSuffix(redirect.From, "/") == strings.TrimSuffix(reqUrl, "/") { if strings.TrimSuffix(redirect.From, "/") == strings.TrimSuffix(reqUrl, "/") {
@ -112,6 +112,6 @@ func (o *Options) matchRedirects(ctx *context.Context, giteaClient *gitea.Client
} }
} }
} }
return false return false
} }