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

Fix incorrect redirect URL and authorization in Update branch feature

Browse Source
This commit is contained in:
t-tsutsumi
2017-05-09 04:55:55 +09:00
parent d6f49eb442
commit 2dcc14b4d9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
View File

@@ -153,7 +153,7 @@ trait PullRequestsControllerBase extends ControllerBase {
} getOrElse NotFound() } getOrElse NotFound()
}) })
post("/:owner/:repository/pull/:id/update_branch")(writableUsersOnly { baseRepository => post("/:owner/:repository/pull/:id/update_branch")(readableUsersOnly { baseRepository =>
(for { (for {
issueId <- params("id").toIntOpt issueId <- params("id").toIntOpt
loginAccount <- context.loginAccount loginAccount <- context.loginAccount
@@ -217,7 +217,7 @@ trait PullRequestsControllerBase extends ControllerBase {
} }
} }
} }
redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}") redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
}) getOrElse NotFound() }) getOrElse NotFound()
}) })