Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 15:36:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

use sizeIs

Browse Source
This commit is contained in:
xuwei-k
2021-08-09 16:38:16 +09:00
parent fb07098c13
commit 639f153589
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/service/IssuesService.scala
View File

@@ -336,7 +336,7 @@ trait IssuesService {
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" }))

6
src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
View File

@@ -153,9 +153,9 @@ object ProtectedBranchService {
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")