diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala index 3fcd293..af0cec6 100644 --- a/src/main/scala/gitbucket/core/service/IssuesService.scala +++ b/src/main/scala/gitbucket/core/service/IssuesService.scala @@ -336,7 +336,7 @@ implicit s: Session ) = Issues filter { t1 => - (if (repos.size == 1) { + (if (repos.sizeIs == 1) { t1.byRepository(repos.head._1, repos.head._2) } else { ((t1.userName ++ "/" ++ t1.repositoryName) inSetBind (repos.map { case (owner, repo) => s"$owner/$repo" })) diff --git a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala index e20128e..ecbcd19 100644 --- a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala +++ b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala @@ -153,9 +153,9 @@ Some("Cannot force-push to a protected branch") case ReceiveCommand.Type.UPDATE | ReceiveCommand.Type.UPDATE_NONFASTFORWARD if needStatusCheck(pusher) => unSuccessedContexts(command.getNewId.name) match { - case s if s.size == 1 => Some(s"""Required status check "${s.toSeq(0)}" is expected""") - case s if s.size >= 1 => Some(s"${s.size} of ${contexts.size} required status checks are expected") - case _ => None + case s if s.sizeIs == 1 => Some(s"""Required status check "${s.toSeq(0)}" is expected""") + case s if s.sizeIs >= 1 => Some(s"${s.size} of ${contexts.size} required status checks are expected") + case _ => None } case ReceiveCommand.Type.DELETE => Some("Cannot delete a protected branch")