From 4d7fc061a4a99a5cde662aca7a5a159e89473ccc Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 23 Aug 2020 01:11:33 +0900 Subject: [PATCH] Handle branch contains / properly in branch settings --- .../core/controller/RepositorySettingsController.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index e35741ee8..a05dff26b 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -177,9 +177,10 @@ trait RepositorySettingsControllerBase extends ControllerBase { }) /** Branch protection for branch */ - get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository => + get("/:owner/:repository/settings/branches/*")(ownerOnly { repository => import gitbucket.core.api._ - val branch = params("branch") + val branch = params("splat") + if (!repository.branchList.contains(branch)) { redirect(s"/${repository.owner}/${repository.name}/settings/branches") } else {