Release 4.21.2

fix #1861

CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-## 4.21.1 - 01 Jan 2018
+### 4.21.2 - 27 Jan 2019
+- Bugfix
 
+### 4.21.1 - 27 Jan 2019
+- Bugfix
+
+### 4.21.0 - 27 Jan 2018
 - Release page
 - OpenID Connect support
 - New database viewer
@@ -10,7 +15,6 @@ All changes to the project will be documented in this file.
 - Clarify close/reopen button
 
 ## 4.20.0 - 23 Dec 2017
-
 - Squash and rebase merge strategy for pull requests
 - Quick pull request creation
 - Download patch from the diff view
@@ -21,17 +25,14 @@ All changes to the project will be documented in this file.
 - Display conflicting files if pull request can't be merged
 
 ## 4.19.3 - 7 Dec 2017
-
 - Fix file uploading bug
 - Fix reply comment form behavior in the diff view
 
 ## 4.19.2 - 3 Dec 2017
-
 - Fix routing bug in `CompositeScalatraFilter`
 - Resolve id attribute collision in the web hook editing form
 
 ## 4.19.1 - 2 Dec 2017
-
 - Update gitbucket-notifications-plugin because it had a version compatibility issue
 
 ## 4.19.0 - 2 Dec 2017

README.md

@@ -68,11 +68,16 @@ Support
 - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
 
-What's New in 4.20.x
+What's New in 4.21.x
 -------------
 
-### 4.21.1 - 01 Jan 2018
+### 4.21.2 - 27 Jan 2019
+- Bugfix
 
+### 4.21.1 - 27 Jan 2019
+- Bugfix
+
+### 4.21.0 - 27 Jan 2018
 - Release page
 - OpenID Connect support
 - New database viewer

build.sbt

@@ -3,7 +3,7 @@ import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.21.0"
+val GitBucketVersion = "4.21.2"
 val ScalatraVersion = "2.6.1"
 val JettyVersion = "9.4.7.v20170914"
 

plugins.json

@@ -31,9 +31,9 @@
     "description": "Provides Gist feature on GitBucket.",
     "versions": [
       {
-        "version": "4.11.0",
-        "range": ">=4.19.0",
-        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.11.0/gitbucket-gist-plugin-assembly-4.11.0.jar"
+        "version": "4.12.0",
+        "range": ">=4.21.0",
+        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.12.0/gitbucket-gist-plugin-assembly-4.12.0.jar"
       }
     ],
     "default": false

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

@@ -51,5 +51,7 @@ object GitBucketCoreModule extends Module("gitbucket-core",
   new Version("4.20.0"),
   new Version("4.21.0",
     new LiquibaseMigration("update/gitbucket-core_4.21.xml")
-  )
+  ),
+  new Version("4.21.1"),
+  new Version("4.21.2")
 )

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

@@ -471,7 +471,14 @@ trait IssuesService {
 
   def getAssignableUserNames(owner: String, repository: String)(implicit s: Session): List[String] = {
     (getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER)) :::
-      (if (getAccountByUserName(owner).get.isGroupAccount) getGroupMembers(owner).map(_.userName) else List(owner))).distinct.sorted
+      (getAccountByUserName(owner) match {
+        case Some(x) if x.isGroupAccount =>
+          getGroupMembers(owner).map(_.userName)
+        case Some(_) =>
+          List(owner)
+        case None =>
+          Nil
+      })).distinct.sorted
   }
 
 }

src/main/twirl/gitbucket/core/issues/commentform.scala.html

@@ -39,7 +39,6 @@
             } else {
               <input type="submit" class="btn btn-success" tabindex="2" formaction="@helpers.url(repository)/issue_comments/new" value="Comment"/>
             }
-          </div>
         </div>
       </div>
     </div>