From ee8be37f55cfb5bc24b7f412c74aae14fd109313 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 2 Apr 2017 15:48:46 +0900 Subject: [PATCH] use "contains" instead of "find().isEmpty" --- .../core/controller/RepositorySettingsController.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index 0ca0305c5..7e016a570 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -157,7 +157,7 @@ trait RepositorySettingsControllerBase extends ControllerBase { /** Update default branch */ post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) => - if(repository.branchList.find(_ == form.defaultBranch).isEmpty){ + if(!repository.branchList.contains(form.defaultBranch)){ redirect(s"/${repository.owner}/${repository.name}/settings/options") } else { saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch) @@ -174,7 +174,7 @@ trait RepositorySettingsControllerBase extends ControllerBase { get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository => import gitbucket.core.api._ val branch = params("branch") - if(repository.branchList.find(_ == branch).isEmpty){ + if(!repository.branchList.contains(branch)){ redirect(s"/${repository.owner}/${repository.name}/settings/branches") } else { val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch))