From a024491296578f00893857d3b704e9f28d7b9524 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 13 Mar 2017 11:24:02 +0900
Subject: [PATCH 01/27] Remove optimization option once

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index d219ff3a2..cf4c1303e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -59,7 +59,7 @@ libraryDependencies ++= Seq(
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:_")
+scalacOptions := Seq("-deprecation", "-language:postfixOps")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 

From 0401488ab1355fd1648ca4f94cd6374967e920cd Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 13 Mar 2017 13:00:06 +0900
Subject: [PATCH 02/27] Fix styles

---
 src/main/twirl/gitbucket/core/settings/edithooks.scala.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
index 7df7107d9..812b929b8 100644
--- a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
@@ -33,9 +33,9 @@
             <fieldset class="form-group">
               <label class="strong">Content type</label>
               <div></div>
-              <select name="ctype">
-              	<option value="@WebHookContentType.FORM.code" @if(webHook.ctype == WebHookContentType.FORM){selected}>@WebHookContentType.FORM.ctype</option>	
-              	<option value="@WebHookContentType.JSON.code" @if(webHook.ctype == WebHookContentType.JSON){selected}>@WebHookContentType.JSON.ctype</option>	
+              <select name="ctype" class="form-control" style="width: 500px;">
+              	<option value="@WebHookContentType.FORM.code" @if(webHook.ctype == WebHookContentType.FORM){selected}>@WebHookContentType.FORM.ctype</option>
+              	<option value="@WebHookContentType.JSON.code" @if(webHook.ctype == WebHookContentType.JSON){selected}>@WebHookContentType.JSON.ctype</option>
                </select>
             </fieldset>
             <fieldset class="form-group">

From 7b8a5a482adb57ac93b257eefb6df09ada71670e Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 13 Mar 2017 13:00:54 +0900
Subject: [PATCH 03/27] (refs #1479)Url encode the branch name

---
 .../core/settings/branches.scala.html         |  8 ++--
 .../core/settings/branchprotection.scala.html | 44 +++++++++----------
 .../webapp/assets/common/css/gitbucket.css    | 14 ------
 3 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html
index 75331a15e..69c3e19f5 100644
--- a/src/main/twirl/gitbucket/core/settings/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html
@@ -46,14 +46,12 @@
               </form>
             </p>
 
-            <table class="table table-bordered table-hover branches">
+            <table class="table table-hover branches">
               @protectedBranchList.map { branch =>
                 <tr>
                   <td>
                     <span class="branch-name">@branch</span>
-                    <span class="branch-action">
-                      <a href="@helpers.url(repository)/settings/branches/@helpers.encodeRefName(branch)" class="btn btn-small btn-default">Edit</a>
-                    </span>
+                    <a href="@helpers.url(repository)/settings/branches/@helpers.urlEncode(branch)" class="btn btn-sm btn-default pull-right">Edit</a>
                   </td>
                 </tr>
               }
@@ -64,4 +62,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
index 9fb7137ae..5bd54131d 100644
--- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
@@ -33,30 +33,30 @@
                   Sorry, we couldn’t find any status checks in the last week for this repository.<br />
                   Please create a commit status by API (<a href="https://developer.github.com/v3/repos/statuses/">Learn more about status checks on GitHub</a>)
                 </div>
-              }else{
-              <div class="js-has_required_statuses" style="display:none">
-                <div class="panel panel-default">
-                  <div class="panel-heading">Choose which status checks must pass before branches can be merged into <b>@branch</b>.</div>
-                  <div class="panel-body">
-                    @knownContexts.map { context =>
-                      <div class="checkbox">
-                        <label>
-                          <input type="checkbox" name="contexts" value="@context" onclick="update()" @check(protection.status.contexts.find(_ == context))>
-                          <span>@context</span>
-                        </label>
-                      </div>
-                    }
+              } else {
+                <div class="js-has_required_statuses" style="display:none">
+                  <div class="panel panel-default">
+                    <div class="panel-heading">Choose which status checks must pass before branches can be merged into <b>@branch</b>.</div>
+                    <div class="panel-body">
+                      @knownContexts.map { context =>
+                        <div class="checkbox">
+                          <label>
+                            <input type="checkbox" name="contexts" value="@context" onclick="update()" @check(protection.status.contexts.find(_ == context))>
+                            <span>@context</span>
+                          </label>
+                        </div>
+                      }
+                    </div>
+                  </div>
+
+                  <div class="checkbox">
+                    <label>
+                      <input type="checkbox" name="enforce_for_admins" onclick="update()" @check(protection.status.enforcement_level.name=="everyone")>
+                      <span class="strong">Include administrators</span>
+                    </label>
+                    <p class="help-block">Enforce required status checks for repository administrators.</p>
                   </div>
                 </div>
-
-                <div class="checkbox">
-                  <label>
-                    <input type="checkbox" name="enforce_for_admins" onclick="update()" @check(protection.status.enforcement_level.name=="everyone")>
-                    <span class="strong">Include administrators</span>
-                  </label>
-                  <p class="help-block">Enforce required status checks for repository administrators.</p>
-                </div>
-              </div>
               }
             </div>
             <input class="btn btn-success js-submit-btn" type="submit" value="Save changes" />
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 6d09e9ec3..1ffeb38ee 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -469,20 +469,6 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{
   color: #aaa;
   line-height: 20px;
 }
-.branches .branch-action{
-  /*float: right;*/
-  text-align: right;
-  height: 20px;
-}
-.branches .branch-action a {
-  font-size: 100%;
-}
-.branches .branch-action a.btn {
-  font-size: 100%;
-  position: relative;
-  top: -6px;
-}
-
 .branches .branch-a-b-count{
   color: rgba(0,0,0,0.5);
 }

From 3e4e278778a6e8a143b7c6da7a0a320e3f4b0d0e Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Mon, 13 Mar 2017 23:58:49 +0900
Subject: [PATCH 04/27] Add Cache-Control header for _avatar and /plugin-assets
 contents for reduce network connection and CPU usage.

---
 src/main/scala/gitbucket/core/controller/AccountController.scala | 1 +
 src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 19c553a41..3d449f84e 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -149,6 +149,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   get("/:userName/_avatar"){
     val userName = params("userName")
+    response.setHeader("Cache-Control", "max-age=3600")
     getAccountByUserName(userName).flatMap(_.image).map { image =>
       RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
     } getOrElse {
diff --git a/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala b/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala
index 0d43af3b1..6fe1ed34e 100644
--- a/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala
@@ -26,6 +26,7 @@ class PluginAssetsServlet extends HttpServlet {
           val bytes = IOUtils.toByteArray(in)
           resp.setContentLength(bytes.length)
           resp.setContentType(FileUtil.getContentType(path, bytes))
+          resp.setHeader("Cache-Control", "max-age=3600")
           resp.getOutputStream.write(bytes)
         } finally {
           in.close()

From f4da49b5bd2a80fd1351930541265d0f5f8d1382 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Tue, 14 Mar 2017 02:17:34 +0900
Subject: [PATCH 05/27] (#1490)Use java.util.Base64 instead of sun.misc or
 commons-codec

---
 src/main/scala/gitbucket/core/api/ApiContents.scala        | 5 +++--
 src/main/scala/gitbucket/core/plugin/PluginRegistory.scala | 4 ++--
 src/main/scala/gitbucket/core/ssh/SshUtil.scala            | 4 ++--
 src/main/scala/gitbucket/core/util/AuthUtil.scala          | 5 +++--
 src/main/scala/gitbucket/core/util/StringUtil.scala        | 6 +++---
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/gitbucket/core/api/ApiContents.scala b/src/main/scala/gitbucket/core/api/ApiContents.scala
index 1d5753b13..8b3735ab0 100644
--- a/src/main/scala/gitbucket/core/api/ApiContents.scala
+++ b/src/main/scala/gitbucket/core/api/ApiContents.scala
@@ -1,8 +1,9 @@
 package gitbucket.core.api
 
+import java.util.Base64
+
 import gitbucket.core.util.JGitUtil.FileInfo
 import gitbucket.core.util.RepositoryName
-import org.apache.commons.codec.binary.Base64
 
 case class ApiContents(
   `type`: String,
@@ -20,7 +21,7 @@ object ApiContents{
       ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)
     } else {
       content.map(arr =>
-        ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.encodeBase64String(arr)), Some("base64"))(repositoryName)
+        ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.getEncoder.encodeToString(arr)), Some("base64"))(repositoryName)
       ).getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
     }
   }
diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
index 7ba1026e6..b299004be 100644
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -2,6 +2,7 @@ package gitbucket.core.plugin
 
 import java.io.{File, FilenameFilter, InputStream}
 import java.net.URLClassLoader
+import java.util.Base64
 import javax.servlet.ServletContext
 
 import gitbucket.core.controller.{Context, ControllerBase}
@@ -15,7 +16,6 @@ import gitbucket.core.util.Directory._
 import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
-import org.apache.commons.codec.binary.{Base64, StringUtils}
 import org.slf4j.LoggerFactory
 
 import scala.collection.mutable
@@ -54,7 +54,7 @@ class PluginRegistry {
   def getPlugins(): List[PluginInfo] = plugins.toList
 
   def addImage(id: String, bytes: Array[Byte]): Unit = {
-    val encoded = StringUtils.newStringUtf8(Base64.encodeBase64(bytes, false))
+    val encoded = Base64.getEncoder.encodeToString(bytes)
     images += ((id, encoded))
   }
 
diff --git a/src/main/scala/gitbucket/core/ssh/SshUtil.scala b/src/main/scala/gitbucket/core/ssh/SshUtil.scala
index 42167edfa..62eb97a7b 100644
--- a/src/main/scala/gitbucket/core/ssh/SshUtil.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshUtil.scala
@@ -1,8 +1,8 @@
 package gitbucket.core.ssh
 
 import java.security.PublicKey
+import java.util.Base64
 
-import org.apache.commons.codec.binary.Base64
 import org.apache.sshd.common.config.keys.KeyUtils
 import org.apache.sshd.common.util.buffer.ByteArrayBuffer
 import org.eclipse.jgit.lib.Constants
@@ -22,7 +22,7 @@ object SshUtil {
     }
     try {
       val encodedKey = parts(1)
-      val decode = Base64.decodeBase64(Constants.encodeASCII(encodedKey))
+      val decode = Base64.getDecoder.decode(Constants.encodeASCII(encodedKey))
       Some(new ByteArrayBuffer(decode).getRawPublicKey)
     } catch {
       case e: Throwable =>
diff --git a/src/main/scala/gitbucket/core/util/AuthUtil.scala b/src/main/scala/gitbucket/core/util/AuthUtil.scala
index 7a83c1387..5d937ca83 100644
--- a/src/main/scala/gitbucket/core/util/AuthUtil.scala
+++ b/src/main/scala/gitbucket/core/util/AuthUtil.scala
@@ -1,5 +1,6 @@
 package gitbucket.core.util
 
+import java.util.Base64
 import javax.servlet.http.HttpServletResponse
 
 /**
@@ -13,9 +14,9 @@ object AuthUtil {
 
   def decodeAuthHeader(header: String): String = {
     try {
-      new String(new sun.misc.BASE64Decoder().decodeBuffer(header.substring(6)))
+      new String(Base64.getDecoder.decode(header.substring(6)))
     } catch {
       case _: Throwable => ""
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/gitbucket/core/util/StringUtil.scala b/src/main/scala/gitbucket/core/util/StringUtil.scala
index 587df3560..d1eadf3ec 100644
--- a/src/main/scala/gitbucket/core/util/StringUtil.scala
+++ b/src/main/scala/gitbucket/core/util/StringUtil.scala
@@ -1,12 +1,12 @@
 package gitbucket.core.util
 
 import java.net.{URLDecoder, URLEncoder}
+import java.util.Base64
 
 import org.mozilla.universalchardet.UniversalDetector
 import SyntaxSugars._
 import org.apache.commons.io.input.BOMInputStream
 import org.apache.commons.io.IOUtils
-import org.apache.commons.codec.binary.Base64
 
 import scala.util.control.Exception._
 
@@ -34,14 +34,14 @@ object StringUtil {
     val spec = new javax.crypto.spec.SecretKeySpec(BlowfishKey.getBytes(), "Blowfish")
     val cipher = javax.crypto.Cipher.getInstance("Blowfish")
     cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, spec)
-    new String(Base64.encodeBase64(cipher.doFinal(value.getBytes("UTF-8"))), "UTF-8")
+    Base64.getEncoder.encodeToString(cipher.doFinal(value.getBytes("UTF-8")))
   }
 
   def decodeBlowfish(value: String): String = {
     val spec = new javax.crypto.spec.SecretKeySpec(BlowfishKey.getBytes(), "Blowfish")
     val cipher = javax.crypto.Cipher.getInstance("Blowfish")
     cipher.init(javax.crypto.Cipher.DECRYPT_MODE, spec)
-    new String(cipher.doFinal(Base64.decodeBase64(value)), "UTF-8")
+    new String(cipher.doFinal(Base64.getDecoder.decode(value)), "UTF-8")
   }
 
   def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8").replace("+", "%20")

From cdc8431865c8f56064c6e3e943451b7570ad83ab Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Tue, 14 Mar 2017 05:36:02 +0900
Subject: [PATCH 06/27] Add query parameter by updatedDate for _avatar image
 for cache control.

---
 .../scala/gitbucket/core/view/AvatarImageProvider.scala     | 6 +++---
 src/main/scala/gitbucket/core/view/helpers.scala            | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala
index 8d316ab3f..8cd64d01a 100644
--- a/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala
+++ b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala
@@ -20,7 +20,7 @@ trait AvatarImageProvider { self: RequestCache =>
         if(account.image.isEmpty && context.settings.gravatar){
           s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
         } else {
-          s"""${context.path}/${account.userName}/_avatar"""
+          s"""${context.path}/${account.userName}/_avatar?${helpers.hashDate(account.updatedDate)}"""
         }
       } getOrElse {
         s"""${context.path}/_unknown/_avatar"""
@@ -31,7 +31,7 @@ trait AvatarImageProvider { self: RequestCache =>
         if(account.image.isEmpty && context.settings.gravatar){
           s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
         } else {
-          s"""${context.path}/${account.userName}/_avatar"""
+          s"""${context.path}/${account.userName}/_avatar?${helpers.hashDate(account.updatedDate)}"""
         }
       } getOrElse {
         if(context.settings.gravatar){
@@ -49,4 +49,4 @@ trait AvatarImageProvider { self: RequestCache =>
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index dc4e1c128..a60dcbb86 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -74,6 +74,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    */
   def date(date: Date): String = new SimpleDateFormat("yyyy-MM-dd").format(date)
 
+  /**
+    * Format java.util.Date to "yyyyMMDDHHmmss" (for url hash ex. /some/path.css?19800101010203
+    */
+  def hashDate(date: Date): String = new SimpleDateFormat("yyyyMMddHHmmss").format(date)
+
   /**
    * Returns singular if count is 1, otherwise plural.
    * If plural is not specified, returns singular + "s" as plural.

From 8fa3bf785071923f121555235656a77ff60463e9 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Tue, 14 Mar 2017 06:08:03 +0900
Subject: [PATCH 07/27] Change from Cache-Control based control to
 Last-Modified based cache control for _avatar.

---
 .../core/controller/AccountController.scala    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 3d449f84e..86866e5cd 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -15,6 +15,7 @@ import io.github.gitbucket.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.scalatra.BadRequest
+import java.util.Date
 
 
 class AccountController extends AccountControllerBase
@@ -149,12 +150,17 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   get("/:userName/_avatar"){
     val userName = params("userName")
-    response.setHeader("Cache-Control", "max-age=3600")
-    getAccountByUserName(userName).flatMap(_.image).map { image =>
-      RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
-    } getOrElse {
-      contentType = "image/png"
-      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
+    (for {
+      account <- getAccountByUserName(userName)
+      image <- account.image
+    } yield (account, image)) match{
+      case Some((account, image)) =>
+        response.setDateHeader("Last-Modified", account.updatedDate.getTime)
+        RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
+      case None =>
+        contentType = "image/png"
+        response.setDateHeader("Last-Modified", (new Date(0)).getTime)
+        Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
     }
   }
 

From 131227615148b96115f0a48442f8f3775daaf975 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Tue, 14 Mar 2017 06:48:35 +0900
Subject: [PATCH 08/27] Add query parameter for cache control. TODO:
 PluginAssetsServlet should add Last-Modified header instead of Cache-Control
 header.

---
 .../scala/gitbucket/core/view/helpers.scala   | 15 ++++++
 .../gitbucket/core/helper/diff.scala.html     |  4 +-
 .../gitbucket/core/helper/preview.scala.html  |  6 +--
 .../twirl/gitbucket/core/index.scala.html     |  2 +-
 src/main/twirl/gitbucket/core/main.scala.html | 54 +++++++++----------
 .../gitbucket/core/pulls/compare.scala.html   |  2 +-
 .../core/pulls/conversation.scala.html        |  4 +-
 .../gitbucket/core/repo/delete.scala.html     |  6 +--
 .../gitbucket/core/repo/editor.scala.html     |  8 +--
 .../gitbucket/core/repo/forked.scala.html     |  4 +-
 10 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index a60dcbb86..f16e81c7f 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -79,6 +79,16 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     */
   def hashDate(date: Date): String = new SimpleDateFormat("yyyyMMddHHmmss").format(date)
 
+  /**
+    * java.util.Date of boot timestamp.
+    */
+  val bootDate: Date = new Date()
+
+  /**
+    * hashDate of bootDate for /assets, /plugin-assets
+    */
+  def hashQuery: String = hashDate(bootDate)
+
   /**
    * Returns singular if count is 1, otherwise plural.
    * If plural is not specified, returns singular + "s" as plural.
@@ -216,6 +226,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    */
   def assets(implicit context: Context): String = s"${context.path}/assets"
 
+  /**
+    * Returns the url to the path of assets.
+    */
+  def assets(path: String)(implicit context: Context): String = s"${context.path}/assets${path}?${hashQuery}"
+
   /**
    * Generates the text link to the account page.
    * If user does not exist or disabled, this method returns user name as text without link.
diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index 17fdea22b..8217c3793 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -130,8 +130,8 @@
     </tr>
   </table>
 }
-<script type="text/javascript" src="@helpers.assets/vendors/jsdifflib/difflib.js"></script>
-<link href="@helpers.assets/vendors/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<script type="text/javascript" src="@helpers.assets("/vendors/jsdifflib/difflib.js")"></script>
+<link href="@helpers.assets("/vendors/jsdifflib/diffview.css")" type="text/css" rel="stylesheet" />
 <script>
 $(function(){
   @if(showIndex){
diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html
index 59f0ec383..473dcd2d2 100644
--- a/src/main/twirl/gitbucket/core/helper/preview.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html
@@ -38,8 +38,8 @@
     </div>
   </div>
 </div>
-<link  href="@helpers.assets/vendors/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
-<script src="@helpers.assets/vendors/google-code-prettify/prettify.js"></script>
+<link  href="@helpers.assets("/vendors/google-code-prettify/prettify.css")" type="text/css" rel="stylesheet"/>
+<script src="@helpers.assets("/vendors/google-code-prettify/prettify.js")"></script>
 <script>
 $(function(){
   @if(elastic){
@@ -47,7 +47,7 @@ $(function(){
   }
 
   $('#preview@uid').click(function(){
-    $('#preview-area@uid').html('<img src="@helpers.assets/common/images/indicator.gif"> Previewing...');
+    $('#preview-area@uid').html('<img src="@helpers.assets("/common/images/indicator.gif")"> Previewing...');
     $.post('@helpers.url(repository)/_preview', {
       content          : $('#content@uid').val(),
       enableWikiLink   : @enableWikiLink,
diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html
index 05aa2ed4e..c0db851ba 100644
--- a/src/main/twirl/gitbucket/core/index.scala.html
+++ b/src/main/twirl/gitbucket/core/index.scala.html
@@ -13,7 +13,7 @@
     @gitbucket.core.dashboard.html.tab()
     <div class="container">
       <div class="pull-right">
-        <a href="@context.path/activities.atom"><img src="@helpers.assets/common/images/feed.png" alt="activities"></a>
+        <a href="@context.path/activities.atom"><img src="@helpers.assets("/common/images/feed.png")" alt="activities"></a>
       </div>
       @gitbucket.core.helper.html.activities(activities)
     </div>
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index a5d792a12..13d0411c1 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -7,42 +7,42 @@
     <meta charset="utf-8">
     <title>@title</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link rel="icon" href="@helpers.assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" />
+    <link rel="icon" href="@helpers.assets("/common/images/gitbucket.png")" type="image/vnd.microsoft.icon" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="@helpers.assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css" rel="stylesheet">
-    <link href="@helpers.assets/vendors/octicons-4.2.0/octicons.css" rel="stylesheet">
-    <link href="@helpers.assets/vendors/bootstrap-datetimepicker-4.17.44/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
-    <link href="@helpers.assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet">
-    <link href="@helpers.assets/vendors/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
-    <link href="@helpers.assets/vendors/facebox/facebox.css" rel="stylesheet"/>
-    <link href="@helpers.assets/vendors/AdminLTE-2.3.8/css/AdminLTE.min.css" rel="stylesheet">
-    <link href="@helpers.assets/vendors/AdminLTE-2.3.8/css/skins/skin-blue.min.css" rel="stylesheet">
-    <link href="@helpers.assets/vendors/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet">
-    <link href="@helpers.assets/common/css/gitbucket.css" rel="stylesheet">
-    <script src="@helpers.assets/vendors/jquery/jquery-1.12.2.min.js"></script>
-    <script src="@helpers.assets/vendors/dropzone/dropzone.js"></script>
-    <script src="@helpers.assets/common/js/validation.js"></script>
-    <script src="@helpers.assets/common/js/gitbucket.js"></script>
-    <script src="@helpers.assets/vendors/bootstrap-3.3.6/js/bootstrap.js"></script>
-    <script src="@helpers.assets/vendors/bootstrap3-typeahead/bootstrap3-typeahead.js"></script>
-    <script src="@helpers.assets/vendors/bootstrap-datetimepicker-4.17.44/js/moment.min.js"></script>
-    <script src="@helpers.assets/vendors/bootstrap-datetimepicker-4.17.44/js/bootstrap-datetimepicker.min.js"></script>
-    <script src="@helpers.assets/vendors/colorpicker/js/bootstrap-colorpicker.js"></script>
-    <script src="@helpers.assets/vendors/google-code-prettify/prettify.js"></script>
-    <script src="@helpers.assets/vendors/elastic/jquery.elastic.source.js"></script>
-    <script src="@helpers.assets/vendors/facebox/facebox.js"></script>
-    <script src="@helpers.assets/vendors/jquery-hotkeys/jquery.hotkeys.js"></script>
-    <script src="@helpers.assets/vendors/jquery-textcomplete-1.6.2/jquery.textcomplete.js"></script>
+    <link href="@helpers.assets("/vendors/bootstrap-3.3.6/css/bootstrap.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/octicons-4.2.0/octicons.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/bootstrap-datetimepicker-4.17.44/css/bootstrap-datetimepicker.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/colorpicker/css/bootstrap-colorpicker.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/google-code-prettify/prettify.css")" type="text/css" rel="stylesheet"/>
+    <link href="@helpers.assets("/vendors/facebox/facebox.css")" rel="stylesheet"/>
+    <link href="@helpers.assets("/vendors/AdminLTE-2.3.8/css/AdminLTE.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/AdminLTE-2.3.8/css/skins/skin-blue.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/font-awesome-4.6.3/css/font-awesome.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/common/css/gitbucket.css")" rel="stylesheet">
+    <script src="@helpers.assets("/vendors/jquery/jquery-1.12.2.min.js")"></script>
+    <script src="@helpers.assets("/vendors/dropzone/dropzone.js")"></script>
+    <script src="@helpers.assets("/common/js/validation.js")"></script>
+    <script src="@helpers.assets("/common/js/gitbucket.js")"></script>
+    <script src="@helpers.assets("/vendors/bootstrap-3.3.6/js/bootstrap.js")"></script>
+    <script src="@helpers.assets("/vendors/bootstrap3-typeahead/bootstrap3-typeahead.js")"></script>
+    <script src="@helpers.assets("/vendors/bootstrap-datetimepicker-4.17.44/js/moment.min.js")"></script>
+    <script src="@helpers.assets("/vendors/bootstrap-datetimepicker-4.17.44/js/bootstrap-datetimepicker.min.js")"></script>
+    <script src="@helpers.assets("/vendors/colorpicker/js/bootstrap-colorpicker.js")"></script>
+    <script src="@helpers.assets("/vendors/google-code-prettify/prettify.js")"></script>
+    <script src="@helpers.assets("/vendors/elastic/jquery.elastic.source.js")"></script>
+    <script src="@helpers.assets("/vendors/facebox/facebox.js")"></script>
+    <script src="@helpers.assets("/vendors/jquery-hotkeys/jquery.hotkeys.js")"></script>
+    <script src="@helpers.assets("/vendors/jquery-textcomplete-1.6.2/jquery.textcomplete.js")"></script>
     @repository.map { repository =>
       <meta name="go-import" content="@context.baseUrl.replaceFirst("^https?://", "")/@repository.owner/@repository.name git @repository.httpUrl" />
     }
-    <script src="@helpers.assets/vendors/AdminLTE-2.3.8/js/app.js" type="text/javascript"></script>
+    <script src="@helpers.assets("/vendors/AdminLTE-2.3.8/js/app.js")" type="text/javascript"></script>
   </head>
   <body class="skin-blue page-load @if(context.sidebarCollapse){sidebar-collapse}">
     <div class="wrapper">
       <header class="main-header">
         <a href="@context.path/" class="logo">
-          <img src="@helpers.assets/common/images/gitbucket.png" style="width: 24px; height: 24px; display: inline;"/>
+          <img src="@helpers.assets("/common/images/gitbucket.png")" style="width: 24px; height: 24px; display: inline;"/>
           GitBucket
           <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span>
         </a>
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index d97b36f0e..d390c17a2 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -43,7 +43,7 @@
         }
       </div>
       <div class="check-conflict" style="display: none;">
-        <img src="@helpers.assets/common/images/indicator.gif"/> Checking...
+        <img src="@helpers.assets("/common/images/indicator.gif")"/> Checking...
       </div>
     </div>
     @if(commits.nonEmpty && context.loginAccount.isDefined){
diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
index 85e862c9c..1785c8929 100644
--- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
@@ -21,7 +21,7 @@
       <div class="check-conflict" style="display: none;">
         <div class="issue-comment-box" style="background-color: #fbeed5">
           <div class="box-content"class="issue-content" style="border: 1px solid #c09853; padding: 10px;">
-            <img src="@helpers.assets/common/images/indicator.gif"/> Checking...
+            <img src="@helpers.assets("/common/images/indicator.gif")"/> Checking...
           </div>
         </div>
       </div>
@@ -63,4 +63,4 @@ $(function(){
     });
   }
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main/twirl/gitbucket/core/repo/delete.scala.html b/src/main/twirl/gitbucket/core/repo/delete.scala.html
index 57190ab82..fc7e77136 100644
--- a/src/main/twirl/gitbucket/core/repo/delete.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/delete.scala.html
@@ -50,10 +50,10 @@
     </form>
   }
 }
-<script type="text/javascript" src="@helpers.assets/vendors/jsdifflib/difflib.js"></script>
-<link href="@helpers.assets/vendors/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<script type="text/javascript" src="@helpers.assets("/vendors/jsdifflib/difflib.js")"></script>
+<link href="@helpers.assets("/vendors/jsdifflib/diffview.css")" type="text/css" rel="stylesheet" />
 <script>
 $(function(){
   diffUsingJS('oldText', 'newText', 'diffText', 1);
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html
index cafbd29a1..282d0602a 100644
--- a/src/main/twirl/gitbucket/core/repo/editor.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html
@@ -72,9 +72,9 @@
     </form>
   }
 }
-<script src="@helpers.assets/vendors/ace/ace.js" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="@helpers.assets/vendors/jsdifflib/difflib.js"></script>
-<link href="@helpers.assets/vendors/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<script src="@helpers.assets("/vendors/ace/ace.js")" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="@helpers.assets("/vendors/jsdifflib/difflib.js")"></script>
+<link href="@helpers.assets("/vendors/jsdifflib/diffview.css")" type="text/css" rel="stylesheet" />
 <script>
 $(function(){
   $('#editor').text($('#initial').val());
@@ -132,7 +132,7 @@ $(function(){
 
     @if(fileName.map(helpers.isRenderable _).getOrElse(false)) {
       // update preview
-      $('#preview').html('<img src="@helpers.assets/common/images/indicator.gif"> Previewing...');
+      $('#preview').html('<img src="@helpers.assets("/common/images/indicator.gif")"> Previewing...');
       $.post('@helpers.url(repository)/_preview', {
         content          : editor.getValue(),
         enableWikiLink   : false,
diff --git a/src/main/twirl/gitbucket/core/repo/forked.scala.html b/src/main/twirl/gitbucket/core/repo/forked.scala.html
index 22eb0cd25..66a768372 100644
--- a/src/main/twirl/gitbucket/core/repo/forked.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/forked.scala.html
@@ -49,8 +49,8 @@
 <script>
 $(function(){
   $('a[rel*=facebox]').facebox({
-    'loadingImage': '@helpers.assets/vendors/facebox/loading.gif',
-    'closeImage': '@helpers.assets/vendors/facebox/closelabel.png'
+    'loadingImage': '@helpers.assets("/vendors/facebox/loading.gif")',
+    'closeImage': '@helpers.assets("/vendors/facebox/closelabel.png")'
   });
 
   $(document).on("click", ".js-fork-owner-select-target", function() {

From c939456f21598b17b2a91d937ddb0561ad39c708 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Tue, 14 Mar 2017 07:18:16 +0900
Subject: [PATCH 09/27] fix test.

---
 .../gitbucket/core/view/AvatarImageProviderSpec.scala | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
index 0af96b940..c512a236c 100644
--- a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
+++ b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
@@ -5,6 +5,7 @@ import java.util.Date
 import gitbucket.core.model.Account
 import gitbucket.core.service.{RequestCache, SystemSettingsService}
 import gitbucket.core.controller.Context
+import gitbucket.core.view.helpers
 import SystemSettingsService.SystemSettings
 import javax.servlet.http.{HttpServletRequest, HttpSession}
 
@@ -34,18 +35,20 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
 
     it("should show uploaded image even if gravatar integration is enabled") {
       implicit val context = Context(createSystemSettings(true), None, request)
-      val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
+      val account = createAccount((Some("icon.png")))
+      val provider = new AvatarImageProviderImpl(Some(account))
 
       assert(provider.toHtml("user", 32).toString ==
-        "<img src=\"/user/_avatar\" class=\"avatar\" style=\"width: 32px; height: 32px;\" />")
+        s"<img src=\"/user/_avatar?${helpers.hashDate(account.updatedDate)}\" class=\"avatar\" style=\"width: 32px; height: 32px;\" />")
     }
 
     it("should show local image for no image account if gravatar integration is disabled") {
       implicit val context = Context(createSystemSettings(false), None, request)
-      val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
+      val account = createAccount(None)
+      val provider = new AvatarImageProviderImpl(account)
 
       assert(provider.toHtml("user", 32).toString ==
-        "<img src=\"/user/_avatar\" class=\"avatar\" style=\"width: 32px; height: 32px;\" />")
+        s"<img src=\"/user/_avatar?${helpers.hashDate(account.updatedDate)}\" class=\"avatar\" style=\"width: 32px; height: 32px;\" />")
     }
 
     it("should show Gravatar image for specified mail address if gravatar integration is enabled") {

From 8087531d64c0f925d6f9e74f8b600a3697a70cca Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Tue, 14 Mar 2017 07:18:16 +0900
Subject: [PATCH 10/27] fix test.

---
 .../core/view/AvatarImageProviderSpec.scala         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
index 0af96b940..27d8c7de5 100644
--- a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
+++ b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
@@ -1,5 +1,6 @@
 package gitbucket.core.view
 
+import java.text.SimpleDateFormat
 import java.util.Date
 
 import gitbucket.core.model.Account
@@ -34,18 +35,22 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
 
     it("should show uploaded image even if gravatar integration is enabled") {
       implicit val context = Context(createSystemSettings(true), None, request)
-      val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
+      val account = createAccount((Some("icon.png")))
+      val date = new SimpleDateFormat("yyyyMMddHHmmss").format(account.updatedDate)
+      val provider = new AvatarImageProviderImpl(Some(account))
 
       assert(provider.toHtml("user", 32).toString ==
-        "<img src=\"/user/_avatar\" class=\"avatar\" style=\"width: 32px; height: 32px;\" />")
+        s"""<img src="/user/_avatar?${date}" class="avatar" style="width: 32px; height: 32px;" />""")
     }
 
     it("should show local image for no image account if gravatar integration is disabled") {
       implicit val context = Context(createSystemSettings(false), None, request)
-      val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
+      val account = createAccount(None)
+      val date = new SimpleDateFormat("yyyyMMddHHmmss").format(account.updatedDate)
+      val provider = new AvatarImageProviderImpl(Some(account))
 
       assert(provider.toHtml("user", 32).toString ==
-        "<img src=\"/user/_avatar\" class=\"avatar\" style=\"width: 32px; height: 32px;\" />")
+        s"""<img src="/user/_avatar?${date}" class="avatar" style="width: 32px; height: 32px;" />""")
     }
 
     it("should show Gravatar image for specified mail address if gravatar integration is enabled") {

From 2cb29654e9d6b249b7dd69be85d41e5c6e8f8788 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Tue, 14 Mar 2017 10:07:16 +0900
Subject: [PATCH 11/27] (refs #1491)Note helper.assets as deprecated.

Use assets(path: String)(implicit context: Context) instead. It adds the hash value which is generated from bootstrap timestamp to the resource url automatically.
---
 src/main/scala/gitbucket/core/view/helpers.scala    | 13 +++++++------
 .../gitbucket/core/account/activity.scala.html      |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index f16e81c7f..a167c8d73 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -75,18 +75,18 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def date(date: Date): String = new SimpleDateFormat("yyyy-MM-dd").format(date)
 
   /**
-    * Format java.util.Date to "yyyyMMDDHHmmss" (for url hash ex. /some/path.css?19800101010203
-    */
+   * Format java.util.Date to "yyyyMMDDHHmmss" (for url hash ex. /some/path.css?19800101010203
+   */
   def hashDate(date: Date): String = new SimpleDateFormat("yyyyMMddHHmmss").format(date)
 
   /**
-    * java.util.Date of boot timestamp.
-    */
+   * java.util.Date of boot timestamp.
+   */
   val bootDate: Date = new Date()
 
   /**
-    * hashDate of bootDate for /assets, /plugin-assets
-    */
+   * hashDate of bootDate for /assets, /plugin-assets
+   */
   def hashQuery: String = hashDate(bootDate)
 
   /**
@@ -224,6 +224,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   /**
    * Returns the url to the root of assets.
    */
+  @deprecated("Use assets(path: String)(implicit context: Context) instead.", "4.11.0")
   def assets(implicit context: Context): String = s"${context.path}/assets"
 
   /**
diff --git a/src/main/twirl/gitbucket/core/account/activity.scala.html b/src/main/twirl/gitbucket/core/account/activity.scala.html
index ed986efc7..e3b13076c 100644
--- a/src/main/twirl/gitbucket/core/account/activity.scala.html
+++ b/src/main/twirl/gitbucket/core/account/activity.scala.html
@@ -4,7 +4,7 @@
 @import gitbucket.core.view.helpers
 @gitbucket.core.account.html.main(account, groupNames, "activity"){
   <div class="pull-right">
-    <a href="@context.path/@{account.userName}.atom"><img src="@{helpers.assets}/common/images/feed.png" alt="activities"></a>
+    <a href="@context.path/@{account.userName}.atom"><img src="@helpers.assets("/common/images/feed.png")" alt="activities"></a>
   </div>
   @gitbucket.core.helper.html.activities(activities)
 }

From 5b68ca141650fb9603e879eab2fcf059ce2c4331 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Tue, 14 Mar 2017 12:27:39 +0900
Subject: [PATCH 12/27] (refs #1491)Code format

---
 .../scala/gitbucket/core/controller/AccountController.scala   | 2 +-
 src/main/scala/gitbucket/core/view/helpers.scala              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 86866e5cd..714ae96bc 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -153,7 +153,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     (for {
       account <- getAccountByUserName(userName)
       image <- account.image
-    } yield (account, image)) match{
+    } yield (account, image)) match {
       case Some((account, image)) =>
         response.setDateHeader("Last-Modified", account.updatedDate.getTime)
         RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index a167c8d73..9bbd996a8 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -228,8 +228,8 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def assets(implicit context: Context): String = s"${context.path}/assets"
 
   /**
-    * Returns the url to the path of assets.
-    */
+   * Returns the url to the path of assets.
+   */
   def assets(path: String)(implicit context: Context): String = s"${context.path}/assets${path}?${hashQuery}"
 
   /**

From 8f91499132985edf781c0deadfbe48a8279e0b1e Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Tue, 14 Mar 2017 12:14:48 +0900
Subject: [PATCH 13/27] use latest mockito

because does not work with Java 9
---
 build.sbt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sbt b/build.sbt
index cf4c1303e..ace5b0b02 100644
--- a/build.sbt
+++ b/build.sbt
@@ -54,6 +54,7 @@ libraryDependencies ++= Seq(
   "javax.servlet"                   %  "javax.servlet-api"            % "3.1.0"          % "provided",
   "junit"                           %  "junit"                        % "4.12"           % "test",
   "org.scalatra"                    %% "scalatra-scalatest"           % ScalatraVersion  % "test",
+  "org.mockito"                     %  "mockito-core"                 % "2.7.16"         % "test",
   "com.wix"                         %  "wix-embedded-mysql"           % "2.1.4"          % "test",
   "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "1.14"           % "test"
 )

From 4344228b92cb3f434299883886168c8fa593bce8 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Sun, 12 Mar 2017 22:52:35 +0900
Subject: [PATCH 14/27] add Java 9 test

---
 .travis.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 889f1e209..8eb0548f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,3 +16,23 @@ cache:
     - $HOME/.coursier
     - $HOME/.embedmysql
     - $HOME/.embedpostgresql
+matrix:
+  include:
+  - dist: trusty
+    group: edge
+    sudo: required
+    jdk: oraclejdk9
+    script:
+    # https://github.com/sbt/sbt/pull/2951
+    - git clone https://github.com/retronym/java9-rt-export
+    - cd java9-rt-export/
+    - git checkout 1019a2873d057dd7214f4135e84283695728395d
+    - jdk_switcher use oraclejdk8
+    - sbt package
+    - jdk_switcher use oraclejdk9
+    - mkdir -p $HOME/.sbt/0.13/java9-rt-ext; java -jar target/java9-rt-export-*.jar $HOME/.sbt/0.13/java9-rt-ext/rt.jar
+    - jar tf $HOME/.sbt/0.13/java9-rt-ext/rt.jar | grep java/lang/Object
+    - cd ..
+    - echo "sbt.version=0.13.14-RC1" > project/build.properties
+    - wget https://raw.githubusercontent.com/paulp/sbt-extras/9ade5fa54914ca8aded44105bf4b9a60966f3ccd/sbt && chmod +x ./sbt
+    - ./sbt -Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext test

From 5ac01a0617cd60cd23094d97f7d37e8a3deaf006 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Tue, 14 Mar 2017 12:51:04 +0900
Subject: [PATCH 15/27] Add Scaladoc

---
 src/main/scala/gitbucket/core/view/Markdown.scala | 1 -
 src/main/scala/gitbucket/core/view/helpers.scala  | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala
index 4b36da302..88f8fff30 100644
--- a/src/main/scala/gitbucket/core/view/Markdown.scala
+++ b/src/main/scala/gitbucket/core/view/Markdown.scala
@@ -44,7 +44,6 @@ object Markdown {
     val renderer = new GitBucketMarkedRenderer(options, repository,
       enableWikiLink, enableRefsLink, enableAnchor, enableTaskList, hasWritePermission, pages)
 
-    //helpers.decorateHtml(Marked.marked(source, options, renderer), repository)
     Marked.marked(source, options, renderer)
   }
 
diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index 9bbd996a8..b308c5f8b 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -365,6 +365,10 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     decorateHtml(HtmlFormat.fill(out).toString, repository)
   }
 
+  /**
+   * Decorate a given HTML by TextDecorators which are provided by plug-ins.
+   * TextDecorators are applied to only text parts of a given HTML.
+   */
   def decorateHtml(html: String, repository: RepositoryInfo)(implicit context: Context): String = {
     PluginRegistry().getTextDecorators.foldLeft(html){ case (html, decorator) =>
       val text = new StringBuilder()

From 2cff3884e275968db8957b4209234ad128973570 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Tue, 14 Mar 2017 12:51:30 +0900
Subject: [PATCH 16/27] Remove copy buttons from the pull request merge guide
 to simplify

---
 .../gitbucket/core/pulls/mergeguide.scala.html    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index 7a10072bc..d8713e09f 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -112,20 +112,19 @@
               <p>
                 <span class="strong">Step 1:</span> From your project repository, check out a new branch and test the changes.
               </p>
-              @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\n" +
-                        s"git pull ${forkedRepository.httpUrl} ${pullreq.requestBranch}"){ command =>
-                @gitbucket.core.helper.html.copy("merge-command", "merge-command-copy-1", command, "position: absolute; right: 31px;")()
-                <pre style="font-size: 12px; border-radius: 3px;" id="merge-command">@Html(command)</pre>
+              @helpers.pre {
+                git checkout -b @{pullreq.requestUserName}-@{pullreq.requestBranch} @{pullreq.branch}
+                git pull @{forkedRepository.httpUrl} @{pullreq.requestBranch}
               }
             </div>
             <div>
               <p>
                 <span class="strong">Step 2:</span> Merge the changes and update on the server.
               </p>
-              @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\n" +
-                        s"git push origin ${pullreq.branch}"){ command =>
-                @gitbucket.core.helper.html.copy("merge-command-2", "merge-command-copy-2", command, "position: absolute; right: 31px;")()
-                <pre style="font-size: 12px; border-radius: 3px;" id="merge-command-2">@command</pre>
+              @helpers.pre {
+                git checkout @{pullreq.branch}
+                git merge --no-ff @{pullreq.requestUserName}-@{pullreq.requestBranch}
+                git push origin @{pullreq.branch}
               }
             </div>
           </div>

From 05739f60ce547917da3cba8b332d6308ab9fe97f Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 15 Mar 2017 07:21:16 +0900
Subject: [PATCH 17/27] Update LICENSE

---
 LICENSE | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index b98f26a2c..8dada3eda 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -179,7 +178,7 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -187,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2013-2016 GitBucket Team
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From 620c3161cfb4ff886a25247d4fb28173c628e61e Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Thu, 16 Mar 2017 23:50:46 +0900
Subject: [PATCH 18/27] Add support TextAvatar feature and _avatar returns it.

---
 .../core/controller/AccountController.scala   | 20 ++++----
 .../core/service/TextAvatarService.scala      | 49 +++++++++++++++++++
 2 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 src/main/scala/gitbucket/core/service/TextAvatarService.scala

diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 714ae96bc..6af8ab659 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -21,13 +21,13 @@ import java.util.Date
 class AccountController extends AccountControllerBase
   with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
   with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-  with AccessTokenService with WebHookService with RepositoryCreationService
+  with AccessTokenService with WebHookService with RepositoryCreationService with TextAvatarService
 
 
 trait AccountControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
     with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-    with AccessTokenService with WebHookService with RepositoryCreationService =>
+    with AccessTokenService with WebHookService with RepositoryCreationService with TextAvatarService =>
 
   case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
                             description: Option[String], url: Option[String], fileId: Option[String])
@@ -150,17 +150,17 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   get("/:userName/_avatar"){
     val userName = params("userName")
-    (for {
-      account <- getAccountByUserName(userName)
-      image <- account.image
-    } yield (account, image)) match {
-      case Some((account, image)) =>
+    getAccountByUserName(userName).map{ account =>
+      account.image.map{ image =>
         response.setDateHeader("Last-Modified", account.updatedDate.getTime)
         RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
-      case None =>
+      }.getOrElse{
         contentType = "image/png"
-        response.setDateHeader("Last-Modified", (new Date(0)).getTime)
-        Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
+        response.setDateHeader("Last-Modified", new Date(0).getTime())
+        textAvatar(account.fullName)
+      }
+    }.getOrElse{
+      NotFound()
     }
   }
 
diff --git a/src/main/scala/gitbucket/core/service/TextAvatarService.scala b/src/main/scala/gitbucket/core/service/TextAvatarService.scala
new file mode 100644
index 000000000..58d5870fe
--- /dev/null
+++ b/src/main/scala/gitbucket/core/service/TextAvatarService.scala
@@ -0,0 +1,49 @@
+package gitbucket.core.service
+
+import java.io.ByteArrayOutputStream
+import java.awt.image.BufferedImage
+import javax.imageio.ImageIO
+import java.awt.{Color, Font, RenderingHints}
+import java.awt.font.{FontRenderContext, TextLayout}
+import gitbucket.core.util.StringUtil
+
+trait TextAvatarService {
+  def textAvatar(nameText: String): Array[Byte] = {
+    val drawText = nameText.substring(0, 1)
+    val md5 = StringUtil.md5(nameText)
+    val hashedInt = Integer.parseInt(md5.substring(0, 2), 16)
+
+    val h = hashedInt / 256f
+    val bgColor = Color.getHSBColor(h, 1f, 1f)
+    val fgColor = Color.getHSBColor(h + 0.5f, 1f, 0.8f)
+
+    val size = (200, 200)
+    val canvas = new BufferedImage(size._1, size._2, BufferedImage.TYPE_INT_ARGB)
+    val g = canvas.createGraphics()
+
+    g.setColor(new Color(0, 0, 0, 0))
+    g.fillRect(0, 0, canvas.getWidth, canvas.getHeight)
+    g.setColor(bgColor)
+    g.fillRoundRect(0, 0, canvas.getWidth, canvas.getHeight, 60, 60)
+
+    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
+
+    g.setColor(fgColor)
+    val font = new Font("SansSerif", Font.PLAIN, 180)
+    val context = g.getFontRenderContext
+    val txt = new TextLayout(drawText, font, context)
+    val bounds = txt.getBounds
+
+    val x: Int = ((size._1 - bounds.getWidth) / 2 - bounds.getX).toInt
+    val y: Int = ((size._2 - bounds.getHeight) / 2 - bounds.getY).toInt
+
+    g.setFont(font)
+    g.drawString(drawText, x, y)
+
+    g.dispose()
+
+    val stream = new ByteArrayOutputStream
+    ImageIO.write(canvas, "png", stream)
+    stream.toByteArray
+  }
+}

From f165e89a8daf3f247e869344ddc09723d823b920 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Fri, 17 Mar 2017 21:38:21 +0900
Subject: [PATCH 19/27] (refs #1498) Fix record inserting and deletion of
 repository related tables

---
 src/main/scala/gitbucket/core/model/DeployKey.scala       | 6 ++----
 .../scala/gitbucket/core/service/RepositoryService.scala  | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/gitbucket/core/model/DeployKey.scala b/src/main/scala/gitbucket/core/model/DeployKey.scala
index 4f34e45a0..71b80a211 100644
--- a/src/main/scala/gitbucket/core/model/DeployKey.scala
+++ b/src/main/scala/gitbucket/core/model/DeployKey.scala
@@ -1,13 +1,11 @@
 package gitbucket.core.model
 
-trait DeployKeyComponent { self: Profile =>
+trait DeployKeyComponent extends TemplateComponent { self: Profile =>
   import profile.api._
 
   lazy val DeployKeys = TableQuery[DeployKeys]
 
-  class DeployKeys(tag: Tag) extends Table[DeployKey](tag, "DEPLOY_KEY") {
-    val userName = column[String]("USER_NAME")
-    val repositoryName = column[String]("REPOSITORY_NAME")
+  class DeployKeys(tag: Tag) extends Table[DeployKey](tag, "DEPLOY_KEY") with BasicTemplate {
     val deployKeyId = column[Int]("DEPLOY_KEY_ID", O AutoInc)
     val title = column[String]("TITLE")
     val publicKey = column[String]("PUBLIC_KEY")
diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala
index 9b5a1bf2c..3640f1c68 100644
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -73,6 +73,7 @@ trait RepositoryService { self: AccountService =>
         val collaborators           = Collaborators          .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val protectedBranches       = ProtectedBranches      .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val protectedBranchContexts = ProtectedBranchContexts.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val deployKeys              = DeployKeys             .filter(_.byRepository(oldUserName, oldRepositoryName)).list
 
         Repositories.filter { t =>
           (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
@@ -112,6 +113,7 @@ trait RepositoryService { self: AccountService =>
         CommitStatuses         .insertAll(commitStatuses.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         ProtectedBranches      .insertAll(protectedBranches.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         ProtectedBranchContexts.insertAll(protectedBranchContexts.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        DeployKeys             .insertAll(deployKeys    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
 
         // Update source repository of pull requests
         PullRequests.filter { t =>
@@ -126,11 +128,6 @@ trait RepositoryService { self: AccountService =>
           userName       = newUserName,
           repositoryName = newRepositoryName
         )) :_*)
-        IssueLabels.insertAll(issueLabels.map(x => x.copy(
-          labelId        = newLabelMap(oldLabelMap(x.labelId)),
-          userName       = newUserName,
-          repositoryName = newRepositoryName
-        )) :_*)
 
         // TODO Drop transfered owner from collaborators?
         Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
@@ -168,6 +165,7 @@ trait RepositoryService { self: AccountService =>
     Milestones    .filter(_.byRepository(userName, repositoryName)).delete
     WebHooks      .filter(_.byRepository(userName, repositoryName)).delete
     WebHookEvents .filter(_.byRepository(userName, repositoryName)).delete
+    DeployKeys    .filter(_.byRepository(userName, repositoryName)).delete
     Repositories  .filter(_.byRepository(userName, repositoryName)).delete
 
     // Update ORIGIN_USER_NAME and ORIGIN_REPOSITORY_NAME

From faa8f8aade77375eb3116a7fe89dbcceb7293219 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Fri, 17 Mar 2017 21:44:18 +0900
Subject: [PATCH 20/27] (refs #1499)Allow guest users to read private
 repositories via HTTP

---
 .../core/servlet/GitAuthenticationFilter.scala      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala b/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala
index 11367877d..7e0ba9797 100644
--- a/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala
@@ -18,9 +18,9 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
   private val logger = LoggerFactory.getLogger(classOf[GitAuthenticationFilter])
 
   def init(config: FilterConfig) = {}
-  
+
   def destroy(): Unit = {}
-  
+
   def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
     val request  = req.asInstanceOf[HttpServletRequest]
     val response = res.asInstanceOf[HttpServletResponse]
@@ -85,11 +85,16 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
                   auth <- Option(request.getHeader("Authorization"))
                   Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2)
                   account <- authenticate(settings, username, password)
-                } yield if (isUpdating || repository.repository.isPrivate) {
+                } yield if (isUpdating) {
                   if (hasDeveloperRole(repository.owner, repository.name, Some(account))) {
                     request.setAttribute(Keys.Request.UserName, account.userName)
                     true
                   } else false
+                } else if(repository.repository.isPrivate){
+                  if (hasGuestRole(repository.owner, repository.name, Some(account))) {
+                    request.setAttribute(Keys.Request.UserName, account.userName)
+                    true
+                  } else false
                 } else true
                 passed.getOrElse(false)
               }
@@ -114,4 +119,4 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
 
     action()
   }
-}
\ No newline at end of file
+}

From e3aa9d739dc55a6b4d00bd7829fc13deb13ce623 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Sat, 18 Mar 2017 00:45:28 +0900
Subject: [PATCH 21/27] fix #1366.

---
 src/main/webapp/assets/common/css/gitbucket.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 1ffeb38ee..ebe312f5e 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1127,7 +1127,7 @@ table.diff tbody tr.not-diff:hover td{
 }
 
 .not-diff > .comment-box-container {
-    white-space: initial;
+    white-space: normal;
     line-height: initial;
     padding: 10px;
 }

From a2e150817c110ae0647c14d4b24903a755e1edc7 Mon Sep 17 00:00:00 2001
From: garbagetown <garbagetown@gmail.com>
Date: Sat, 18 Mar 2017 01:06:52 +0900
Subject: [PATCH 22/27] add permalink to issue comment

---
 src/main/twirl/gitbucket/core/issues/commentlist.scala.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
index a08d31006..976969dd5 100644
--- a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
@@ -46,7 +46,9 @@
             } else {
               referenced the @issueOrPullRequest()
             }
-            @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
+            <a href="@helpers.url(repository)/issues/@issue.get.issueId#comment-@comment.commentId">
+              @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
+            </a>
           </span>
           @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer"
                 && (isManageable || context.loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){

From 4d0e0b7bd24fd0552baef7c4320d726064ce232e Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Sat, 18 Mar 2017 10:40:48 +0900
Subject: [PATCH 23/27] Change TextAvatarService to TextAvatarUtil, color
 detection algorithm, Add fallback to username feature when FullName can't
 draw by default font.

---
 .../core/controller/AccountController.scala   |  9 ++-
 .../core/service/TextAvatarService.scala      | 49 -------------
 .../gitbucket/core/util/TextAvatarUtil.scala  | 72 +++++++++++++++++++
 3 files changed, 76 insertions(+), 54 deletions(-)
 delete mode 100644 src/main/scala/gitbucket/core/service/TextAvatarService.scala
 create mode 100644 src/main/scala/gitbucket/core/util/TextAvatarUtil.scala

diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 6af8ab659..fa1023feb 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -21,13 +21,13 @@ import java.util.Date
 class AccountController extends AccountControllerBase
   with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
   with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-  with AccessTokenService with WebHookService with RepositoryCreationService with TextAvatarService
+  with AccessTokenService with WebHookService with RepositoryCreationService
 
 
 trait AccountControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
     with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-    with AccessTokenService with WebHookService with RepositoryCreationService with TextAvatarService =>
+    with AccessTokenService with WebHookService with RepositoryCreationService =>
 
   case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
                             description: Option[String], url: Option[String], fileId: Option[String])
@@ -151,13 +151,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_avatar"){
     val userName = params("userName")
     getAccountByUserName(userName).map{ account =>
+      response.setDateHeader("Last-Modified", account.updatedDate.getTime)
       account.image.map{ image =>
-        response.setDateHeader("Last-Modified", account.updatedDate.getTime)
         RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
       }.getOrElse{
         contentType = "image/png"
-        response.setDateHeader("Last-Modified", new Date(0).getTime())
-        textAvatar(account.fullName)
+        TextAvatarUtil.textAvatar(account.fullName).getOrElse(Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png"))
       }
     }.getOrElse{
       NotFound()
diff --git a/src/main/scala/gitbucket/core/service/TextAvatarService.scala b/src/main/scala/gitbucket/core/service/TextAvatarService.scala
deleted file mode 100644
index 58d5870fe..000000000
--- a/src/main/scala/gitbucket/core/service/TextAvatarService.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-package gitbucket.core.service
-
-import java.io.ByteArrayOutputStream
-import java.awt.image.BufferedImage
-import javax.imageio.ImageIO
-import java.awt.{Color, Font, RenderingHints}
-import java.awt.font.{FontRenderContext, TextLayout}
-import gitbucket.core.util.StringUtil
-
-trait TextAvatarService {
-  def textAvatar(nameText: String): Array[Byte] = {
-    val drawText = nameText.substring(0, 1)
-    val md5 = StringUtil.md5(nameText)
-    val hashedInt = Integer.parseInt(md5.substring(0, 2), 16)
-
-    val h = hashedInt / 256f
-    val bgColor = Color.getHSBColor(h, 1f, 1f)
-    val fgColor = Color.getHSBColor(h + 0.5f, 1f, 0.8f)
-
-    val size = (200, 200)
-    val canvas = new BufferedImage(size._1, size._2, BufferedImage.TYPE_INT_ARGB)
-    val g = canvas.createGraphics()
-
-    g.setColor(new Color(0, 0, 0, 0))
-    g.fillRect(0, 0, canvas.getWidth, canvas.getHeight)
-    g.setColor(bgColor)
-    g.fillRoundRect(0, 0, canvas.getWidth, canvas.getHeight, 60, 60)
-
-    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
-
-    g.setColor(fgColor)
-    val font = new Font("SansSerif", Font.PLAIN, 180)
-    val context = g.getFontRenderContext
-    val txt = new TextLayout(drawText, font, context)
-    val bounds = txt.getBounds
-
-    val x: Int = ((size._1 - bounds.getWidth) / 2 - bounds.getX).toInt
-    val y: Int = ((size._2 - bounds.getHeight) / 2 - bounds.getY).toInt
-
-    g.setFont(font)
-    g.drawString(drawText, x, y)
-
-    g.dispose()
-
-    val stream = new ByteArrayOutputStream
-    ImageIO.write(canvas, "png", stream)
-    stream.toByteArray
-  }
-}
diff --git a/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala b/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala
new file mode 100644
index 000000000..2d33259a9
--- /dev/null
+++ b/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala
@@ -0,0 +1,72 @@
+package gitbucket.core.util
+
+import java.io.ByteArrayOutputStream
+import java.awt.image.BufferedImage
+import javax.imageio.ImageIO
+import java.awt.{Color, Font, RenderingHints}
+import java.awt.font.{FontRenderContext, TextLayout}
+
+object TextAvatarUtil {
+  // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
+  private def relativeLuminance(c: Color): Double = {
+    val rgb = Seq(c.getRed, c.getGreen, c.getBlue).map{_/255.0}.map{x => if (x <= 0.03928) x / 12.92 else math.pow((x + 0.055) / 1.055, 2.4)}
+    0.2126 * rgb(0) + 0.7152 * rgb(1) + 0.0722 * rgb(2)
+  }
+
+  // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
+  private def contrastRatio(c1: Color, c2: Color): Double = {
+    val l1 = relativeLuminance(c1)
+    val l2 = relativeLuminance(c2)
+    if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05)
+  }
+
+  private def goodContrastColor(base: Color, c1: Color, c2: Color): Color = {
+    if (contrastRatio(base, c1) > contrastRatio(base, c2)) c1 else c2
+  }
+
+  private def textImage(w: Int, h: Int, drawText: String, font: Font, fontSize: Int, bgColor: Color, fgColor: Color): Array[Byte] = {
+    val canvas = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB)
+    val g = canvas.createGraphics()
+
+    g.setColor(new Color(0, 0, 0, 0))
+    g.fillRect(0, 0, w, h)
+    g.setColor(bgColor)
+    g.fillRoundRect(0, 0, w, h, 60, 60)
+
+    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
+
+    g.setColor(fgColor)
+    val context = g.getFontRenderContext
+    val txt = new TextLayout(drawText, font, context)
+    val bounds = txt.getBounds
+
+    val x: Int = ((w - bounds.getWidth) / 2 - bounds.getX).toInt
+    val y: Int = ((h - bounds.getHeight) / 2 - bounds.getY).toInt
+
+    g.setFont(font)
+    g.drawString(drawText, x, y)
+
+    g.dispose()
+
+    val stream = new ByteArrayOutputStream
+    ImageIO.write(canvas, "png", stream)
+    stream.toByteArray
+  }
+
+  def textAvatar(nameText: String): Option[Array[Byte]] = {
+    val drawText = nameText.substring(0, 1)
+    val md5 = StringUtil.md5(nameText)
+    val hashedInt = Integer.parseInt(md5.substring(0, 2), 16)
+
+    val bgHue = hashedInt / 256f
+    val bgSaturation = 0.68f
+    val bgBlightness = 0.73f
+    val bgColor = Color.getHSBColor(bgHue, bgSaturation, bgBlightness)
+    val fgColor = goodContrastColor(bgColor, Color.BLACK, Color.WHITE)
+
+    val size = (200, 200)
+    val fontSize = 180
+    val font = new Font(Font.SANS_SERIF, Font.PLAIN, fontSize)
+    if (font.canDisplayUpTo(drawText) == -1) Some(textImage(size._1, size._2, drawText, font, fontSize, bgColor, fgColor)) else None
+  }
+}

From 81b7c142d86c67db50c7c82cf64f545fc3ac66fd Mon Sep 17 00:00:00 2001
From: Uli Heller <uli.heller@daemons-point.com>
Date: Sat, 18 Mar 2017 08:21:57 +0100
Subject: [PATCH 24/27] Upgraded to jgit-4.6.1.201703071140-r

---
 build.sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index ace5b0b02..caebd90ec 100644
--- a/build.sbt
+++ b/build.sbt
@@ -21,8 +21,8 @@ resolvers ++= Seq(
   "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
 )
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.6.0.201612231935-r",
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.6.0.201612231935-r",
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.6.1.201703071140-r",
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.6.1.201703071140-r",
   "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
   "org.json4s"                      %% "json4s-jackson"               % "3.5.0",

From a76d14d81f3c35ecfb4aef73127319857d22131e Mon Sep 17 00:00:00 2001
From: Mitsuhiro Koga <shiena.jp@gmail.com>
Date: Sat, 18 Mar 2017 18:36:51 +0900
Subject: [PATCH 25/27] fix to align diffstat positions

---
 src/main/twirl/gitbucket/core/helper/diff.scala.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index 8217c3793..a5e2ddfa1 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -16,9 +16,9 @@
     </div>
   </div>
   Showing <a href="javascript:void(0);" id="toggle-file-list">@diffs.size changed @helpers.plural(diffs.size, "file")</a>
-  <ul id="commit-file-list" style="display: none;">
+  <ul id="commit-file-list" style="display: none;clear:right">
   @diffs.zipWithIndex.map { case (diff, i) =>
-    <li@if(i > 0){ class="border"}>
+    <li class="border">
       <span class="pull-right diffstat" data-diff-id="@i"></span>
       <a href="#diff-@i">
         @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){

From c41c15dbc11b0fa2031f0e4c862798c8c7ec1cf3 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Koga <shiena.jp@gmail.com>
Date: Sun, 19 Mar 2017 02:14:12 +0900
Subject: [PATCH 26/27] Display the recursive diffstat on the first commit.

---
 src/main/scala/gitbucket/core/util/JGitUtil.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
index e15af9b73..ac1a9b588 100644
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -538,6 +538,7 @@ object JGitUtil {
       } else {
         // initial commit
         using(new TreeWalk(git.getRepository)){ treeWalk =>
+          treeWalk.setRecursive(true)
           treeWalk.addTree(revCommit.getTree)
           val buffer = new scala.collection.mutable.ListBuffer[DiffInfo]()
           while(treeWalk.next){

From d27b9222baec145358a1ffcbffe09384a163f782 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Sun, 19 Mar 2017 02:14:26 +0900
Subject: [PATCH 27/27] Different style of avatar for groups.

---
 .../core/controller/AccountController.scala   |  6 +-
 .../gitbucket/core/util/TextAvatarUtil.scala  | 99 ++++++++++++++-----
 2 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index fa1023feb..139470232 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -156,7 +156,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
       }.getOrElse{
         contentType = "image/png"
-        TextAvatarUtil.textAvatar(account.fullName).getOrElse(Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png"))
+        (if (account.isGroupAccount) {
+          TextAvatarUtil.textGroupAvatar(account.fullName)
+        } else {
+          TextAvatarUtil.textAvatar(account.fullName)
+        }).getOrElse(Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png"))
       }
     }.getOrElse{
       NotFound()
diff --git a/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala b/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala
index 2d33259a9..48c03173e 100644
--- a/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala
+++ b/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala
@@ -3,10 +3,22 @@ package gitbucket.core.util
 import java.io.ByteArrayOutputStream
 import java.awt.image.BufferedImage
 import javax.imageio.ImageIO
-import java.awt.{Color, Font, RenderingHints}
+import java.awt.{Color, Font, Graphics2D, RenderingHints}
 import java.awt.font.{FontRenderContext, TextLayout}
+import java.awt.geom.AffineTransform
+
 
 object TextAvatarUtil {
+  private val iconSize = 200
+  private val fontSize = 180
+  private val roundSize = 60
+  private val shadowSize = 20
+  private val bgSaturation = 0.68f
+  private val bgBlightness = 0.73f
+  private val shadowBlightness = 0.23f
+  private val font = new Font(Font.SANS_SERIF, Font.PLAIN, fontSize)
+  private val transparent = new Color(0, 0, 0, 0)
+
   // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
   private def relativeLuminance(c: Color): Double = {
     val rgb = Seq(c.getRed, c.getGreen, c.getBlue).map{_/255.0}.map{x => if (x <= 0.03928) x / 12.92 else math.pow((x + 0.055) / 1.055, 2.4)}
@@ -24,27 +36,37 @@ object TextAvatarUtil {
     if (contrastRatio(base, c1) > contrastRatio(base, c2)) c1 else c2
   }
 
-  private def textImage(w: Int, h: Int, drawText: String, font: Font, fontSize: Int, bgColor: Color, fgColor: Color): Array[Byte] = {
-    val canvas = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB)
-    val g = canvas.createGraphics()
+  private def strToHue(text: String): Float = {
+    Integer.parseInt(StringUtil.md5(text).substring(0, 2), 16) / 256f
+  }
 
-    g.setColor(new Color(0, 0, 0, 0))
-    g.fillRect(0, 0, w, h)
-    g.setColor(bgColor)
-    g.fillRoundRect(0, 0, w, h, 60, 60)
-
-    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
-
-    g.setColor(fgColor)
-    val context = g.getFontRenderContext
+  private def getCenterToDraw(drawText: String, font: Font, w: Int, h: Int): (Int, Int) = {
+    val context = new FontRenderContext(new AffineTransform(), true, true)
     val txt = new TextLayout(drawText, font, context)
+
     val bounds = txt.getBounds
 
     val x: Int = ((w - bounds.getWidth) / 2 - bounds.getX).toInt
     val y: Int = ((h - bounds.getHeight) / 2 - bounds.getY).toInt
+    (x, y)
+  }
 
+  private def textImage(drawText: String, bgColor: Color, fgColor: Color): Array[Byte] = {
+    val canvas = new BufferedImage(iconSize, iconSize, BufferedImage.TYPE_INT_ARGB)
+    val g = canvas.createGraphics()
+    val center = getCenterToDraw(drawText, font, iconSize, iconSize)
+
+    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
+
+    g.setColor(transparent)
+    g.fillRect(0, 0, iconSize, iconSize)
+
+    g.setColor(bgColor)
+    g.fillRoundRect(0, 0, iconSize, iconSize, roundSize, roundSize)
+
+    g.setColor(fgColor)
     g.setFont(font)
-    g.drawString(drawText, x, y)
+    g.drawString(drawText, center._1, center._2)
 
     g.dispose()
 
@@ -55,18 +77,51 @@ object TextAvatarUtil {
 
   def textAvatar(nameText: String): Option[Array[Byte]] = {
     val drawText = nameText.substring(0, 1)
-    val md5 = StringUtil.md5(nameText)
-    val hashedInt = Integer.parseInt(md5.substring(0, 2), 16)
 
-    val bgHue = hashedInt / 256f
-    val bgSaturation = 0.68f
-    val bgBlightness = 0.73f
+    val bgHue = strToHue(nameText)
     val bgColor = Color.getHSBColor(bgHue, bgSaturation, bgBlightness)
     val fgColor = goodContrastColor(bgColor, Color.BLACK, Color.WHITE)
 
-    val size = (200, 200)
-    val fontSize = 180
     val font = new Font(Font.SANS_SERIF, Font.PLAIN, fontSize)
-    if (font.canDisplayUpTo(drawText) == -1) Some(textImage(size._1, size._2, drawText, font, fontSize, bgColor, fgColor)) else None
+    if (font.canDisplayUpTo(drawText) == -1) Some(textImage(drawText, bgColor, fgColor)) else None
+  }
+
+  private def textGroupImage(drawText: String, bgColor: Color, fgColor: Color, shadowColor: Color): Array[Byte] = {
+    val canvas = new BufferedImage(iconSize, iconSize, BufferedImage.TYPE_INT_ARGB)
+    val g = canvas.createGraphics()
+    val center = getCenterToDraw(drawText, font, iconSize - shadowSize, iconSize - shadowSize)
+
+    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
+
+    g.setColor(transparent)
+    g.fillRect(0, 0, iconSize, iconSize)
+
+    g.setColor(shadowColor)
+    g.fillRect(shadowSize, shadowSize, iconSize, iconSize)
+
+    g.setColor(bgColor)
+    g.fillRect(0, 0, iconSize - shadowSize, iconSize - shadowSize)
+
+    g.setColor(fgColor)
+
+    g.setFont(font)
+    g.drawString(drawText, center._1, center._2)
+
+    g.dispose()
+
+    val stream = new ByteArrayOutputStream
+    ImageIO.write(canvas, "png", stream)
+    stream.toByteArray
+  }
+
+  def textGroupAvatar(nameText: String): Option[Array[Byte]] = {
+    val drawText = nameText.substring(0, 1)
+
+    val bgHue = strToHue(nameText)
+    val bgColor = Color.getHSBColor(bgHue, bgSaturation, bgBlightness)
+    val fgColor = goodContrastColor(bgColor, Color.BLACK, Color.WHITE)
+    val shadowColor = Color.getHSBColor(bgHue, bgSaturation, shadowBlightness)
+
+    if (font.canDisplayUpTo(drawText) == -1) Some(textGroupImage(drawText, bgColor, fgColor, shadowColor)) else None
   }
 }