Skip to content

Commit 345daf0

Browse files
authored
Merge pull request #36 from onukura/gb435
Bump to gitbucket 4.35.x
2 parents 2cdccc4 + 59c7e00 commit 345daf0

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ See [Maven Repository](http://central.maven.org/maven2/org/codelibs/gitbucket/gi
3535

3636
| Plugin version | GitBucket version | Fess version |
3737
|:--------------:|:-----------------:|:-------------:|
38+
| 1.7.x | 4.35 - | 11.0.1 -, 12.x|
39+
| 1.6.x | 4.34 | 11.0.1 -, 12.x|
3840
| 1.5.x | 4.32 - | 11.0.1 -, 12.x|
3941
| 1.4.x | 4.24.1 - | 11.0.1 -, 12.x|
4042
| 1.3.x | 4.20 - | 11.0.1 -, 12.x|

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name := "gitbucket-fess-plugin"
22

33
organization := "org.codelibs.gitbucket"
44

5-
version := "1.6.0"
5+
version := "1.7.0"
66

7-
scalaVersion := "2.13.1"
7+
scalaVersion := "2.13.3"
88

9-
gitbucketVersion := "4.34.0"
9+
gitbucketVersion := "4.35.0"
1010

1111
publishMavenStyle := true
1212

src/main/scala/Plugin.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class Plugin extends gitbucket.core.plugin.Plugin {
2121
new Version("1.4.1"),
2222
new Version("1.5.0"),
2323
new Version("1.6.0"),
24+
new Version("1.7.0"),
2425
)
2526
override val controllers = Seq(
2627
// Note: "/api/v3/" is a special prefix in ControllerBase.scala and Implicits.scala

src/main/scala/org/codelibs/gitbucket/fess/controller/FessApiController.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ trait FessApiControllerBase extends ControllerBase {
6161
{
6262
// Note: 'r.issueCount' and 'r.pullCount' are always 0 (See the implementation of 'getVisibleRepositories')
6363
// Thus we should compute them here.
64-
val countFn = (state: String, isPull: Boolean) =>
64+
val countFn = (state: String, isPull: IssueSearchOption) =>
6565
countIssue(IssueSearchCondition(state = state),
6666
isPull,
6767
(r.owner, r.name))
68-
val issueCount = countFn("open", false) + countFn("closed", false)
69-
val pullCount = countFn("open", true) + countFn("closed", true)
68+
val issueCount = countFn("open", IssueSearchOption.Issues) + countFn("closed", IssueSearchOption.Issues)
69+
val pullCount = countFn("open", IssueSearchOption.PullRequests) + countFn("closed", IssueSearchOption.PullRequests)
7070
val branch = getDefaultBranch(r).getOrElse("")
7171

7272
FessRepositoryInfo(r.name,

0 commit comments

Comments
 (0)