diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-05-08 10:55:27 +0800 |
|---|---|---|
| committer | Bo-Yi Wu <appleboy.tw@gmail.com> | 2017-05-08 10:55:27 +0800 |
| commit | 2bb8b3a56219f3fcba7c77c7a8fc10769b8c11bd (patch) | |
| tree | 0fb4e0e204dc72f99dd3a203ee9062bee3d93392 /routers | |
| parent | 79494047b062069fd8e692152d29773a22877d76 (diff) | |
| download | gitea-2bb8b3a56219f3fcba7c77c7a8fc10769b8c11bd.tar.gz gitea-2bb8b3a56219f3fcba7c77c7a8fc10769b8c11bd.zip | |
fix bug when push a branch name with / & fix an integration test bug (#1689)
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/private/branch.go | 2 | ||||
| -rw-r--r-- | routers/private/internal.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/routers/private/branch.go b/routers/private/branch.go index e74087950e..8e42f73039 100644 --- a/routers/private/branch.go +++ b/routers/private/branch.go @@ -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{}{ diff --git a/routers/private/internal.go b/routers/private/internal.go index f663306e92..3e7233226a 100644 --- a/routers/private/internal.go +++ b/routers/private/internal.go @@ -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) } |