Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-06 23:52:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

scalafmt

Browse Source
This commit is contained in:
KOUNOIKE
2018-10-13 23:47:45 +09:00
parent 90f0006bc0
commit edf0903620
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/gitbucket/core/controller/api/ApiPullRequestControllerBase.scala
View File

@@ -198,14 +198,14 @@ trait ApiPullRequestControllerBase extends ControllerBase {
* viii. Get if a pull request has been merged
* https://developer.github.com/v3/pulls/#get-if-a-pull-request-has-been-merged
*/
get("/api/v3/repos/:owner/:repository/pulls/:id/merge")(referrersOnly {repository =>
(for{
get("/api/v3/repos/:owner/:repository/pulls/:id/merge")(referrersOnly { repository =>
(for {
issueId <- params("id").toIntOpt
(issue, pullReq) <- getPullRequest(repository.owner, repository.name, issueId)
} yield {
if(checkConflict(repository.owner, repository.name, pullReq.branch, issueId).isDefined) {
if (checkConflict(repository.owner, repository.name, pullReq.branch, issueId).isDefined) {
NoContent
}else{
} else {
NotFound
}
}).getOrElse(NotFound)