tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

fix bug when push a branch name with / & fix an integration test bug (#1689)

Browse Source
This commit is contained in:
Lunny Xiao
2017-05-08 10:55:27 +08:00
committed by Bo-Yi Wu
parent 79494047b0
commit 2bb8b3a562
4 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/private/branch.go
View File

@@ -13,7 +13,7 @@ import (
// GetProtectedBranchBy get protected branch information
func GetProtectedBranchBy(ctx *macaron.Context) {
repoID := ctx.ParamsInt64(":id")
branchName := ctx.Params(":branch")
branchName := ctx.Params("*")
protectBranch, err := models.GetProtectedBranchBy(repoID, branchName)
if err != nil {
ctx.JSON(500, map[string]interface{}{

2
routers/private/internal.go
View File

@@ -42,6 +42,6 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Group("/", func() {
m.Post("/ssh/:id/update", UpdatePublicKey)
m.Post("/push/update", PushUpdate)
m.Get("/branch/:id/:branch", GetProtectedBranchBy)
m.Get("/branch/:id/*", GetProtectedBranchBy)
}, CheckInternalToken)
}