Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #307)Fix deletion problem for branches which contains '/'

Browse Source
This commit is contained in:
takezoe
2014-03-08 04:22:55 +09:00
parent fbba29e810
commit 2d0f59b6f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/app/PullRequestsController.scala
View File

@@ -105,9 +105,9 @@ trait PullRequestsControllerBase extends ControllerBase {
} getOrElse NotFound } getOrElse NotFound
}) })
get("/:owner/:repository/pull/:id/delete/:branchName")(collaboratorsOnly { repository => get("/:owner/:repository/pull/:id/delete/*")(collaboratorsOnly { repository =>
params("id").toIntOpt.map { issueId => params("id").toIntOpt.map { issueId =>
val branchName = params("branchName") val branchName = multiParams("splat").head
val userName = context.loginAccount.get.userName val userName = context.loginAccount.get.userName
if(repository.repository.defaultBranch != branchName){ if(repository.repository.defaultBranch != branchName){
using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>

4
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -159,8 +159,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
/** /**
* Deletes branch. * Deletes branch.
*/ */
get("/:owner/:repository/delete/:branchName")(collaboratorsOnly { repository => get("/:owner/:repository/delete/*")(collaboratorsOnly { repository =>
val branchName = params("branchName") val branchName = multiParams("splat").head
val userName = context.loginAccount.get.userName val userName = context.loginAccount.get.userName
if(repository.repository.defaultBranch != branchName){ if(repository.repository.defaultBranch != branchName){
using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>