Release 4.38.4

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+## 4.38.3 - 30 Oct 2022
+- Fix several issues around multiple assignees in issues and pull requests
+- Fix IllegalStateException when returning unknown avatar image
+
 ## 4.38.2 - 20 Sep 2022
 - Resurrect assignee icons on the issue list
 

README.md

@@ -61,6 +61,13 @@ Support
 
 What's New in 4.38.x
 -------------
+## 4.38.4 - 2 Nov 2022
+- Fix MariaDB issue
+
+## 4.38.3 - 30 Oct 2022
+- Fix several issues around multiple assignees in issues and pull requests
+- Fix IllegalStateException when returning unknown avatar image
+
 ## 4.38.2 - 20 Sep 2022
 - Resurrect assignee icons on the issue list
 

build.sbt

@@ -3,8 +3,8 @@ import com.jsuereth.sbtpgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.38.2"
-val ScalatraVersion = "2.8.2"
+val GitBucketVersion = "4.38.4"
+val ScalatraVersion = "2.8.4"
 val JettyVersion = "9.4.49.v20220914"
 val JgitVersion = "5.13.1.202206130422-r"
 
@@ -46,7 +46,7 @@ libraryDependencies ++= Seq(
   "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
   "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
   "com.h2database"                  % "h2"                           % "1.4.199",
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "3.0.7",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.4",
   "org.postgresql"                  % "postgresql"                   % "42.5.0",
   "ch.qos.logback"                  % "logback-classic"              % "1.2.11",
   "com.zaxxer"                      % "HikariCP"                     % "4.0.3" exclude ("org.slf4j", "slf4j-api"),

src/main/scala/gitbucket/core/GitBucketCoreModule.scala

@@ -113,5 +113,7 @@ object GitBucketCoreModule
       new Version("4.37.2"),
       new Version("4.38.0", new LiquibaseMigration("update/gitbucket-core_4.38.xml")),
       new Version("4.38.1"),
-      new Version("4.38.2")
+      new Version("4.38.2"),
+      new Version("4.38.3"),
+      new Version("4.38.4")
     )

src/main/scala/gitbucket/core/controller/PullRequestsController.scala

@@ -69,7 +69,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     "commitIdFrom" -> trim(text(required, maxlength(40))),
     "commitIdTo" -> trim(text(required, maxlength(40))),
     "isDraft" -> trim(boolean(required)),
-    "assignedUserName" -> trim(optional(text())),
+    "assigneeUserNames" -> trim(optional(text())),
     "milestoneId" -> trim(optional(number())),
     "priorityId" -> trim(optional(number())),
     "labelNames" -> trim(optional(text()))
@@ -92,7 +92,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     commitIdFrom: String,
     commitIdTo: String,
     isDraft: Boolean,
-    assignedUserNames: Option[String],
+    assigneeUserNames: Option[String],
     milestoneId: Option[Int],
     priorityId: Option[Int],
     labelNames: Option[String]
@@ -593,7 +593,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
         if (manageable) {
           // insert assignees
-          form.assignedUserNames.foreach { value =>
+          form.assigneeUserNames.foreach { value =>
             value.split(",").foreach { userName =>
               registerIssueAssignee(repository.owner, repository.name, issueId, userName)
             }

src/main/scala/gitbucket/core/service/IssuesService.scala

@@ -242,14 +242,17 @@ trait IssuesService {
         case (issue, commentCount, _, _, _, milestone, priority, commitId, _) =>
           IssueInfo(
             issue,
-            issues.flatMap { t =>
-              t._3.map(Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get))
-            } toList,
+            issues
+              .flatMap { t =>
+                t._3.map(Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get))
+              }
+              .distinct
+              .toList,
             milestone,
             priority,
             commentCount,
             commitId,
-            issues.flatMap(_._9)
+            issues.flatMap(_._9).distinct
           )
       }
     } toList