Merge remote-tracking branch 'upstream/master' into pr-editorconfig-for-repository

CHANGELOG.md

@@ -1,6 +1,33 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+### 4.26.0 - 30 Jun 2018
+- Installing plugins from the central registry
+- Repositories tab in the dashboard
+- Fork dialog enhancement
+- Adjust pull request creation suggestor
+- Keep showing incompleted task list
+- New notification hooks
+
+### 4.25.0 - 29 May 2018
+- Security improvements
+- Show mail address at the profile page
+- Task list on commit comments
+- More detailed editing history of issues and pull requests
+- Expose user public keys
+- Download repository improvements
+
+### 4.24.1 - 1 May 2018
+- Fix bug in Web API authentication
+
+### 4.24.0 - 30 Apr 2018
+- Diff for each review comment on pull requests
+- Extra mail addresses support
+- Show tags at the commit list
+- Keep wrap mode of the online editor
+- Renew layout of gitbucket-gist-plugin
+- Web API of gitbucket-ci-plugin
+
 ### 4.23.1 - 10 Apr 2018
 - Fix bug that the contents API doesn't work for the repository root
 - Fix shutdown problem in Tomcat deployment

README.md

@@ -1,4 +1,4 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12)
+GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
 =========
 
 GitBucket is a Git web platform powered by Scala offering:
@@ -68,19 +68,14 @@ 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.23.x
+What's New in 4.26.x
 -------------
-### 4.23.1 - 10 Apr 2018
+### 4.26.0 - 30 Jun 2018
-- Fix bug that the contents API doesn't work for the repository root
+- Installing plugins from the central registry
-- Fix shutdown problem in Tomcat deployment
+- Repositories tab in the dashboard
-- Render by plugins at the blob view even if it's a binary file
+- Fork dialog enhancement
-
+- Adjust pull request creation suggestor
-### 4.23.0 - 31 Mar 2018
+- Keep showing incompleted task list
-- Allow tail slash in URL
+- New notification hooks
-- Display commit message of tags at the releases page
-- Add labels property to issues and pull requests API response
-- Plugins list API
-- Git authentication with personal access token
-- Max parallel builds and max stored history in CI plugin became configurable
 
 See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -3,12 +3,12 @@ import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.23.1"
+val GitBucketVersion = "4.26.0"
 val ScalatraVersion = "2.6.1"
 val JettyVersion = "9.4.7.v20170914"
 
 lazy val root = (project in file("."))
-  .enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin)
+  .enablePlugins(SbtTwirl, ScalatraPlugin)
   .settings(
     )
 
@@ -16,7 +16,7 @@ sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.5"
+scalaVersion := "2.12.6"
 
 scalafmtOnCompile := true
 
@@ -30,8 +30,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % "4.11.0.201803080745-r",
+  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % "5.0.1.201806211838-r",
-  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % "4.11.0.201803080745-r",
+  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % "5.0.1.201806211838-r",
   "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
@@ -47,7 +47,7 @@ libraryDependencies ++= Seq(
   "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.10",
   "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
   "com.h2database"                  % "h2"                           % "1.4.196",
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.2.3",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.2.5",
   "org.postgresql"                  % "postgresql"                   % "42.1.4",
   "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
   "com.zaxxer"                      % "HikariCP"                     % "2.7.4",
@@ -97,21 +97,6 @@ assemblyMergeStrategy in assembly := {
   case x => MergeStrategy.first
 }
 
-// JRebel
-//Seq(jrebelSettings: _*)
-
-//jrebel.webLinks += (target in webappPrepare).value
-//jrebel.enabled := System.getenv().get("JREBEL") != null
-javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
-  if (path.endsWith(".jar")) {
-    // Legacy JRebel agent
-    Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
-  } else {
-    // New JRebel agent
-    Seq(s"-agentpath:${path}")
-  }
-}
-
 // Exclude a war file from published artifacts
 signedArtifacts := {
   signedArtifacts.value.filterNot {
@@ -171,12 +156,17 @@ executableKey := {
   // include plugins
   val pluginsDir = temp / "WEB-INF" / "classes" / "plugins"
   IO createDirectory (pluginsDir)
-  IO copyFile (Keys.baseDirectory.value / "plugins.json", pluginsDir / "plugins.json")
 
-  val json = IO read (Keys.baseDirectory.value / "plugins.json")
+  val plugins = IO readLines (Keys.baseDirectory.value / "src" / "main" / "resources" / "bundle-plugins.txt")
-  PluginsJson.getUrls(json).foreach { url =>
+  plugins.foreach { plugin =>
+    plugin.trim.split(":") match {
+      case Array(pluginId, pluginVersion) =>
+        val url = "https://plugins.gitbucket-community.org/releases/" +
+          s"gitbucket-${pluginId}-plugin/gitbucket-${pluginId}-plugin-gitbucket_${version.value}-${pluginVersion}.jar"
         log info s"Download: ${url}"
         IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
+      case _ => ()
+    }
   }
 
   // zip it up

doc/comment_action.md

@@ -7,7 +7,7 @@ To determine if it was any operation, you see the `ACTION` column.
 And in the case of some actions, `CONTENT` column value contains additional information.
 
 |ACTION          |CONTENT                   |
-|----------------|----------------------|
+|----------------|--------------------------|
 |comment         |comment                   |
 |close_comment   |comment                   |
 |reopen_comment  |comment                   |
@@ -20,8 +20,12 @@ And in the case of some actions, `CONTENT` column value contains additional info
 |add_label       |labelName                 |
 |delete_label    |labelName                 |
 |change_priority |oldPriority:priority      |
-|change_milestone|oldMilestone:milestone|
+|change_milestone|oldMilestone:milestone    |
 |assign          |oldAssigned:assigned      |
+|change_title    |oldTitle(CRLF)title \[1\] |
+
+\[1\]: (CRLF) is "\r\n"
+
 
 ### comment
 
@@ -79,3 +83,7 @@ This value is saved when users have changed the milestone.
 ### assign
 
 This value is saved when users have assign issue/PR to user or remove the assign.
+
+### change_title
+
+This value is saved when users have changed the title.

doc/jrebel.md

@@ -1,119 +0,0 @@
-JRebel integration (optional)
-=============================
-
-[JRebel](https://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
-JRebel is generally able to eliminate the need for the slow "app restart" per modification of codes. Alsp it's only used during development, and doesn't change your deployed app in any way.
-
-JRebel is not open source, but we can use it free for non-commercial use.
-
-----
-
-## 1. Get a JRebel license
-
-Sign up for a [myJRebel](https://my.jrebel.com/register). You will need to create an account.
-
-## 2. Download JRebel
-
-Download the most recent ["nosetup" JRebel zip](https://zeroturnaround.com/software/jrebel/download/prev-releases/).
-Next, unzip the downloaded file.
-
-## 3. Activate
-
-Follow `readme.txt` in the extracted directory to activate your downloaded JRebel.
-
-You don't need to integrate with your IDE, since we're using sbt to do the servlet deployment.
-
-## 4. Tell jvm where JRebel is
-
-Fortunately, the gitbucket project is already set up to use JRebel.
-You only need to tell jvm where to find the jrebel jar.
-
-To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux) and set the environment variable `JREBEL`.
-For example, if you unzipped your JRebel download in your home directory, you would use:
-
-```bash
-export JREBEL=~/jrebel/legacy/jrebel.jar      # legacy agent
-export JREBEL=~/jrebel/lib/libjrebel64.dylib  # new agent
-```
-
-You can choose the legacy JRebel agent or the new one.
-See [the document](https://zeroturnaround.com/software/jrebel/jrebel7-agent-upgrade-cli/) for details.
-
-Now reload your shell:
-
-```
-$ source ~/.bash_profile # on Mac
-$ source ~/.bashrc       # on Linux
-```
-
-## 5. See it in action!
-
-Now you're ready to use JRebel with the gitbucket.
-When you run sbt as normal, you will see a long message from JRebel, indicating it has loaded.
-Here's an abbreviated version of what you will see:
-
-```
-$ ./sbt
-[info] Loading project definition from /git/gitbucket/project
-[info] Set current project to gitbucket (in build file:/git/gitbucket/)
->
-```
-
-You will start the servlet container slightly differently now that you're using sbt.
-
-```
-> jetty:quickstart
-:
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  #############################################################
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  Legacy Agent 7.0.15 (201709080836)
-2017-09-21 15:46:35 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  Over the last 2 days JRebel prevented
-2017-09-21 15:46:35 JRebel:  at least 8 redeploys/restarts saving you about 0.3 hours.
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  Licensed to Naoki Takezoe (using myJRebel).
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  #############################################################
-2017-09-21 15:46:35 JRebel:
-:
-
-> ~compile
-[success] Total time: 2 s, completed 2017/09/21 15:50:06
-1. Waiting for source changes... (press enter to interrupt)
-```
-
-Finally, change your code.
-For example, you can change the title on `src/main/twirl/gitbucket/core/main.scala.html` like this:
-
-```html
-:
-  <a href="@context.path/" class="logo">
-    <img src="@helpers.assets("/common/images/gitbucket.svg")" style="width: 24px; height: 24px; display: inline;"/>
-    GitBucket
-    change code !!!!!!!!!!!!!!!!
-    <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span>
-  </a>
-:
-```
-
-If JRebel is doing is correctly installed you will see a notice for you:
-
-```
-1. Waiting for source changes... (press enter to interrupt)
-[info] Compiling 1 Scala source to /Users/naoki.takezoe/gitbucket/target/scala-2.12/classes...
-[success] Total time: 1 s, completed 2017/09/21 15:55:40
-```
-
-And you reload browser, JRebel give notice of that it has reloaded classes:
-
-```
-2. Waiting for source changes... (press enter to interrupt)
-2017-09-21 15:55:40 JRebel: Reloading class 'gitbucket.core.html.main$'.
-```
-
-## 6. Limitations
-
-JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routing patterns, there is nothing JRebel can do, you will have to restart by `jetty:quickstart`.

doc/readme.md

@@ -8,5 +8,4 @@ Developer's Guide
  * [Activity Types](activity.md)
  * [Automatic Schema Updating](auto_update.md)
  * [Release Operation](release.md)
- * [JRebel integration (optional)](jrebel.md)
  * [Licenses](licenses.md)

doc/release.md

@@ -47,7 +47,7 @@ $ sbt executable
 For plug-in development, we have to publish the GitBucket jar file to the Maven central repository as well. At first, hit following command to publish artifacts to the sonatype OSS repository:
 
 ```bash
-$ sbt publish-signed
+$ sbt publishSigned
 ```
 
 Then logged-in https://oss.sonatype.org/ and delete following files from the staging repository:

plugins.json

@@ -1,54 +0,0 @@
-[
-  {
-    "id": "notifications",
-    "name": "Notifications Plugin",
-    "description": "Provides notifications feature on GitBucket.",
-    "versions": [
-      {
-        "version": "1.5.0",
-        "range": ">=4.23.0",
-        "url": "https://github.com/gitbucket/gitbucket-notifications-plugin/releases/download/1.5.0/gitbucket-notifications-plugin-assembly-1.5.0.jar"
-      }
-    ],
-    "default": true
-  },
-  {
-    "id": "emoji",
-    "name": "Emoji Plugin",
-    "description": "Provides Emoji support for GitBucket.",
-    "versions": [
-      {
-        "version": "4.5.0",
-        "range": ">=4.18.0",
-        "url": "https://github.com/gitbucket/gitbucket-emoji-plugin/releases/download/4.5.0/gitbucket-emoji-plugin_2.12-4.5.0.jar"
-      }
-    ],
-    "default": false
-  },
-  {
-    "id": "gist",
-    "name": "Gist Plugin",
-    "description": "Provides Gist feature on GitBucket.",
-    "versions": [
-      {
-        "version": "4.13.0",
-        "range": ">=4.23.0",
-        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.13.0/gitbucket-gist-plugin-assembly-4.13.0.jar"
-      }
-    ],
-    "default": false
-  },
-  {
-    "id": "pages",
-    "name": "Pages Plugin",
-    "description": "Project pages for gitbucket",
-    "versions": [
-      {
-        "version": "1.7.0",
-        "range": ">=4.23.0",
-        "url": "https://github.com/gitbucket/gitbucket-pages-plugin/releases/download/v1.7.0/gitbucket-pages-plugin_2.12-1.7.0.jar"
-      }
-    ],
-    "default": false
-  }
-]

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.3
+sbt.version=1.1.6

project/plugins.sbt

@@ -1,10 +1,8 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.geirsson"     % "sbt-scalafmt" % "1.4.0")
+addSbtPlugin("com.geirsson"     % "sbt-scalafmt" % "1.5.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"    % "1.3.13")
 addSbtPlugin("com.eed3si9n"     % "sbt-assembly" % "0.14.5")
-//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
-//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
 addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.1")
 addSbtPlugin("com.jsuereth"     % "sbt-pgp"      % "1.1.0")
 addSbtCoursier

src/main/resources/bundle-plugins.txt

@@ -0,0 +1 @@
+notifications:1.6.0

src/main/resources/update/gitbucket-core_4.24.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="ACCOUNT_EXTRA_MAIL_ADDRESS">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="EXTRA_MAIL_ADDRESS" type="varchar(100)" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_ACCOUNT_EXTRA_MAIL_ADDRESS_PK" tableName="ACCOUNT_EXTRA_MAIL_ADDRESS" columnNames="USER_NAME, EXTRA_MAIL_ADDRESS"/>
+  <addUniqueConstraint constraintName="IDX_ACCOUNT_EXTRA_MAIL_ADDRESS_1" tableName="ACCOUNT_EXTRA_MAIL_ADDRESS" columnNames="EXTRA_MAIL_ADDRESS"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.25.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <modifyDataType columnName="PASSWORD" newDataType="varchar(200)" tableName="ACCOUNT"/>
+
+  <delete tableName="ACCOUNT_EXTRA_MAIL_ADDRESS">
+    <where>EXTRA_MAIL_ADDRESS = ''</where>
+  </delete>
+</changeSet>

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

@@ -51,5 +51,9 @@ object GitBucketCoreModule
       new Version("4.21.2"),
       new Version("4.22.0", new LiquibaseMigration("update/gitbucket-core_4.22.xml")),
       new Version("4.23.0", new LiquibaseMigration("update/gitbucket-core_4.23.xml")),
-      new Version("4.23.1")
+      new Version("4.23.1"),
+      new Version("4.24.0", new LiquibaseMigration("update/gitbucket-core_4.24.xml")),
+      new Version("4.24.1"),
+      new Version("4.25.0", new LiquibaseMigration("update/gitbucket-core_4.25.xml")),
+      new Version("4.26.0")
     )

src/main/scala/gitbucket/core/api/ApiPullRequestReviewComment.scala

@@ -17,7 +17,7 @@ case class ApiPullRequestReviewComment(
   commit_id: String, // "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   user: ApiUser,
-  body: String, // "Maybe you should use more emojji on this line.",
+  body: String, // "Maybe you should use more emoji on this line.",
   created_at: Date, // "2015-05-05T23:40:27Z",
   updated_at: Date // "2015-05-05T23:40:27Z",
 )(repositoryName: RepositoryName, issueId: Int)

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

@@ -1,8 +1,10 @@
 package gitbucket.core.controller
 
+import java.io.File
+
 import gitbucket.core.account.html
 import gitbucket.core.helper
-import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, Role, WebHook, WebHookContentType}
+import gitbucket.core.model._
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
@@ -54,6 +56,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     password: String,
     fullName: String,
     mailAddress: String,
+    extraMailAddresses: List[String],
     description: Option[String],
     url: Option[String],
     fileId: Option[String]
@@ -63,6 +66,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     password: Option[String],
     fullName: String,
     mailAddress: String,
+    extraMailAddresses: List[String],
     description: Option[String],
     url: Option[String],
     fileId: Option[String],
@@ -78,6 +82,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "password" -> trim(label("Password", text(required, maxlength(20), password))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
+    "extraMailAddresses" -> list(
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress())))
+    ),
     "description" -> trim(label("bio", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
     "fileId" -> trim(label("File ID", optional(text())))
@@ -87,6 +94,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "extraMailAddresses" -> list(
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
+    ),
     "description" -> trim(label("bio", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
     "fileId" -> trim(label("File ID", optional(text()))),
@@ -219,13 +229,15 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName") {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
+      val extraMailAddresses = getAccountExtraMailAddresses(userName)
       params.getOrElse("tab", "repositories") match {
         // Public Activity
         case "activity" =>
           gitbucket.core.account.html.activity(
             account,
             if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getActivitiesByUser(userName, true)
+            getActivitiesByUser(userName, true),
+            extraMailAddresses
           )
 
         // Members
@@ -234,6 +246,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
           gitbucket.core.account.html.members(
             account,
             members,
+            extraMailAddresses,
             context.loginAccount.exists(
               x =>
                 members.exists { member =>
@@ -250,6 +263,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             account,
             if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
             getVisibleRepositories(context.loginAccount, Some(userName)),
+            extraMailAddresses,
             context.loginAccount.exists(
               x =>
                 members.exists { member =>
@@ -268,6 +282,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     helper.xml.feed(getActivitiesByUser(userName, true))
   }
 
+  get("/:userName.keys") {
+    val keys = getPublicKeys(params("userName"))
+    contentType = "text/plain; charset=utf-8"
+    keys.map(_.publicKey).mkString("", "\n", "\n")
+  }
+
   get("/:userName/_avatar") {
     val userName = params("userName")
     contentType = "image/png"
@@ -276,7 +296,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         response.setDateHeader("Last-Modified", account.updatedDate.getTime)
         account.image
           .map { image =>
-            Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image)))
+            Some(
+              RawData(FileUtil.getMimeType(image), new File(getUserUploadDir(userName), FileUtil.checkFilename(image)))
+            )
           }
           .getOrElse {
             if (account.isGroupAccount) {
@@ -295,16 +317,18 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_edit")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
-      html.edit(x, flash.get("info"), flash.get("error"))
+      val extraMails = getAccountExtraMailAddresses(userName)
+      html.edit(x, extraMails, flash.get("info"), flash.get("error"))
     } getOrElse NotFound()
   })
 
   post("/:userName/_edit", editForm)(oneselfOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName).map { account =>
+    getAccountByUserName(userName).map {
+      account =>
         updateAccount(
           account.copy(
-          password = form.password.map(sha1).getOrElse(account.password),
+            password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
             fullName = form.fullName,
             mailAddress = form.mailAddress,
             description = form.description,
@@ -313,6 +337,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         )
 
         updateImage(userName, form.fileId, form.clearImage)
+        updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
         flash += "info" -> "Account information has been updated."
         redirect(s"/${userName}/_edit")
 
@@ -544,7 +569,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     if (context.settings.allowAccountRegistration) {
       createAccount(
         form.userName,
-        sha1(form.password),
+        pbkdf2_sha256(form.password),
         form.fullName,
         form.mailAddress,
         false,
@@ -552,6 +577,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         form.url
       )
       updateImage(form.userName, form.fileId, false)
+      updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != ""))
       redirect("/signin")
     } else NotFound()
   }
@@ -687,7 +713,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
           }
           helper.html.forkrepository(
             repository,
-            (groups zip managerPermissions).toMap
+            (groups zip managerPermissions).sortBy(_._1)
           )
         case _ => redirect(s"/${loginUserName}")
       }

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

@@ -11,6 +11,8 @@ import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
 import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.servlet.Database
+import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
@@ -122,7 +124,7 @@ trait ApiControllerBase extends ControllerBase {
   /*
    * https://developer.github.com/v3/repos/branches/#list-branches
    */
-  get("/api/v3/repos/:owner/:repo/branches")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/branches")(referrersOnly { repository =>
     JsonFormat(
       JGitUtil
         .getBranches(
@@ -140,7 +142,7 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/repos/branches/#get-branch
    */
-  get("/api/v3/repos/:owner/:repo/branches/*")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/branches/*")(referrersOnly { repository =>
     //import gitbucket.core.api._
     (for {
       branch <- params.get("splat") if repository.branchList.contains(branch)
@@ -161,14 +163,14 @@ trait ApiControllerBase extends ControllerBase {
   /*
    * https://developer.github.com/v3/repos/contents/#get-contents
    */
-  get("/api/v3/repos/:owner/:repo/contents")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/contents")(referrersOnly { repository =>
     getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch))
   })
 
   /*
    * https://developer.github.com/v3/repos/contents/#get-contents
    */
-  get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/contents/*")(referrersOnly { repository =>
     getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
   })
 
@@ -183,7 +185,7 @@ trait ApiControllerBase extends ControllerBase {
       getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
     }
 
-    using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
+    using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
       val fileList = getFileList(git, refStr, path)
       if (fileList.isEmpty) { // file or NotFound
         getFileInfo(git, refStr, path)
@@ -242,9 +244,9 @@ trait ApiControllerBase extends ControllerBase {
   /*
    * https://developer.github.com/v3/git/refs/#get-a-reference
    */
-  get("/api/v3/repos/:owner/:repo/git/refs/*")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/git/refs/*")(referrersOnly { repository =>
     val revstr = multiParams("splat").head
-    using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
+    using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
       val ref = git.getRepository().findRef(revstr)
 
       if (ref != null) {
@@ -269,9 +271,11 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/repos/collaborators/#list-collaborators
    */
-  get("/api/v3/repos/:owner/:repo/collaborators")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/collaborators")(referrersOnly { repository =>
     // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
-    JsonFormat(getCollaboratorUserNames(params("owner"), params("repo")).map(u => ApiUser(getAccountByUserName(u).get)))
+    JsonFormat(
+      getCollaboratorUserNames(params("owner"), params("repository")).map(u => ApiUser(getAccountByUserName(u).get))
+    )
   })
 
   /**
@@ -313,7 +317,10 @@ trait ApiControllerBase extends ControllerBase {
             data.auto_init
           )
           Await.result(f, Duration.Inf)
-          val repository = getRepository(owner, data.name).get
+
+          val repository = Database() withTransaction { session =>
+            getRepository(owner, data.name)(session).get
+          }
           JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
         } else {
           ApiError(
@@ -360,7 +367,7 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
    */
-  patch("/api/v3/repos/:owner/:repo/branches/*")(ownerOnly { repository =>
+  patch("/api/v3/repos/:owner/:repository/branches/*")(ownerOnly { repository =>
     import gitbucket.core.api._
     (for {
       branch <- params.get("splat") if repository.branchList.contains(branch)
@@ -718,7 +725,7 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/repos/statuses/#create-a-status
    */
-  post("/api/v3/repos/:owner/:repo/statuses/:sha")(writableUsersOnly { repository =>
+  post("/api/v3/repos/:owner/:repository/statuses/:sha")(writableUsersOnly { repository =>
     (for {
       ref <- params.get("sha")
       sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
@@ -747,7 +754,7 @@ trait ApiControllerBase extends ControllerBase {
    *
    * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
    */
-  val listStatusesRoute = get("/api/v3/repos/:owner/:repo/commits/:ref/statuses")(referrersOnly { repository =>
+  val listStatusesRoute = get("/api/v3/repos/:owner/:repository/commits/:ref/statuses")(referrersOnly { repository =>
     (for {
       ref <- params.get("ref")
       sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
@@ -764,7 +771,7 @@ trait ApiControllerBase extends ControllerBase {
    *
    * legacy route
    */
-  get("/api/v3/repos/:owner/:repo/statuses/:ref") {
+  get("/api/v3/repos/:owner/:repository/statuses/:ref") {
     listStatusesRoute.action()
   }
 
@@ -773,7 +780,7 @@ trait ApiControllerBase extends ControllerBase {
    *
    * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
    */
-  get("/api/v3/repos/:owner/:repo/commits/:ref/status")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/commits/:ref/status")(referrersOnly { repository =>
     (for {
       ref <- params.get("ref")
       owner <- getAccountByUserName(repository.owner)
@@ -787,7 +794,7 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/repos/commits/#get-a-single-commit
    */
-  get("/api/v3/repos/:owner/:repo/commits/:sha")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/commits/:sha")(referrersOnly { repository =>
     val owner = repository.owner
     val name = repository.name
     val sha = params("sha")
@@ -804,7 +811,7 @@ trait ApiControllerBase extends ControllerBase {
           ApiCommits(
             repositoryName = RepositoryName(repository),
             commitInfo = commitInfo,
-            diffs = JGitUtil.getDiffs(git, Some(commitInfo.parents.head), commitInfo.id, false, true),
+            diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
             author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
             committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
             commentCount = getCommitComment(repository.owner, repository.name, sha).size
@@ -839,7 +846,7 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * non-GitHub compatible API for Jenkins-Plugin
    */
-  get("/api/v3/repos/:owner/:repo/raw/*")(referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repository/raw/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
     using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))

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

@@ -1,6 +1,6 @@
 package gitbucket.core.controller
 
-import java.io.FileInputStream
+import java.io.{File, FileInputStream}
 
 import gitbucket.core.api.{ApiError, JsonFormat}
 import gitbucket.core.model.Account
@@ -254,7 +254,7 @@ abstract class ControllerBase
     repository: RepositoryService.RepositoryInfo
   ): Unit = {
     JGitUtil.getObjectLoaderFromId(git, objectId) { loader =>
-      contentType = FileUtil.getMimeType(path)
+      contentType = FileUtil.getSafeMimeType(path)
 
       if (loader.isLarge) {
         response.setContentLength(loader.getSize.toInt)
@@ -326,21 +326,21 @@ trait AccountManagementControllerBase extends ControllerBase {
 
   protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
     if (clearImage) {
-      getAccountByUserName(userName).flatMap(_.image).map { image =>
+      getAccountByUserName(userName).flatMap(_.image).foreach { image =>
-        new java.io.File(getUserUploadDir(userName), image).delete()
+        new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete()
         updateAvatarImage(userName, None)
       }
     } else {
-      fileId.map { fileId =>
+      fileId.foreach { fileId =>
         val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
         val uploadDir = getUserUploadDir(userName)
         if (!uploadDir.exists) {
           uploadDir.mkdirs()
         }
         Thumbnails
-          .of(new java.io.File(getTemporaryDir(session.getId), fileId))
+          .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
           .size(324, 324)
-          .toFile(new java.io.File(uploadDir, filename))
+          .toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
         updateAvatarImage(userName, Some(filename))
       }
     }
@@ -359,15 +359,44 @@ trait AccountManagementControllerBase extends ControllerBase {
       params: Map[String, Seq[String]],
       messages: Messages
     ): Option[String] = {
+      val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
+      if (extraMailAddresses.exists {
+            case (k, v) =>
+              v.contains(value)
+          }) {
+        Some("These mail addresses are duplicated.")
+      } else {
         getAccountByMailAddress(value, true)
-        .filter { x =>
+          .collect {
-          if (paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName)
+            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
-        }
-        .map { _ =>
               "Mail address is already registered."
           }
       }
     }
+  }
+
+  protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() {
+    override def validate(
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
+      if (Some(value) == params.optionValue("mailAddress") || extraMailAddresses.count {
+            case (k, v) =>
+              v.contains(value)
+          } > 1) {
+        Some("These mail addresses are duplicated.")
+      } else {
+        getAccountByMailAddress(value, true)
+          .collect {
+            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
+              "Mail address is already registered."
+          }
+      }
+    }
+  }
 
   val allReservedNames = Set(
     "git",

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

@@ -21,6 +21,16 @@ class DashboardController
 trait DashboardControllerBase extends ControllerBase {
   self: IssuesService with PullRequestService with RepositoryService with AccountService with UsersAuthenticator =>
 
+  get("/dashboard/repos")(usersOnly {
+    val userName = context.loginAccount.get.userName
+
+    html.repos(
+      getGroupNames(userName),
+      getVisibleRepositories(None, withoutPhysicalInfo = true),
+      getUserRepositories(userName, withoutPhysicalInfo = true)
+    )
+  })
+
   get("/dashboard/issues")(usersOnly {
     searchIssues("created_by")
   })
@@ -83,8 +93,7 @@ trait DashboardControllerBase extends ControllerBase {
       },
       filter,
       getGroupNames(userName),
-      Nil,
+      getVisibleRepositories(None, withoutPhysicalInfo = true)
-      getUserRepositories(userName, withoutPhysicalInfo = true)
     )
   }
 
@@ -109,8 +118,7 @@ trait DashboardControllerBase extends ControllerBase {
       },
       filter,
       getGroupNames(userName),
-      Nil,
+      getVisibleRepositories(None, withoutPhysicalInfo = true)
-      getUserRepositories(userName, withoutPhysicalInfo = true)
     )
   }
 

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

@@ -1,7 +1,9 @@
 package gitbucket.core.controller
 
+import java.io.File
+
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, RepositoryService, ReleaseService}
+import gitbucket.core.service.{AccountService, ReleaseService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
 import gitbucket.core.util.SyntaxSugars._
@@ -31,7 +33,8 @@ class FileUploadController
   post("/image") {
     execute(
       { (file, fileId) =>
-        FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+        FileUtils
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get)
         session += Keys.Session.Upload(fileId) -> file.name
       },
       FileUtil.isImage
@@ -41,7 +44,8 @@ class FileUploadController
   post("/tmp") {
     execute(
       { (file, fileId) =>
-        FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+        FileUtils
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get)
         session += Keys.Session.Upload(fileId) -> file.name
       },
       _ => true
@@ -52,9 +56,9 @@ class FileUploadController
     execute(
       { (file, fileId) =>
         FileUtils.writeByteArrayToFile(
-          new java.io.File(
+          new File(
             getAttachedDir(params("owner"), params("repository")),
-            fileId + "." + FileUtil.getExtension(file.getName)
+            FileUtil.checkFilename(fileId + "." + FileUtil.getExtension(file.getName))
           ),
           file.get
         )
@@ -129,12 +133,15 @@ class FileUploadController
           val owner = params("owner")
           val repository = params("repository")
           val tag = params("tag")
-          execute({ (file, fileId) =>
+          execute(
+            { (file, fileId) =>
               FileUtils.writeByteArrayToFile(
-              new java.io.File(getReleaseFilesDir(owner, repository), tag + "/" + fileId),
+                new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)),
                 file.get
               )
-          }, _ => true)
+            },
+            _ => true
+          )
       }
       .getOrElse(BadRequest())
   }

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

@@ -9,7 +9,7 @@ import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
+import gitbucket.core.util._
 import org.scalatra.Ok
 import org.scalatra.forms._
 
@@ -64,8 +64,7 @@ trait IndexControllerBase extends ControllerBase {
         val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
         gitbucket.core.html.index(
           getRecentActivitiesByOwners(visibleOwnerSet),
-          Nil,
+          getVisibleRepositories(None, withoutPhysicalInfo = true),
-          getUserRepositories(account.userName, withoutPhysicalInfo = true),
           showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
             account.userName
           )
@@ -75,7 +74,6 @@ trait IndexControllerBase extends ControllerBase {
         gitbucket.core.html.index(
           getRecentActivities(),
           getVisibleRepositories(None, withoutPhysicalInfo = true),
-          Nil,
           showBannerToCreatePersonalAccessToken = false
         )
       }
@@ -208,7 +206,7 @@ trait IndexControllerBase extends ControllerBase {
             }
             .map { t =>
               Map(
-                "label" -> s"<b>@${t.userName}</b> ${t.fullName}",
+                "label" -> s"<b>@${StringUtil.escapeHtml(t.userName)}</b> ${StringUtil.escapeHtml(t.fullName)}",
                 "value" -> t.userName
               )
             }
@@ -273,18 +271,7 @@ trait IndexControllerBase extends ControllerBase {
     val repositories = visibleRepositories.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }
-    context.loginAccount
+    gitbucket.core.search.html.repositories(query, repositories, visibleRepositories)
-      .map { account =>
-        gitbucket.core.search.html.repositories(
-          query,
-          repositories,
-          Nil,
-          getUserRepositories(account.userName, withoutPhysicalInfo = true)
-        )
-      }
-      .getOrElse {
-        gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil)
-      }
   }
 
 }

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

@@ -154,13 +154,23 @@ trait IssuesControllerBase extends ControllerBase {
   ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) =>
     defining(repository.owner, repository.name) {
       case (owner, name) =>
-        getIssue(owner, name, params("id")).map { issue =>
+        getIssue(owner, name, params("id")).map {
+          issue =>
             if (isEditableContent(owner, name, issue.openedUserName)) {
+              if (issue.title != title) {
                 // update issue
                 updateIssue(owner, name, issue.issueId, title, issue.content)
                 // extract references and create refer comment
                 createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
-
+                createComment(
+                  owner,
+                  name,
+                  context.loginAccount.get.userName,
+                  issue.issueId,
+                  issue.title + "\r\n" + title,
+                  "change_title"
+                )
+              }
               redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
             } else Unauthorized()
         } getOrElse NotFound()
@@ -396,7 +406,7 @@ trait IssuesControllerBase extends ControllerBase {
       case dir if (dir.exists && dir.isDirectory) =>
         dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file =>
           response.setHeader("Content-Disposition", f"""inline; filename=${file.getName}""")
-          RawData(FileUtil.getMimeType(file.getName), file)
+          RawData(FileUtil.getSafeMimeType(file.getName), file)
         }
       case _ => None
     }) getOrElse NotFound()

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

@@ -7,20 +7,21 @@ class PreProcessController extends PreProcessControllerBase
 trait PreProcessControllerBase extends ControllerBase {
 
   /**
-   * Provides GitHub compatible URLs for Git client.
+   * Provides GitHub compatible URLs (e.g. http://localhost:8080/owner/repo.git) for Git client.
-   *
-   * <ul>
-   *   <li>git clone http://localhost:8080/owner/repo</li>
-   *   <li>git clone http://localhost:8080/owner/repo.git</li>
-   * </ul>
-   *
-   * @see https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols
    */
   get("/*/*/info/refs") {
     val query = Option(request.getQueryString).map("?" + _).getOrElse("")
     halt(MovedPermanently(baseUrl + "/git" + request.getRequestURI + query))
   }
 
+  /**
+   * Provides GitHub compatible URLs for GitLFS client.
+   */
+  post("/*/*/info/lfs/objects/batch") {
+    val dispatcher = request.getRequestDispatcher("/git" + request.getRequestURI)
+    dispatcher.forward(request, response)
+  }
+
   /**
    * Filter requests from anonymous users.
    *

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

@@ -1,6 +1,6 @@
 package gitbucket.core.controller
 
-import gitbucket.core.model.WebHook
+import gitbucket.core.model.{CommitComment, CommitComments, IssueComment, WebHook}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
@@ -113,25 +113,20 @@ trait PullRequestsControllerBase extends ControllerBase {
         val name = repository.name
         getPullRequest(owner, name, issueId) map {
           case (issue, pullreq) =>
-            using(Git.open(getRepositoryDir(owner, name))) {
-              git =>
             val (commits, diffs) =
               getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
-                html.pullreq(
+
+            html.conversation(
               issue,
               pullreq,
-                  (commits.flatten
+              commits.flatten,
-                    .map(commit => getCommitComments(owner, name, commit.id, true))
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
-                    .flatten
+              diffs.size,
-                    .toList ::: getComments(owner, name, issueId))
-                    .sortWith((a, b) => a.registeredDate before b.registeredDate),
               getIssueLabels(owner, name, issueId),
               getAssignableUserNames(owner, name),
               getMilestonesWithIssueCount(owner, name),
               getPriorities(owner, name),
               getLabels(owner, name),
-                  commits,
-                  diffs,
               isEditable(repository),
               isManageable(repository),
               hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
@@ -139,7 +134,71 @@ trait PullRequestsControllerBase extends ControllerBase {
               getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
               flash.toMap.map(f => f._1 -> f._2.toString)
             )
+
+//                html.pullreq(
+//                  issue,
+//                  pullreq,
+//                  comments,
+//                  getIssueLabels(owner, name, issueId),
+//                  getAssignableUserNames(owner, name),
+//                  getMilestonesWithIssueCount(owner, name),
+//                  getPriorities(owner, name),
+//                  getLabels(owner, name),
+//                  commits,
+//                  diffs,
+//                  isEditable(repository),
+//                  isManageable(repository),
+//                  hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
+//                  repository,
+//                  getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
+//                  flash.toMap.map(f => f._1 -> f._2.toString)
+//                )
         }
+    } getOrElse NotFound()
+  })
+
+  get("/:owner/:repository/pull/:id/commits")(referrersOnly { repository =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
+          case (issue, pullreq) =>
+            val (commits, diffs) =
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+
+            html.commits(
+              issue,
+              pullreq,
+              commits,
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              diffs.size,
+              isManageable(repository),
+              repository
+            )
+        }
+    } getOrElse NotFound()
+  })
+
+  get("/:owner/:repository/pull/:id/files")(referrersOnly { repository =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
+          case (issue, pullreq) =>
+            val (commits, diffs) =
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+
+            html.files(
+              issue,
+              pullreq,
+              diffs,
+              commits.flatten,
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              isManageable(repository),
+              repository
+            )
         }
     } getOrElse NotFound()
   })
@@ -293,8 +352,17 @@ trait PullRequestsControllerBase extends ControllerBase {
 
                   // close issue by commit message
                   if (pullreq.requestBranch == repository.repository.defaultBranch) {
-                    commits.map { commit =>
+                    commits.foreach { commit =>
-                      closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
+                      closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
+                        issueId =>
+                          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                            callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
+                            PluginRegistry().getIssueHooks
+                              .foreach(
+                                _.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount)
+                              )
+                          }
+                      }
                     }
                   }
 
@@ -399,15 +467,35 @@ trait PullRequestsControllerBase extends ControllerBase {
                     val defaultBranch = getRepository(owner, name).get.repository.defaultBranch
                     if (pullreq.branch == defaultBranch) {
                       commits.flatten.foreach { commit =>
-                        closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
+                        closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
+                          issueId =>
+                            getIssue(owner, name, issueId.toString).foreach { issue =>
+                              callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
+                              PluginRegistry().getIssueHooks
+                                .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
                             }
+                        }
+                      }
+                      val issueContent = issue.title + " " + issue.content.getOrElse("")
                       closeIssuesFromMessage(
-                        issue.title + " " + issue.content.getOrElse(""),
+                        issueContent,
                         loginAccount.userName,
                         owner,
                         name
-                      )
+                      ).foreach { issueId =>
-                      closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
+                        getIssue(owner, name, issueId.toString).foreach { issue =>
+                          callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
+                          PluginRegistry().getIssueHooks
+                            .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
+                        }
+                      }
+                      closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId =>
+                        getIssue(owner, name, issueId.toString).foreach { issue =>
+                          callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
+                          PluginRegistry().getIssueHooks
+                            .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
+                        }
+                      }
                     }
 
                     updatePullRequests(owner, name, pullreq.branch)
@@ -655,7 +743,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
         // insert labels
         if (manageable) {
-          form.labelNames.map { value =>
+          form.labelNames.foreach { value =>
             val labels = getLabels(owner, name)
             value.split(",").foreach { labelName =>
               labels.find(_.labelName == labelName).map { label =>
@@ -693,6 +781,10 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository =>
+    val thresholdTime = System.currentTimeMillis() - (1000 * 60 * 60)
+    val mailAddresses =
+      context.loginAccount.map(x => Seq(x.mailAddress) ++ getAccountExtraMailAddresses(x.userName)).getOrElse(Nil)
+
     val branches = JGitUtil
       .getBranches(
         owner = repository.owner,
@@ -700,8 +792,14 @@ trait PullRequestsControllerBase extends ControllerBase {
         defaultBranch = repository.repository.defaultBranch,
         origin = repository.repository.originUserName.isEmpty
       )
-      .filter(x => x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0)
+      .filter { x =>
-      .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+        x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0 &&
+        x.commitTime.getTime > thresholdTime &&
+        mailAddresses.contains(x.committerEmailAddress)
+      }
+      .sortBy { br =>
+        (br.mergeInfo.isEmpty, br.commitTime)
+      }
       .map(_.name)
       .reverse
 

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

@@ -79,8 +79,8 @@ trait ReleaseControllerBase extends ControllerBase {
     } yield {
       response.setHeader("Content-Disposition", s"attachment; filename=${asset.label}")
       RawData(
-        FileUtil.getMimeType(asset.label),
+        FileUtil.getSafeMimeType(asset.label),
-        new File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId)
+        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(tagName + "/" + fileId))
       )
     }).getOrElse(NotFound())
   })
@@ -111,7 +111,10 @@ trait ReleaseControllerBase extends ControllerBase {
     files.foreach {
       case (fileId, fileName) =>
         val size =
-          new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId).length
+          new File(
+            getReleaseFilesDir(repository.owner, repository.name),
+            FileUtil.checkFilename(tagName + "/" + fileId)
+          ).length
         createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
     }
 
@@ -153,15 +156,18 @@ trait ReleaseControllerBase extends ControllerBase {
           files.foreach {
             case (fileId, fileName) =>
               val size =
-                new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId).length
+                new File(
+                  getReleaseFilesDir(repository.owner, repository.name),
+                  FileUtil.checkFilename(tagName + "/" + fileId)
+                ).length
               createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
           }
 
           assets.foreach { asset =>
             if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
-              val file = new java.io.File(
+              val file = new File(
                 getReleaseFilesDir(repository.owner, repository.name),
-                release.tag + "/" + asset.fileName
+                FileUtil.checkFilename(release.tag + "/" + asset.fileName)
               )
               FileUtils.forceDelete(file)
             }
@@ -175,7 +181,9 @@ trait ReleaseControllerBase extends ControllerBase {
   post("/:owner/:repository/releases/:tag/delete")(writableUsersOnly { repository =>
     val tagName = params("tag")
     getRelease(repository.owner, repository.name, tagName).foreach { release =>
-      FileUtils.deleteDirectory(new File(getReleaseFilesDir(repository.owner, repository.name), release.tag))
+      FileUtils.deleteDirectory(
+        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(release.tag))
+      )
     }
     deleteRelease(repository.owner, repository.name, tagName)
     redirect(s"/${repository.owner}/${repository.name}/releases")

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

@@ -229,7 +229,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   post("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
     val collaborators = params("collaborators")
     removeCollaborators(repository.owner, repository.name)
-    collaborators.split(",").withFilter(_.nonEmpty).map { collaborator =>
+    collaborators.split(",").withFilter(_.nonEmpty).foreach { collaborator =>
       val userName :: role :: Nil = collaborator.split(":").toList
       addCollaborator(repository.owner, repository.name, userName, role)
     }

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

@@ -17,6 +17,13 @@ import gitbucket.core.model.{Account, CommitState, CommitStatus, WebHook}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers
+import org.apache.commons.compress.archivers.{ArchiveEntry, ArchiveOutputStream}
+import org.apache.commons.compress.archivers.tar.{TarArchiveEntry, TarArchiveOutputStream}
+import org.apache.commons.compress.archivers.zip.{ZipArchiveEntry, ZipArchiveOutputStream}
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
+import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream
+import org.apache.commons.compress.utils.IOUtils
 import org.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.ec4j.core.model.PropertyType
@@ -26,6 +33,8 @@ import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib._
 import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
+import org.eclipse.jgit.treewalk.TreeWalk
+import org.eclipse.jgit.treewalk.filter.PathFilter
 import org.json4s.jackson.Serialization
 import org.scalatra._
 import org.scalatra.i18n.Messages
@@ -104,7 +113,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     oldLineNumber: Option[Int],
     newLineNumber: Option[Int],
     content: String,
-    issueId: Option[Int]
+    issueId: Option[Int],
+    diff: Option[String]
   )
 
   val uploadForm = mapping(
@@ -139,7 +149,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "oldLineNumber" -> trim(label("Old line number", optional(number()))),
     "newLineNumber" -> trim(label("New line number", optional(number()))),
     "content" -> trim(label("Content", text(required))),
-    "issueId" -> trim(label("Issue Id", optional(number())))
+    "issueId" -> trim(label("Issue Id", optional(number()))),
+    "diff" -> optional(text())
   )(CommentForm.apply)
 
   /**
@@ -238,6 +249,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
     using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
+        def getTags(sha: String): List[String] = {
+          JGitUtil.getTagsOnCommit(git, sha)
+        }
+
         JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
           case Right((logs, hasNext)) =>
             html.commits(
@@ -251,7 +266,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
               hasNext,
               hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
               getStatuses,
-              getSummary
+              getSummary,
+              getTags
             )
           case Left(_) => NotFound()
         }
@@ -571,6 +587,22 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       form.newLineNumber,
       form.issueId
     )
+
+    for {
+      fileName <- form.fileName
+      diff <- form.diff
+    } {
+      saveCommitCommentDiff(
+        repository.owner,
+        repository.name,
+        id,
+        fileName,
+        form.oldLineNumber,
+        form.newLineNumber,
+        diff
+      )
+    }
+
     form.issueId match {
       case Some(issueId) =>
         recordCommentPullRequestActivity(
@@ -605,7 +637,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       newLineNumber,
       issueId,
       hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-      repository = repository
+      repository = repository,
+      focus = true
     )
   })
 
@@ -622,6 +655,22 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       form.newLineNumber,
       form.issueId
     )
+
+    for {
+      fileName <- form.fileName
+      diff <- form.diff
+    } {
+      saveCommitCommentDiff(
+        repository.owner,
+        repository.name,
+        id,
+        fileName,
+        form.oldLineNumber,
+        form.newLineNumber,
+        diff
+      )
+    }
+
     val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
     form.issueId match {
       case Some(issueId) =>
@@ -675,6 +724,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                   enableRefsLink = true,
                   enableAnchor = true,
                   enableLineBreaks = true,
+                  enableTaskList = true,
                   hasWritePermission = true
                 )
               )
@@ -782,16 +832,54 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   /**
-   * Download repository contents as an archive.
+   * Download repository contents as a zip archive as compatible URL.
    */
-  get("/:owner/:repository/archive/*")(referrersOnly { repository =>
+  get("/:owner/:repository/archive/:branch.zip")(referrersOnly { repository =>
-    multiParams("splat").head match {
+    val branch = params("branch")
-      case name if name.endsWith(".zip") =>
+    archiveRepository(branch, branch + ".zip", repository, "")
-        archiveRepository(name, ".zip", repository)
+  })
-      case name if name.endsWith(".tar.gz") =>
+
-        archiveRepository(name, ".tar.gz", repository)
+  /**
-      case _ => BadRequest()
+   * Download repository contents as a tar.gz archive as compatible URL.
-    }
+   */
+  get("/:owner/:repository/archive/:branch.tar.gz")(referrersOnly { repository =>
+    val branch = params("branch")
+    archiveRepository(branch, branch + ".tar.gz", repository, "")
+  })
+
+  /**
+   * Download repository contents as a tar.bz2 archive as compatible URL.
+   */
+  get("/:owner/:repository/archive/:branch.tar.bz2")(referrersOnly { repository =>
+    val branch = params("branch")
+    archiveRepository(branch, branch + ".tar.bz2", repository, "")
+  })
+
+  /**
+   * Download repository contents as a tar.xz archive as compatible URL.
+   */
+  get("/:owner/:repository/archive/:branch.tar.xz")(referrersOnly { repository =>
+    val branch = params("branch")
+    archiveRepository(branch, branch + ".tar.xz", repository, "")
+  })
+
+  /**
+   * Download all repository contents as an archive.
+   */
+  get("/:owner/:repository/archive/:branch/:name")(referrersOnly { repository =>
+    val branch = params("branch")
+    val name = params("name")
+    archiveRepository(branch, name, repository, "")
+  })
+
+  /**
+   * Download repositories subtree contents as an archive.
+   */
+  get("/:owner/:repository/archive/:branch/*/:name")(referrersOnly { repository =>
+    val branch = params("branch")
+    val name = params("name")
+    val path = multiParams("splat").head
+    archiveRepository(branch, name, repository, path)
   })
 
   get("/:owner/:repository/network/members")(referrersOnly { repository =>
@@ -866,7 +954,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         }
 
         newFiles.foreach { file =>
-          val bytes = FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), file.id))
+          val bytes =
+            FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(file.id)))
           builder.add(
             JGitUtil.createDirCacheEntry(file.name, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes))
           )
@@ -984,7 +1073,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
             // close issue by commit message
             if (branch == repository.repository.defaultBranch) {
-              closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+              closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach {
+                issueId =>
+                  getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                    callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
+                    PluginRegistry().getIssueHooks
+                      .foreach(_.closedByCommitComment(issue, repository, message, loginAccount))
+                  }
+              }
             }
 
             // call post commit hook
@@ -1078,26 +1174,97 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
 
-  private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = {
+  private def archiveRepository(
-    val revision = name.stripSuffix(suffix)
+    revision: String,
-
+    filename: String,
+    repository: RepositoryService.RepositoryInfo,
+    path: String
+  ) = {
+    def archive(archiveFormat: String, archive: ArchiveOutputStream)(
+      entryCreator: (String, Long, Int) => ArchiveEntry
+    ): Unit = {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         val oid = git.getRepository.resolve(revision)
         val revCommit = JGitUtil.getRevCommitFromId(git, oid)
         val sha1 = oid.getName()
         val repositorySuffix = (if (sha1.startsWith(revision)) sha1 else revision).replace('/', '-')
-      val filename = repository.name + "-" + repositorySuffix + suffix
+        val pathSuffix = if (path.isEmpty) "" else '-' + path.replace('/', '-')
+        val baseName = repository.name + "-" + repositorySuffix + pathSuffix
 
+        using(new TreeWalk(git.getRepository)) { treeWalk =>
+          treeWalk.addTree(revCommit.getTree)
+          treeWalk.setRecursive(true)
+          if (!path.isEmpty) {
+            treeWalk.setFilter(PathFilter.create(path))
+          }
+          if (treeWalk != null) {
+            while (treeWalk.next()) {
+              val entryPath =
+                if (path.isEmpty) baseName + "/" + treeWalk.getPathString
+                else path.split("/").last + treeWalk.getPathString.substring(path.length)
+              val size = JGitUtil.getFileSize(git, repository, treeWalk)
+              val mode = treeWalk.getFileMode.getBits
+              val entry: ArchiveEntry = entryCreator(entryPath, size, mode)
+              JGitUtil.openFile(git, repository, revCommit.getTree, treeWalk.getPathString) { in =>
+                archive.putArchiveEntry(entry)
+                IOUtils.copy(in, archive)
+                archive.closeArchiveEntry()
+              }
+            }
+          }
+        }
+      }
+    }
+
+    val suffix =
+      path.split("/").lastOption.collect { case x if x.length > 0 => "-" + x.replace('/', '_') }.getOrElse("")
+    val zipRe = """(.+)\.zip$""".r
+    val tarRe = """(.+)\.tar\.(gz|bz2|xz)$""".r
+
+    filename match {
+      case zipRe(branch) =>
+        response.setHeader(
+          "Content-Disposition",
+          s"attachment; filename=${repository.name}-${branch}${suffix}.zip"
+        )
         contentType = "application/octet-stream"
-      response.setHeader("Content-Disposition", s"attachment; filename=${filename}")
         response.setBufferSize(1024 * 1024);
-
+        using(new ZipArchiveOutputStream(response.getOutputStream)) { zip =>
-      git.archive
+          archive(".zip", zip) { (path, size, mode) =>
-        .setFormat(suffix.tail)
+            val entry = new ZipArchiveEntry(path)
-        .setPrefix(repository.name + "-" + repositorySuffix + "/")
+            entry.setSize(size)
-        .setTree(revCommit)
+            entry.setUnixMode(mode)
-        .setOutputStream(response.getOutputStream)
+            entry
-        .call()
+          }
+        }
+        ()
+      case tarRe(branch, compressor) =>
+        response.setHeader(
+          "Content-Disposition",
+          s"attachment; filename=${repository.name}-${branch}${suffix}.tar.${compressor}"
+        )
+        contentType = "application/octet-stream"
+        response.setBufferSize(1024 * 1024)
+        using(compressor match {
+          case "gz"  => new GzipCompressorOutputStream(response.getOutputStream)
+          case "bz2" => new BZip2CompressorOutputStream(response.getOutputStream)
+          case "xz"  => new XZCompressorOutputStream(response.getOutputStream)
+        }) { compressorOutputStream =>
+          using(new TarArchiveOutputStream(compressorOutputStream)) { tar =>
+            tar.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR)
+            tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU)
+            tar.setAddPaxHeadersForNonAsciiNames(true)
+            archive(".tar.gz", tar) { (path, size, mode) =>
+              val entry = new TarArchiveEntry(path)
+              entry.setSize(size)
+              entry.setMode(mode)
+              entry
+            }
+          }
+        }
+        ()
+      case _ =>
+        BadRequest()
     }
   }
 

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

@@ -15,6 +15,7 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.{AdminAuthenticator, Mailer}
 import org.apache.commons.io.IOUtils
+import org.apache.commons.mail.EmailException
 import org.json4s.jackson.Serialization
 import org.scalatra._
 import org.scalatra.forms._
@@ -44,9 +45,11 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "gravatar" -> trim(label("Gravatar", boolean())),
     "notification" -> trim(label("Notification", boolean())),
     "activityLogLimit" -> trim(label("Limit of activity logs", optional(number()))),
-    "ssh" -> trim(label("SSH access", boolean())),
+    "ssh" -> mapping(
-    "sshHost" -> trim(label("SSH host", optional(text()))),
+      "enabled" -> trim(label("SSH access", boolean())),
-    "sshPort" -> trim(label("SSH port", optional(number()))),
+      "host" -> trim(label("SSH host", optional(text()))),
+      "port" -> trim(label("SSH port", optional(number()))),
+    )(Ssh.apply),
     "useSMTP" -> trim(label("SMTP", boolean())),
     "smtp" -> optionalIfNotChecked(
       "useSMTP",
@@ -89,13 +92,17 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         "jwsAlgorithm" -> trim(label("Signature algorithm", optional(text())))
       )(OIDC.apply)
     ),
-    "skinName" -> trim(label("AdminLTE skin name", text(required)))
+    "skinName" -> trim(label("AdminLTE skin name", text(required))),
+    "showMailAddress" -> trim(label("Show mail address", boolean())),
+    "pluginNetworkInstall" -> new SingleValueType[Boolean] {
+      override def convert(value: String, messages: Messages): Boolean = context.settings.pluginNetworkInstall
+    }
   )(SystemSettings.apply).verifying { settings =>
     Vector(
-      if (settings.ssh && settings.baseUrl.isEmpty) {
+      if (settings.ssh.enabled && settings.baseUrl.isEmpty) {
         Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
       } else None,
-      if (settings.ssh && settings.sshHost.isEmpty) {
+      if (settings.ssh.enabled && settings.ssh.sshHost.isEmpty) {
         Some("sshHost" -> "SSH host is required if SSH access is enabled.")
       } else None
     ).flatten
@@ -124,6 +131,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     password: String,
     fullName: String,
     mailAddress: String,
+    extraMailAddresses: List[String],
     isAdmin: Boolean,
     description: Option[String],
     url: Option[String],
@@ -135,6 +143,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     password: Option[String],
     fullName: String,
     mailAddress: String,
+    extraMailAddresses: List[String],
     isAdmin: Boolean,
     description: Option[String],
     url: Option[String],
@@ -166,6 +175,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "password" -> trim(label("Password", text(required, maxlength(20), password))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
+    "extraMailAddresses" -> list(
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
+    ),
     "isAdmin" -> trim(label("User Type", boolean())),
     "description" -> trim(label("bio", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
@@ -177,6 +189,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "extraMailAddresses" -> list(
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
+    ),
     "isAdmin" -> trim(label("User Type", boolean())),
     "description" -> trim(label("bio", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
@@ -304,6 +319,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       "Test mail has been sent to: " + form.testAddress
 
     } catch {
+      case e: EmailException => s"[Error] ${e.getCause}"
       case e: Exception      => "[Error] " + e.toString
     }
   })
@@ -311,21 +327,17 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   get("/admin/plugins")(adminOnly {
     // Installed plugins
     val enabledPlugins = PluginRegistry().getPlugins()
+    val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
 
-    val gitbucketVersion = Semver.valueOf(GitBucketCoreModule.getVersions.asScala.last.getVersion)
+    // Plugins in the remote repository
-
+    val repositoryPlugins = if (context.settings.pluginNetworkInstall) {
-    // Plugins in the local repository
+      PluginRepository
-    val repositoryPlugins = PluginRepository
         .getPlugins()
-      .filterNot { meta =>
-        enabledPlugins.exists { plugin =>
-          plugin.pluginId == meta.id &&
-          Semver.valueOf(plugin.pluginVersion).greaterThanOrEqualTo(Semver.valueOf(meta.latestVersion.version))
-        }
-      }
         .map { meta =>
           (meta, meta.versions.reverse.find { version =>
-          gitbucketVersion.satisfies(version.range)
+            gitbucketVersion == version.gitbucketVersion && !enabledPlugins.exists { plugin =>
+              plugin.pluginId == meta.id && plugin.pluginVersion == version.version
+            }
           })
         }
         .collect {
@@ -334,56 +346,71 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
               pluginId = meta.id,
               pluginName = meta.name,
               pluginVersion = version.version,
+              gitbucketVersion = Some(version.gitbucketVersion),
               description = meta.description
             )
         }
+    } else Nil
 
     // Merge
-    val plugins = enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false))
+    val plugins = (enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false)))
+      .groupBy(_._1.pluginId)
+      .map {
+        case (pluginId, plugins) =>
+          val (plugin, enabled) = plugins.head
+          (plugin, enabled, if (plugins.length > 1) plugins.last._1.pluginVersion else "")
+      }
+      .toList
 
     html.plugins(plugins, flash.get("info"))
   })
 
   post("/admin/plugins/_reload")(adminOnly {
+    // Update configuration
+    val pluginNetworkInstall = params.get("pluginNetworkInstall").map(_.toBoolean).getOrElse(false)
+    saveSystemSettings(context.settings.copy(pluginNetworkInstall = pluginNetworkInstall))
+
+    // Reload plugins
     PluginRegistry.reload(request.getServletContext(), loadSystemSettings(), request2Session(request).conn)
     flash += "info" -> "All plugins were reloaded."
     redirect("/admin/plugins")
   })
 
-  post("/admin/plugins/:pluginId/:version/_uninstall")(adminOnly {
+  post("/admin/plugins/:pluginId/_uninstall")(adminOnly {
     val pluginId = params("pluginId")
-    val version = params("version")
+
-    PluginRegistry()
+    if (PluginRegistry().getPlugins().exists(_.pluginId == pluginId)) {
-      .getPlugins()
-      .collect { case plugin if (plugin.pluginId == pluginId && plugin.pluginVersion == version) => plugin }
-      .foreach { _ =>
       PluginRegistry
         .uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
       flash += "info" -> s"${pluginId} was uninstalled."
     }
+
     redirect("/admin/plugins")
   })
 
   post("/admin/plugins/:pluginId/:version/_install")(adminOnly {
+    if (context.settings.pluginNetworkInstall) {
       val pluginId = params("pluginId")
       val version = params("version")
-    /// TODO!!!!
+
       PluginRepository
         .getPlugins()
         .collect { case meta if meta.id == pluginId => (meta, meta.versions.find(_.version == version)) }
         .foreach {
           case (meta, version) =>
             version.foreach { version =>
-            // TODO Install version!
               PluginRegistry.install(
-              new java.io.File(PluginHome, s".repository/${version.file}"),
+                pluginId,
+                new java.net.URL(version.url),
                 request.getServletContext,
                 loadSystemSettings(),
                 request2Session(request).conn
               )
-            flash += "info" -> s"${pluginId} was installed."
+              flash += "info" -> s"${pluginId}:${version.version} was installed."
             }
         }
+    }
+
     redirect("/admin/plugins")
   })
 
@@ -400,13 +427,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   })
 
   get("/admin/users/_newuser")(adminOnly {
-    html.user(None)
+    html.user(None, Nil)
   })
 
   post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
     createAccount(
       form.userName,
-      sha1(form.password),
+      pbkdf2_sha256(form.password),
       form.fullName,
       form.mailAddress,
       form.isAdmin,
@@ -414,12 +441,14 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       form.url
     )
     updateImage(form.userName, form.fileId, false)
+    updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != ""))
     redirect("/admin/users")
   })
 
   get("/admin/users/:userName/_edituser")(adminOnly {
     val userName = params("userName")
-    html.user(getAccountByUserName(userName, true), flash.get("error"))
+    val extraMails = getAccountExtraMailAddresses(userName)
+    html.user(getAccountByUserName(userName, true), extraMails, flash.get("error"))
   })
 
   post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
@@ -444,7 +473,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
           updateAccount(
             account.copy(
-              password = form.password.map(sha1).getOrElse(account.password),
+              password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
               fullName = form.fullName,
               mailAddress = form.mailAddress,
               isAdmin = form.isAdmin,
@@ -455,6 +484,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
           )
 
           updateImage(userName, form.fileId, form.clearImage)
+          updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
 
           // call hooks
           if (form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))

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

@@ -180,7 +180,7 @@ trait WikiControllerBase extends ControllerBase {
             loginAccount,
             form.message.getOrElse(""),
             Some(form.id)
-          ).map {
+          ).foreach {
             commitId =>
               updateLastActivityDate(repository.owner, repository.name)
               recordEditWikiPageActivity(
@@ -224,7 +224,7 @@ trait WikiControllerBase extends ControllerBase {
             loginAccount,
             form.message.getOrElse(""),
             None
-          ).map {
+          ).foreach {
             commitId =>
               updateLastActivityDate(repository.owner, repository.name)
               recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)

src/main/scala/gitbucket/core/model/AccountExtraMailAddress.scala

@@ -0,0 +1,19 @@
+package gitbucket.core.model
+
+trait AccountExtraMailAddressComponent { self: Profile =>
+  import profile.api._
+
+  lazy val AccountExtraMailAddresses = TableQuery[AccountExtraMailAddresses]
+
+  class AccountExtraMailAddresses(tag: Tag) extends Table[AccountExtraMailAddress](tag, "ACCOUNT_EXTRA_MAIL_ADDRESS") {
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val extraMailAddress = column[String]("EXTRA_MAIL_ADDRESS", O PrimaryKey)
+    def * =
+      (userName, extraMailAddress) <> (AccountExtraMailAddress.tupled, AccountExtraMailAddress.unapply)
+  }
+}
+
+case class AccountExtraMailAddress(
+  userName: String,
+  extraMailAddress: String
+)

src/main/scala/gitbucket/core/model/Comment.scala

@@ -1,6 +1,7 @@
 package gitbucket.core.model
+import java.util.Date
 
-trait Comment {
+sealed trait Comment {
   val commentedUserName: String
   val registeredDate: java.util.Date
 }
@@ -87,3 +88,11 @@ case class CommitComment(
   updatedDate: java.util.Date,
   issueId: Option[Int]
 ) extends Comment
+
+case class CommitComments(
+  fileName: String,
+  commentedUserName: String,
+  registeredDate: Date,
+  comments: Seq[CommitComment],
+  diff: Option[String]
+) extends Comment

src/main/scala/gitbucket/core/model/Profile.scala

@@ -68,5 +68,6 @@ trait CoreProfile
     with DeployKeyComponent
     with ReleaseTagComponent
     with ReleaseAssetComponent
+    with AccountExtraMailAddressComponent
 
 object Profile extends CoreProfile

src/main/scala/gitbucket/core/plugin/IssueHook.scala

@@ -1,7 +1,7 @@
 package gitbucket.core.plugin
 
 import gitbucket.core.controller.Context
-import gitbucket.core.model.Issue
+import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.model.Profile._
 import profile.api._
@@ -15,6 +15,19 @@ trait IssueHook {
   ): Unit = ()
   def closed(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
   def reopened(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
+  def assigned(
+    issue: Issue,
+    repository: RepositoryInfo,
+    assigner: Option[String],
+    assigned: Option[String],
+    oldAssigned: Option[String]
+  )(
+    implicit session: Session,
+    context: Context
+  ): Unit = ()
+  def closedByCommitComment(issue: Issue, repository: RepositoryInfo, message: String, pusher: Account)(
+    implicit session: Session
+  ): Unit = ()
 
 }
 

src/main/scala/gitbucket/core/plugin/PluginRegistry.scala

@@ -4,11 +4,11 @@ import java.io.{File, FilenameFilter, InputStream}
 import java.net.URLClassLoader
 import java.nio.file.{Files, Paths, StandardWatchEventKinds}
 import java.util.Base64
-import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.ConcurrentHashMap
 import javax.servlet.ServletContext
 
+import com.github.zafarkhaja.semver.Version
 import gitbucket.core.controller.{Context, ControllerBase}
 import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
@@ -202,7 +202,6 @@ object PluginRegistry {
 
   private var watcher: PluginWatchThread = null
   private var extraWatcher: PluginWatchThread = null
-  private val initializing = new AtomicBoolean(false)
 
   /**
    * Returns the PluginRegistry singleton instance.
@@ -223,30 +222,39 @@ object PluginRegistry {
    */
   def uninstall(pluginId: String, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit =
     synchronized {
-      instance
-        .getPlugins()
-        .collect { case plugin if plugin.pluginId == pluginId => plugin }
-        .foreach { plugin =>
-//      try {
-//        plugin.pluginClass.uninstall(instance, context, settings)
-//      } catch {
-//        case e: Exception =>
-//          logger.error(s"Error during uninstalling plugin: ${plugin.pluginJar.getName}", e)
-//      }
       shutdown(context, settings)
-          plugin.pluginJar.delete()
+
+      new File(PluginHome)
+        .listFiles((_: File, name: String) => {
+          name.startsWith(s"gitbucket-${pluginId}-plugin") && name.endsWith(".jar")
+        })
+        .foreach(_.delete())
+
       instance = new PluginRegistry()
       initialize(context, settings, conn)
     }
-    }
 
   /**
    * Install a plugin from a specified jar file.
    */
-  def install(file: File, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit =
+  def install(
+    pluginId: String,
+    url: java.net.URL,
+    context: ServletContext,
+    settings: SystemSettings,
+    conn: java.sql.Connection
+  ): Unit =
     synchronized {
       shutdown(context, settings)
-      FileUtils.copyFile(file, new File(PluginHome, file.getName))
+
+      new File(PluginHome)
+        .listFiles((_: File, name: String) => {
+          name.startsWith(s"gitbucket-${pluginId}-plugin") && name.endsWith(".jar")
+        })
+        .foreach(_.delete())
+
+      val in = url.openStream()
+      FileUtils.copyToFile(in, new File(PluginHome, new File(url.getFile).getName))
       instance = new PluginRegistry()
       initialize(context, settings, conn)
     }
@@ -257,12 +265,27 @@ object PluginRegistry {
         override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
       })
       .toSeq
-      .sortBy(_.getName)
+      .sortBy(x => Version.valueOf(getPluginVersion(x.getName)))
       .reverse
   }
 
   lazy val extraPluginDir: Option[String] = Option(System.getProperty("gitbucket.pluginDir"))
 
+  def getGitBucketVersion(pluginJarFileName: String): Option[String] = {
+    val regex = ".+-gitbucket\\_(\\d+\\.\\d+\\.\\d+)-.+".r
+    pluginJarFileName match {
+      case regex(x) => Some(x)
+      case _        => None
+    }
+  }
+
+  def getPluginVersion(pluginJarFileName: String): String = {
+    val regex = ".+-(\\d+\\.\\d+\\.\\d+)\\.jar$".r
+    pluginJarFileName match {
+      case regex(x) => x
+    }
+  }
+
   /**
    * Initializes all installed plugins.
    */
@@ -278,6 +301,7 @@ object PluginRegistry {
     installedDir.mkdirs()
 
     val pluginJars = listPluginJars(pluginDir)
+
     val extraJars = extraPluginDir
       .map { extraDir =>
         listPluginJars(new File(extraDir))
@@ -288,9 +312,9 @@ object PluginRegistry {
       val installedJar = new File(installedDir, pluginJar.getName)
 
       FileUtils.copyFile(pluginJar, installedJar)
-
       logger.info(s"Initialize ${pluginJar.getName}")
-      val classLoader = new URLClassLoader(Array(installedJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
+      val classLoader =
+        new URLClassLoader(Array(installedJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
       try {
         val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin]
         val pluginId = plugin.pluginId
@@ -304,7 +328,12 @@ object PluginRegistry {
             // Migration
             val solidbase = new Solidbase()
             solidbase
-              .migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
+              .migrate(
+                conn,
+                classLoader,
+                DatabaseConfig.liquiDriver,
+                new Module(plugin.pluginId, plugin.versions: _*)
+              )
             conn.commit()
 
             // Check database version
@@ -323,6 +352,7 @@ object PluginRegistry {
                 pluginId = plugin.pluginId,
                 pluginName = plugin.pluginName,
                 pluginVersion = plugin.versions.last.getVersion,
+                gitbucketVersion = getGitBucketVersion(installedJar.getName),
                 description = plugin.description,
                 pluginClass = plugin,
                 pluginJar = pluginJar,
@@ -384,6 +414,7 @@ class PluginInfoBase(
   val pluginId: String,
   val pluginName: String,
   val pluginVersion: String,
+  val gitbucketVersion: Option[String],
   val description: String
 )
 
@@ -391,11 +422,12 @@ case class PluginInfo(
   override val pluginId: String,
   override val pluginName: String,
   override val pluginVersion: String,
+  override val gitbucketVersion: Option[String],
   override val description: String,
   pluginClass: Plugin,
   pluginJar: File,
   classLoader: URLClassLoader
-) extends PluginInfoBase(pluginId, pluginName, pluginVersion, description)
+) extends PluginInfoBase(pluginId, pluginName, pluginVersion, gitbucketVersion, description)
 
 class PluginWatchThread(context: ServletContext, dir: String) extends Thread with SystemSettingsService {
   import gitbucket.core.model.Profile.profile.blockingApi._

src/main/scala/gitbucket/core/plugin/PluginRepository.scala

@@ -1,8 +1,7 @@
 package gitbucket.core.plugin
 
 import org.json4s._
-import gitbucket.core.util.Directory._
+import org.apache.commons.io.IOUtils
-import org.apache.commons.io.FileUtils
 
 object PluginRepository {
   implicit val formats = DefaultFormats
@@ -11,13 +10,10 @@ object PluginRepository {
     org.json4s.jackson.JsonMethods.parse(json).extract[Seq[PluginMetadata]]
   }
 
-  lazy val LocalRepositoryDir = new java.io.File(PluginHome, ".repository")
-  lazy val LocalRepositoryIndexFile = new java.io.File(LocalRepositoryDir, "plugins.json")
-
   def getPlugins(): Seq[PluginMetadata] = {
-    if (LocalRepositoryIndexFile.exists) {
+    val url = new java.net.URL("https://plugins.gitbucket-community.org/releases/plugins.json")
-      parsePluginJson(FileUtils.readFileToString(LocalRepositoryIndexFile, "UTF-8"))
+    val str = IOUtils.toString(url, "UTF-8")
-    } else Nil
+    parsePluginJson(str)
   }
 
 }
@@ -36,7 +32,5 @@ case class PluginMetadata(
 case class VersionDef(
   version: String,
   url: String,
-  range: String
+  gitbucketVersion: String
-) {
+)
-  lazy val file = url.substring(url.lastIndexOf("/") + 1)
-}

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

@@ -5,13 +5,13 @@ import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.{AccessToken, Account}
 import gitbucket.core.util.StringUtil
 
-import scala.util.Random
+import java.security.SecureRandom
 
 trait AccessTokenService {
 
   def makeAccessTokenString: String = {
     val bytes = new Array[Byte](20)
-    Random.nextBytes(bytes)
+    AccessTokenService.secureRandom.nextBytes(bytes)
     bytes.map("%02x".format(_)).mkString
   }
 
@@ -55,4 +55,6 @@ trait AccessTokenService {
 
 }
 
-object AccessTokenService extends AccessTokenService
+object AccessTokenService extends AccessTokenService {
+  private val secureRandom = new SecureRandom()
+}

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

@@ -1,11 +1,11 @@
 package gitbucket.core.service
 
 import org.slf4j.LoggerFactory
-import gitbucket.core.model.{GroupMember, Account}
+import gitbucket.core.model.{Account, AccountExtraMailAddress, GroupMember}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
-import gitbucket.core.util.{StringUtil, LDAPUtil}
+import gitbucket.core.util.{LDAPUtil, StringUtil}
 import StringUtil._
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 
@@ -33,7 +33,16 @@ trait AccountService {
    * Authenticate by internal database.
    */
   private def defaultAuthentication(userName: String, password: String)(implicit s: Session) = {
+    val pbkdf2re = """^\$pbkdf2-sha256\$(\d+)\$([0-9a-zA-Z+/=]+)\$([0-9a-zA-Z+/=]+)$""".r
     getAccountByUserName(userName).collect {
+      case account if !account.isGroupAccount =>
+        account.password match {
+          case pbkdf2re(iter, salt, hash) if (pbkdf2_sha256(iter.toInt, salt, password) == hash) => Some(account)
+          case p if p == sha1(password) =>
+            updateAccount(account.copy(password = pbkdf2_sha256(password)))
+            Some(account)
+          case _ => None
+        }
       case account if (!account.isGroupAccount && account.password == sha1(password)) => Some(account)
     } getOrElse None
   }
@@ -121,9 +130,16 @@ trait AccountService {
   def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(
     implicit s: Session
   ): Option[Account] =
-    Accounts filter (
+    (Accounts joinLeft AccountExtraMailAddresses on { case (a, e) => a.userName === e.userName })
-      t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)
+      .filter {
-    ) firstOption
+        case (a, x) =>
+          ((a.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) ||
+            (x.map { e =>
+                e.extraMailAddress.toLowerCase === mailAddress.toLowerCase.bind
+              }
+              .getOrElse(false.bind))) && (a.removed === false.bind, !includeRemoved)
+      }
+      .map { case (a, e) => a } firstOption
 
   def getAllUsers(includeRemoved: Boolean = true, includeGroups: Boolean = true)(implicit s: Session): List[Account] = {
     Accounts filter { t =>
@@ -199,6 +215,15 @@ trait AccountService {
   def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit =
     Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image)
 
+  def getAccountExtraMailAddresses(userName: String)(implicit s: Session): List[String] = {
+    AccountExtraMailAddresses.filter(_.userName === userName.bind).map(_.extraMailAddress) list
+  }
+
+  def updateAccountExtraMailAddresses(userName: String, mails: List[String])(implicit s: Session): Unit = {
+    AccountExtraMailAddresses.filter(_.userName === userName.bind).delete
+    mails.map(AccountExtraMailAddresses insert AccountExtraMailAddress(userName, _))
+  }
+
   def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
     Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)
 

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

@@ -1,9 +1,14 @@
 package gitbucket.core.service
 
+import java.io.File
+
 import gitbucket.core.model.CommitComment
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.{FileUtil, StringUtil}
+import org.apache.commons.io.FileUtils
 
 trait CommitsService {
 
@@ -68,4 +73,48 @@ trait CommitsService {
 
   def deleteCommitComment(commentId: Int)(implicit s: Session) =
     CommitComments filter (_.byPrimaryKey(commentId)) delete
+
+  def saveCommitCommentDiff(
+    owner: String,
+    repository: String,
+    commitId: String,
+    fileName: String,
+    oldLine: Option[Int],
+    newLine: Option[Int],
+    diffJson: String
+  ): Unit = {
+    val dir = new File(getDiffDir(owner, repository), FileUtil.checkFilename(commitId))
+    if (!dir.exists) {
+      dir.mkdirs()
+    }
+    val file = diffFile(dir, fileName, oldLine, newLine)
+    FileUtils.write(file, diffJson, "UTF-8")
+  }
+
+  def loadCommitCommentDiff(
+    owner: String,
+    repository: String,
+    commitId: String,
+    fileName: String,
+    oldLine: Option[Int],
+    newLine: Option[Int]
+  ): Option[String] = {
+    val dir = new File(getDiffDir(owner, repository), FileUtil.checkFilename(commitId))
+    val file = diffFile(dir, fileName, oldLine, newLine)
+    if (file.exists) {
+      Option(FileUtils.readFileToString(file, "UTF-8"))
+    } else None
+  }
+
+  private def diffFile(dir: java.io.File, fileName: String, oldLine: Option[Int], newLine: Option[Int]): File = {
+    new File(
+      dir,
+      StringUtil.sha1(
+        fileName +
+          "_oldLine:" + oldLine.map(_.toString).getOrElse("") +
+          "_newLine:" + newLine.map(_.toString).getOrElse("")
+      )
+    )
+  }
+
 }

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

@@ -6,20 +6,21 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.controller.Context
 import gitbucket.core.model.{
+  Account,
+  CommitState,
   Issue,
-  PullRequest,
   IssueComment,
   IssueLabel,
   Label,
-  Account,
+  PullRequest,
   Repository,
-  CommitState,
   Role
 }
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
+import gitbucket.core.plugin.PluginRegistry
 
 trait IssuesService {
   self: AccountService with RepositoryService with LabelsService with PrioritiesService with MilestonesService =>
@@ -511,20 +512,24 @@ trait IssuesService {
     assignedUserName: Option[String],
     insertComment: Boolean = false
   )(implicit context: Context, s: Session): Int = {
+    val oldAssigned = getIssue(owner, repository, s"${issueId}").get.assignedUserName
+    val assigned = assignedUserName
+    val assigner = context.loginAccount.map(_.userName)
     if (insertComment) {
-      val oldAssigned = getIssue(owner, repository, s"${issueId}").get.assignedUserName.getOrElse("Not assigned")
-      val assigned = assignedUserName.getOrElse("Not assigned")
       IssueComments insert IssueComment(
         userName = owner,
         repositoryName = repository,
         issueId = issueId,
         action = "assign",
-        commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
+        commentedUserName = assigner.getOrElse("Unknown user"),
-        content = s"${oldAssigned}:${assigned}",
+        content = s"""${oldAssigned.getOrElse("Not assigned")}:${assigned.getOrElse("Not assigned")}""",
         registeredDate = currentDate,
         updatedDate = currentDate
       )
     }
+    for (issue <- getIssue(owner, repository, issueId.toString); repo <- getRepository(owner, repository)) {
+      PluginRegistry().getIssueHooks.foreach(_.assigned(issue, repo, assigner, assigned, oldAssigned))
+    }
     Issues
       .filter(_.byPrimaryKey(owner, repository, issueId))
       .map(t => (t.assignedUserName ?, t.updatedDate))
@@ -700,11 +705,12 @@ trait IssuesService {
 
   def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)(
     implicit s: Session
-  ): Unit = {
+  ): Seq[Int] = {
-    extractCloseId(message).foreach { issueId =>
+    extractCloseId(message).flatMap { issueId =>
-      for (issue <- getIssue(owner, repository, issueId) if !issue.closed) {
+      for (issue <- getIssue(owner, repository, issueId) if !issue.closed) yield {
         createComment(owner, repository, userName, issue.issueId, "Close", "close")
         updateClosed(owner, repository, issue.issueId, true)
+        issue.issueId
       }
     }
   }

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

@@ -196,7 +196,7 @@ object MergeService {
       refUpdate.setNewObjectId(newObjectId)
       refUpdate.setForceUpdate(force)
       refUpdate.setRefLogIdent(committer)
-      refLogMessage.map(refUpdate.setRefLogMessage(_, true))
+      refLogMessage.foreach(refUpdate.setRefLogMessage(_, true))
       refUpdate.update()
     }
   }

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

@@ -1,6 +1,6 @@
 package gitbucket.core.service
 
-import gitbucket.core.model.{Issue, PullRequest, CommitStatus, CommitState, CommitComment}
+import gitbucket.core.model.{CommitComments => _, Session => _, _}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import difflib.{Delta, DiffUtils}
@@ -12,6 +12,7 @@ import gitbucket.core.util.JGitUtil.{CommitInfo, DiffInfo}
 import gitbucket.core.view
 import gitbucket.core.view.helpers
 import org.eclipse.jgit.api.Git
+
 import scala.collection.JavaConverters._
 
 trait PullRequestService { self: IssuesService with CommitsService =>
@@ -115,6 +116,24 @@ trait PullRequestService { self: IssuesService with CommitsService =>
       .map { case (t1, t2) => t1 }
       .list
 
+  def getPullRequestsByBranch(userName: String, repositoryName: String, branch: String, closed: Option[Boolean])(
+    implicit s: Session
+  ): List[PullRequest] =
+    PullRequests
+      .join(Issues)
+      .on { (t1, t2) =>
+        t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId)
+      }
+      .filter {
+        case (t1, t2) =>
+          (t1.requestUserName === userName.bind) &&
+            (t1.requestRepositoryName === repositoryName.bind) &&
+            (t1.branch === branch.bind) &&
+            (t2.closed === closed.get.bind, closed.isDefined)
+      }
+      .map { case (t1, t2) => t1 }
+      .list
+
   /**
    * for repository viewer.
    * 1. find pull request from `branch` to other branch on same repository
@@ -314,11 +333,57 @@ trait PullRequestService { self: IssuesService with CommitsService =>
           helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
         }
 
+      // TODO Isolate to an another method?
       val diffs = JGitUtil.getDiffs(newGit, Some(oldId.getName), newId.getName, true, false)
 
       (commits, diffs)
     }
 
+  def getPullRequestComments(userName: String, repositoryName: String, issueId: Int, commits: Seq[CommitInfo])(
+    implicit s: Session
+  ): Seq[Comment] = {
+    (commits
+      .map(commit => getCommitComments(userName, repositoryName, commit.id, true))
+      .flatten ++ getComments(userName, repositoryName, issueId))
+      .groupBy {
+        case x: IssueComment                        => (Some(x.commentId), None, None, None)
+        case x: CommitComment if x.fileName.isEmpty => (Some(x.commentId), None, None, None)
+        case x: CommitComment                       => (None, x.fileName, x.oldLine, x.newLine)
+        case x                                      => throw new MatchError(x)
+      }
+      .toSeq
+      .map {
+        // Normal comment
+        case ((Some(_), _, _, _), comments) =>
+          comments.head
+        // Comment on a specific line of a commit
+        case ((None, Some(fileName), oldLine, newLine), comments) =>
+          gitbucket.core.model.CommitComments(
+            fileName = fileName,
+            commentedUserName = comments.head.commentedUserName,
+            registeredDate = comments.head.registeredDate,
+            comments = comments.map(_.asInstanceOf[CommitComment]),
+            diff = loadCommitCommentDiff(
+              userName,
+              repositoryName,
+              comments.head.asInstanceOf[CommitComment].commitId,
+              fileName,
+              oldLine,
+              newLine
+            )
+          )
+      }
+      .sortWith(_.registeredDate before _.registeredDate)
+  }
+
+  def markMergeAndClosePullRequest(userName: String, owner: String, repository: String, pull: PullRequest)(
+    implicit s: Session
+  ): Unit = {
+    createComment(owner, repository, userName, pull.issueId, "Merged by user", "merge")
+    createComment(owner, repository, userName, pull.issueId, "Close", "close")
+    updateClosed(owner, repository, pull.issueId, true)
+  }
+
 }
 
 object PullRequestService {

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

@@ -67,7 +67,7 @@ trait RepositoryService { self: AccountService =>
     getAccountByUserName(newUserName).foreach { account =>
       (Repositories filter { t =>
         t.byRepository(oldUserName, oldRepositoryName)
-      } firstOption).map { repository =>
+      } firstOption).foreach { repository =>
         Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
 
         val webHooks = RepositoryWebHooks.filter(_.byRepository(oldUserName, oldRepositoryName)).list
@@ -338,7 +338,7 @@ trait RepositoryService { self: AccountService =>
             repository.originUserName.getOrElse(repository.userName),
             repository.originRepositoryName.getOrElse(repository.repositoryName)
           ),
-          getRepositoryManagers(repository.userName)
+          getRepositoryManagers(repository.userName, repository.repositoryName)
         )
     }
   }
@@ -407,7 +407,7 @@ trait RepositoryService { self: AccountService =>
           if (withoutPhysicalInfo) {
             Nil
           } else {
-            getRepositoryManagers(repository.userName)
+            getRepositoryManagers(repository.userName, repository.repositoryName)
           }
         )
       }
@@ -485,17 +485,21 @@ trait RepositoryService { self: AccountService =>
           if (withoutPhysicalInfo) {
             Nil
           } else {
-            getRepositoryManagers(repository.userName)
+            getRepositoryManagers(repository.userName, repository.repositoryName)
           }
         )
       }
   }
 
-  private def getRepositoryManagers(userName: String)(implicit s: Session): Seq[String] =
+  /**
-    if (getAccountByUserName(userName).exists(_.isGroupAccount)) {
+   * TODO It seems to be able to improve performance. For example, RequestCache can be used for getAccountByUserName call.
+   */
+  private def getRepositoryManagers(userName: String, repositoryName: String)(implicit s: Session): Seq[String] = {
+    (if (getAccountByUserName(userName).exists(_.isGroupAccount)) {
        getGroupMembers(userName).collect { case x if (x.isManager) => x.userName }
      } else {
        Seq(userName)
+     }) ++ getCollaboratorUserNames(userName, repositoryName, Seq(Role.ADMIN))
   }
 
   /**
@@ -769,7 +773,7 @@ object RepositoryService {
   def httpUrl(owner: String, name: String)(implicit context: Context): String =
     s"${context.baseUrl}/git/${owner}/${name}.git"
   def sshUrl(owner: String, name: String)(implicit context: Context): Option[String] =
-    if (context.settings.ssh) {
+    if (context.settings.ssh.enabled) {
       context.settings.sshAddress.map { x =>
         s"ssh://${x.genericUser}@${x.host}:${x.port}/${owner}/${name}.git"
       }

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

@@ -23,9 +23,9 @@ trait SystemSettingsService {
       props.setProperty(Gravatar, settings.gravatar.toString)
       props.setProperty(Notification, settings.notification.toString)
       settings.activityLogLimit.foreach(x => props.setProperty(ActivityLogLimit, x.toString))
-      props.setProperty(Ssh, settings.ssh.toString)
+      props.setProperty(SshEnabled, settings.ssh.enabled.toString)
-      settings.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
+      settings.ssh.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
-      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
+      settings.ssh.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
       props.setProperty(UseSMTP, settings.useSMTP.toString)
       if (settings.useSMTP) {
         settings.smtp.foreach { smtp =>
@@ -41,7 +41,7 @@ trait SystemSettingsService {
       }
       props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
       if (settings.ldapAuthentication) {
-        settings.ldap.map { ldap =>
+        settings.ldap.foreach { ldap =>
           props.setProperty(LdapHost, ldap.host)
           ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
           ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
@@ -58,16 +58,19 @@ trait SystemSettingsService {
       }
       props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString)
       if (settings.oidcAuthentication) {
-        settings.oidc.map { oidc =>
+        settings.oidc.foreach { oidc =>
           props.setProperty(OidcIssuer, oidc.issuer.getValue)
           props.setProperty(OidcClientId, oidc.clientID.getValue)
           props.setProperty(OidcClientSecret, oidc.clientSecret.getValue)
-          oidc.jwsAlgorithm.map { x =>
+          oidc.jwsAlgorithm.foreach { x =>
             props.setProperty(OidcJwsAlgorithm, x.getName)
           }
         }
       }
       props.setProperty(SkinName, settings.skinName.toString)
+      props.setProperty(ShowMailAddress, settings.showMailAddress.toString)
+      props.setProperty(PluginNetworkInstall, settings.pluginNetworkInstall.toString)
+
       using(new java.io.FileOutputStream(GitBucketConf)) { out =>
         props.store(out, null)
       }
@@ -90,9 +93,11 @@ trait SystemSettingsService {
         getValue(props, Gravatar, false),
         getValue(props, Notification, false),
         getOptionValue[Int](props, ActivityLogLimit, None),
-        getValue(props, Ssh, false),
+        Ssh(
+          getValue(props, SshEnabled, false),
           getOptionValue[String](props, SshHost, None).map(_.trim),
-        getOptionValue(props, SshPort, Some(DefaultSshPort)),
+          getOptionValue(props, SshPort, Some(DefaultSshPort))
+        ),
         getValue(props, UseSMTP, getValue(props, Notification, false)), // handle migration scenario from only notification to useSMTP
         if (getValue(props, UseSMTP, getValue(props, Notification, false))) {
           Some(
@@ -144,7 +149,9 @@ trait SystemSettingsService {
         } else {
           None
         },
-        getValue(props, SkinName, "skin-blue")
+        getValue(props, SkinName, "skin-blue"),
+        getValue(props, ShowMailAddress, false),
+        getValue(props, PluginNetworkInstall, false)
       )
     }
   }
@@ -165,16 +172,16 @@ object SystemSettingsService {
     gravatar: Boolean,
     notification: Boolean,
     activityLogLimit: Option[Int],
-    ssh: Boolean,
+    ssh: Ssh,
-    sshHost: Option[String],
-    sshPort: Option[Int],
     useSMTP: Boolean,
     smtp: Option[Smtp],
     ldapAuthentication: Boolean,
     ldap: Option[Ldap],
     oidcAuthentication: Boolean,
     oidc: Option[OIDC],
-    skinName: String
+    skinName: String,
+    showMailAddress: Boolean,
+    pluginNetworkInstall: Boolean
   ) {
 
     def baseUrl(request: HttpServletRequest): String =
@@ -193,12 +200,18 @@ object SystemSettingsService {
         .fold(base)(_ + base.dropWhile(_ != ':'))
     }
 
-    def sshAddress: Option[SshAddress] = sshHost.collect {
+    def sshAddress: Option[SshAddress] = ssh.sshHost.collect {
-      case host if ssh =>
+      case host if ssh.enabled =>
-        SshAddress(host, sshPort.getOrElse(DefaultSshPort), "git")
+        SshAddress(host, ssh.sshPort.getOrElse(DefaultSshPort), "git")
     }
   }
 
+  case class Ssh(
+    enabled: Boolean,
+    sshHost: Option[String],
+    sshPort: Option[Int]
+  )
+
   case class Ldap(
     host: String,
     port: Option[Int],
@@ -252,7 +265,7 @@ object SystemSettingsService {
   private val Gravatar = "gravatar"
   private val Notification = "notification"
   private val ActivityLogLimit = "activity_log_limit"
-  private val Ssh = "ssh"
+  private val SshEnabled = "ssh"
   private val SshHost = "ssh.host"
   private val SshPort = "ssh.port"
   private val UseSMTP = "useSMTP"
@@ -283,6 +296,8 @@ object SystemSettingsService {
   private val OidcClientSecret = "oidc.client_secret"
   private val OidcJwsAlgorithm = "oidc.jws_algorithm"
   private val SkinName = "skinName"
+  private val ShowMailAddress = "showMailAddress"
+  private val PluginNetworkInstall = "plugin.networkInstall"
 
   private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
     getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse {

src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala

@@ -296,13 +296,34 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                   createIssueComment(owner, repository, commit)
                   // close issues
                   if (refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE) {
-                    closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository)
+                    getAccountByUserName(pusher).foreach { pusherAccount =>
+                      closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId =>
+                        getIssue(owner, repository, issueId.toString).foreach { issue =>
+                          callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount)
+                          PluginRegistry().getIssueHooks
+                            .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount))
+                        }
+                      }
+                    }
                   }
                 }
                 Some(commit)
               } else None
             }
 
+            // set PR as merged
+            val pulls = getPullRequestsByBranch(owner, repository, branchName, Some(false))
+            pulls.foreach { pull =>
+              if (commits.find { c =>
+                    c.id == pull.commitIdTo
+                  }.isDefined) {
+                markMergeAndClosePullRequest(pusher, owner, repository, pull)
+                getAccountByUserName(pusher).foreach { pusherAccount =>
+                  callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, pusherAccount)
+                }
+              }
+            }
+
             // record activity
             if (refName(1) == "heads") {
               command.getType match {
@@ -326,7 +347,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                 case ReceiveCommand.Type.CREATE | ReceiveCommand.Type.UPDATE |
                     ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
                   updatePullRequests(owner, repository, branchName)
-                  getAccountByUserName(pusher).map { pusherAccount =>
+                  getAccountByUserName(pusher).foreach { pusherAccount =>
                     callPullRequestWebHookByRequestBranch(
                       "synchronize",
                       repositoryInfo,
@@ -418,7 +439,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
             }
           }
 
-          commitIds.map {
+          commitIds.foreach {
             case (oldCommitId, newCommitId) =>
               val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
                 JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit =>

src/main/scala/gitbucket/core/servlet/InitializeListener.scala

@@ -5,7 +5,7 @@ import java.io.{File, FileOutputStream}
 import akka.event.Logging
 import com.typesafe.config.ConfigFactory
 import gitbucket.core.GitBucketCoreModule
-import gitbucket.core.plugin.{PluginRegistry, PluginRepository}
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.{ActivityService, SystemSettingsService}
 import gitbucket.core.util.DatabaseConfig
 import gitbucket.core.util.Directory._
@@ -20,7 +20,6 @@ import org.apache.commons.io.{FileUtils, IOUtils}
 import org.slf4j.LoggerFactory
 import akka.actor.{Actor, ActorSystem, Props}
 import com.typesafe.akka.extension.quartz.QuartzSchedulerExtension
-import com.github.zafarkhaja.semver.{Version => Semver}
 
 import scala.collection.JavaConverters._
 
@@ -136,39 +135,29 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
   }
 
   private def extractBundledPlugins(gitbucketVersion: String): Unit = {
-    logger.info("Extract bundled plugins")
+    logger.info("Extract bundled plugins...")
     val cl = Thread.currentThread.getContextClassLoader
     try {
-      using(cl.getResourceAsStream("plugins/plugins.json")) { pluginsFile =>
+      using(cl.getResourceAsStream("bundle-plugins.txt")) { pluginsFile =>
         if (pluginsFile != null) {
-          val pluginsJson = IOUtils.toString(pluginsFile, "UTF-8")
+          val plugins = IOUtils.readLines(pluginsFile, "UTF-8")
+          val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
 
-          FileUtils.forceMkdir(PluginRepository.LocalRepositoryDir)
+          plugins.asScala.foreach { plugin =>
-          FileUtils.write(PluginRepository.LocalRepositoryIndexFile, pluginsJson, "UTF-8")
+            plugin.trim.split(":") match {
+              case Array(pluginId, pluginVersion) =>
+                val fileName = s"gitbucket-${pluginId}-plugin-gitbucket_${gitbucketVersion}-${pluginVersion}.jar"
+                val in = cl.getResourceAsStream("plugins/" + fileName)
+                if (in != null) {
+                  val file = new File(PluginHome, fileName)
+                  logger.info(s"Extract to ${file.getAbsolutePath}")
 
-          val plugins = PluginRepository.parsePluginJson(pluginsJson)
-          plugins.foreach { plugin =>
-            plugin.versions
-              .sortBy { x =>
-                Semver.valueOf(x.version)
-              }
-              .reverse
-              .zipWithIndex
-              .foreach {
-                case (version, i) =>
-                  val file = new File(PluginRepository.LocalRepositoryDir, version.file)
-                  if (!file.exists) {
-                    logger.info(s"Copy ${plugin} to ${file.getAbsolutePath}")
                   FileUtils.forceMkdirParent(file)
-                    using(cl.getResourceAsStream("plugins/" + version.file), new FileOutputStream(file)) {
+                  using(in, new FileOutputStream(file)) {
                     case (in, out) => IOUtils.copy(in, out)
                   }
-
-                    if (plugin.default && i == 0) {
-                      logger.info(s"Enable ${file.getName} in default")
-                      FileUtils.copyFile(file, new File(PluginHome, version.file))
-                    }
                 }
+              case _ => ()
             }
           }
         }

src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala

@@ -26,7 +26,7 @@ class PluginAssetsServlet extends HttpServlet {
         try {
           val bytes = IOUtils.toByteArray(in)
           resp.setContentLength(bytes.length)
-          resp.setContentType(FileUtil.getContentType(path, bytes))
+          resp.setContentType(FileUtil.getMimeType(path, bytes))
           resp.setHeader("Cache-Control", "max-age=3600")
           resp.getOutputStream.write(bytes)
         } finally {

src/main/scala/gitbucket/core/util/Authenticator.scala

@@ -15,16 +15,12 @@ trait OneselfAuthenticator { self: ControllerBase =>
   protected def oneselfOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
 
   private def authenticate(action: => Any) = {
-    {
-      defining(request.paths) { paths =>
     context.loginAccount match {
       case Some(x) if (x.isAdmin)                      => action
-          case Some(x) if (paths(0) == x.userName) => action
+      case Some(x) if (request.paths(0) == x.userName) => action
       case _                                           => Unauthorized()
     }
   }
-    }
-  }
 }
 
 /**
@@ -35,9 +31,9 @@ trait OwnerAuthenticator { self: ControllerBase with RepositoryService with Acco
   protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
-    {
+    val userName = params("owner")
-      defining(request.paths) { paths =>
+    val repoName = params("repository")
-        getRepository(paths(0), paths(1)).map { repository =>
+    getRepository(userName, repoName).map { repository =>
       context.loginAccount match {
         case Some(x) if (x.isAdmin)                      => action(repository)
         case Some(x) if (repository.owner == x.userName) => action(repository)
@@ -46,14 +42,12 @@ trait OwnerAuthenticator { self: ControllerBase with RepositoryService with Acco
               m.userName == x.userName && m.isManager == true
             }) =>
           action(repository)
-            case Some(x) if (getCollaboratorUserNames(paths(0), paths(1), Seq(Role.ADMIN)).contains(x.userName)) =>
+        case Some(x) if (getCollaboratorUserNames(userName, repoName, Seq(Role.ADMIN)).contains(x.userName)) =>
           action(repository)
         case _ => Unauthorized()
       }
     } getOrElse NotFound()
   }
-    }
-  }
 }
 
 /**
@@ -64,13 +58,11 @@ trait UsersAuthenticator { self: ControllerBase =>
   protected def usersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
 
   private def authenticate(action: => Any) = {
-    {
     context.loginAccount match {
       case Some(x) => action
       case None    => Unauthorized()
     }
   }
-  }
 }
 
 /**
@@ -81,13 +73,11 @@ trait AdminAuthenticator { self: ControllerBase =>
   protected def adminOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
 
   private def authenticate(action: => Any) = {
-    {
     context.loginAccount match {
       case Some(x) if (x.isAdmin) => action
       case _                      => Unauthorized()
     }
   }
-  }
 }
 
 /**
@@ -98,9 +88,9 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService with A
   protected def referrersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
-    {
+    val userName = params("owner")
-      defining(request.paths) { paths =>
+    val repoName = params("repository")
-        getRepository(paths(0), paths(1)).map { repository =>
+    getRepository(userName, repoName).map { repository =>
       if (isReadable(repository.repository, context.loginAccount)) {
         action(repository)
       } else {
@@ -108,8 +98,6 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService with A
       }
     } getOrElse NotFound()
   }
-    }
-  }
 }
 
 /**
@@ -122,21 +110,19 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService w
   }
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
-    {
+    val userName = params("owner")
-      defining(request.paths) { paths =>
+    val repoName = params("repository")
-        getRepository(paths(0), paths(1)).map { repository =>
+    getRepository(userName, repoName).map { repository =>
       context.loginAccount match {
         case Some(x) if (x.isAdmin)                                                          => action(repository)
         case Some(x) if (!repository.repository.isPrivate)                                   => action(repository)
-            case Some(x) if (paths(0) == x.userName)                                             => action(repository)
+        case Some(x) if (userName == x.userName)                                             => action(repository)
         case Some(x) if (getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository)
-            case Some(x) if (getCollaboratorUserNames(paths(0), paths(1)).contains(x.userName))  => action(repository)
+        case Some(x) if (getCollaboratorUserNames(userName, repoName).contains(x.userName))  => action(repository)
         case _                                                                               => Unauthorized()
       }
     } getOrElse NotFound()
   }
-    }
-  }
 }
 
 /**
@@ -149,23 +135,21 @@ trait WritableUsersAuthenticator { self: ControllerBase with RepositoryService w
   }
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
-    {
+    val userName = params("owner")
-      defining(request.paths) { paths =>
+    val repoName = params("repository")
-        getRepository(paths(0), paths(1)).map { repository =>
+    getRepository(userName, repoName).map { repository =>
       context.loginAccount match {
         case Some(x) if (x.isAdmin)                                                          => action(repository)
-            case Some(x) if (paths(0) == x.userName)                                             => action(repository)
+        case Some(x) if (userName == x.userName)                                             => action(repository)
         case Some(x) if (getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository)
         case Some(x)
-                if (getCollaboratorUserNames(paths(0), paths(1), Seq(Role.ADMIN, Role.DEVELOPER))
+            if (getCollaboratorUserNames(userName, repoName, Seq(Role.ADMIN, Role.DEVELOPER))
               .contains(x.userName)) =>
           action(repository)
         case _ => Unauthorized()
       }
     } getOrElse NotFound()
   }
-    }
-  }
 }
 
 /**
@@ -176,16 +160,12 @@ trait GroupManagerAuthenticator { self: ControllerBase with AccountService =>
   protected def managersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
 
   private def authenticate(action: => Any) = {
-    {
-      defining(request.paths) { paths =>
     context.loginAccount match {
-          case Some(x) if (getGroupMembers(paths(0)).exists { member =>
+      case Some(x) if (getGroupMembers(request.paths(0)).exists { member =>
             member.userName == x.userName && member.isManager
           }) =>
         action
       case _ => Unauthorized()
     }
   }
-    }
-  }
 }

src/main/scala/gitbucket/core/util/Directory.scala

@@ -67,6 +67,12 @@ object Directory {
   def getLfsDir(owner: String, repository: String): File =
     new File(getRepositoryFilesDir(owner, repository), "lfs")
 
+  /**
+   * Directory for files which store diff fragment
+   */
+  def getDiffDir(owner: String, repository: String): File =
+    new File(getRepositoryFilesDir(owner, repository), "diff")
+
   /**
    * Directory for uploaded files by the specified user.
    */

src/main/scala/gitbucket/core/util/FileUtil.scala

@@ -16,7 +16,7 @@ object FileUtil {
       }
     }
 
-  def getContentType(name: String, bytes: Array[Byte]): String = {
+  def getMimeType(name: String, bytes: Array[Byte]): String = {
     defining(getMimeType(name)) { mimeType =>
       if (mimeType == "application/octet-stream" && isText(bytes)) {
         "text/plain"
@@ -26,6 +26,10 @@ object FileUtil {
     }
   }
 
+  def getSafeMimeType(name: String): String = {
+    getMimeType(name).replace("text/html", "text/plain")
+  }
+
   def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
 
   def isLarge(size: Long): Boolean = (size > 1024 * 1000)
@@ -52,7 +56,7 @@ object FileUtil {
   }
 
   def getLfsFilePath(owner: String, repository: String, oid: String): String =
-    Directory.getLfsDir(owner, repository) + "/" + oid
+    Directory.getLfsDir(owner, repository) + "/" + checkFilename(oid)
 
   def readableSize(size: Long): String = FileUtils.byteCountToDisplaySize(size)
 
@@ -76,6 +80,16 @@ object FileUtil {
     file
   }
 
+  /**
+   * Create an instance of java.io.File safely.
+   */
+  def checkFilename(name: String): String = {
+    if (name.contains("..")) {
+      throw new IllegalArgumentException(s"Invalid file name: ${name}")
+    }
+    name
+  }
+
   lazy val MaxFileSize =
     if (System.getProperty("gitbucket.maxFileSize") != null)
       System.getProperty("gitbucket.maxFileSize").toLong

src/main/scala/gitbucket/core/util/JGitUtil.scala

@@ -1,6 +1,6 @@
 package gitbucket.core.util
 
-import java.io.ByteArrayOutputStream
+import java.io.{ByteArrayOutputStream, File, FileInputStream, InputStream}
 
 import gitbucket.core.service.RepositoryService
 import org.eclipse.jgit.api.Git
@@ -390,7 +390,7 @@ object JGitUtil {
             lazy val newParentsMap = newCommit.getParents.map(_ -> newCommit).toMap
             useTreeWalk(newCommit) { walk =>
               while (walk.next) {
-                rest.remove(walk.getNameString -> walk.getObjectId(0)).map {
+                rest.remove(walk.getNameString -> walk.getObjectId(0)).foreach {
                   case (tuple, _) =>
                     if (newParentsMap.isEmpty) {
                       nextResult +:= tupleAdd(tuple, newCommit)
@@ -400,7 +400,7 @@ object JGitUtil {
                 }
               }
             }
-            rest.values.map {
+            rest.values.foreach {
               case (tuple, parentsMap) =>
                 val restParentsMap = parentsMap - newCommit
                 if (restParentsMap.isEmpty) {
@@ -761,7 +761,27 @@ object JGitUtil {
     }
 
   /**
-   * Returns the list of tags of the specified commit.
+   * Returns the list of tags which pointed on the specified commit.
+   */
+  def getTagsOnCommit(git: Git, commitId: String): List[String] = {
+    git.getRepository.getAllRefsByPeeledObjectId.asScala
+      .get(git.getRepository.resolve(commitId + "^0"))
+      .map {
+        _.asScala
+          .collect {
+            case x if x.getName.startsWith(Constants.R_TAGS) =>
+              x.getName.substring(Constants.R_TAGS.length)
+          }
+          .toList
+          .sorted
+      }
+      .getOrElse {
+        List.empty
+      }
+  }
+
+  /**
+   * Returns the list of tags which contains the specified commit.
    */
   def getTagsOfCommit(git: Git, commitId: String): List[String] =
     using(new RevWalk(git.getRepository)) { revWalk =>
@@ -1200,4 +1220,61 @@ object JGitUtil {
       Option(git.getRepository.resolve(revstr)).map(ObjectId.toString(_))
     }
   }
+
+  def getFileSize(git: Git, repository: RepositoryService.RepositoryInfo, treeWalk: TreeWalk): Long = {
+    val attrs = treeWalk.getAttributes
+    val loader = git.getRepository.open(treeWalk.getObjectId(0))
+    if (attrs.containsKey("filter") && attrs.get("filter").getValue == "lfs") {
+      val lfsAttrs = getLfsAttributes(loader)
+      lfsAttrs.get("size").map(_.toLong).get
+    } else {
+      loader.getSize
+    }
+  }
+
+  def getFileSize(git: Git, repository: RepositoryService.RepositoryInfo, tree: RevTree, path: String): Long = {
+    using(TreeWalk.forPath(git.getRepository, path, tree)) { treeWalk =>
+      getFileSize(git, repository, treeWalk)
+    }
+  }
+
+  def openFile[T](git: Git, repository: RepositoryService.RepositoryInfo, treeWalk: TreeWalk)(
+    f: InputStream => T
+  ): T = {
+    val attrs = treeWalk.getAttributes
+    val loader = git.getRepository.open(treeWalk.getObjectId(0))
+    if (attrs.containsKey("filter") && attrs.get("filter").getValue == "lfs") {
+      val lfsAttrs = getLfsAttributes(loader)
+      if (lfsAttrs.nonEmpty) {
+        val oid = lfsAttrs("oid").split(":")(1)
+
+        val file = new File(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))
+        using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in =>
+          f(in)
+        }
+      } else {
+        throw new NoSuchElementException("LFS attribute is empty.")
+      }
+    } else {
+      using(loader.openStream()) { in =>
+        f(in)
+      }
+    }
+  }
+
+  def openFile[T](git: Git, repository: RepositoryService.RepositoryInfo, tree: RevTree, path: String)(
+    f: InputStream => T
+  ): T = {
+    using(TreeWalk.forPath(git.getRepository, path, tree)) { treeWalk =>
+      openFile(git, repository, treeWalk)(f)
+    }
+  }
+
+  private def getLfsAttributes(loader: ObjectLoader): Map[String, String] = {
+    val bytes = loader.getCachedBytes
+    val text = new String(bytes, "UTF-8")
+
+    JGitUtil.getLfsObjects(text)
+  }
+
 }

src/main/scala/gitbucket/core/util/StringUtil.scala

@@ -1,10 +1,13 @@
 package gitbucket.core.util
 
 import java.net.{URLDecoder, URLEncoder}
-import java.util.Base64
+import java.security.SecureRandom
+import java.util.{Base64, UUID}
 
 import org.mozilla.universalchardet.UniversalDetector
 import SyntaxSugars._
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.PBEKeySpec
 import org.apache.commons.io.input.BOMInputStream
 import org.apache.commons.io.IOUtils
 
@@ -13,9 +16,33 @@ import scala.util.control.Exception._
 object StringUtil {
 
   private lazy val BlowfishKey = {
-    // last 4 numbers in current timestamp
+    UUID.randomUUID().toString.substring(0, 16)
-    val time = System.currentTimeMillis.toString
+  }
-    time.substring(time.length - 4)
+
+  def base64Encode(value: Array[Byte]): String = {
+    Base64.getEncoder.encodeToString(value)
+  }
+
+  def base64Decode(value: String): Array[Byte] = {
+    Base64.getDecoder.decode(value)
+  }
+
+  def pbkdf2_sha256(iter: Int, salt: String, value: String): String = {
+    val keyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
+    val ks = new PBEKeySpec(value.toCharArray, base64Decode(salt), iter, 256)
+    val s = keyFactory.generateSecret(ks)
+    base64Encode(s.getEncoded)
+  }
+
+  def pbkdf2_sha256(value: String) = {
+    val keyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
+    val secureRandom = new SecureRandom
+    val salt: Array[Byte] = new Array(32)
+    secureRandom.nextBytes(salt)
+    val iter = 100000
+    val ks = new PBEKeySpec(value.toCharArray, salt, iter, 256)
+    val s = keyFactory.generateSecret(ks)
+    s"""$$pbkdf2-sha256$$${iter}$$${base64Encode(salt)}$$${base64Encode(s.getEncoded)}"""
   }
 
   def sha1(value: String): String =

src/main/scala/gitbucket/core/view/helpers.scala

@@ -3,6 +3,7 @@ package gitbucket.core.view
 import java.text.SimpleDateFormat
 import java.util.{Date, Locale, TimeZone}
 
+import com.nimbusds.jose.util.JSONObjectUtils
 import gitbucket.core.controller.Context
 import gitbucket.core.model.CommitState
 import gitbucket.core.plugin.{PluginRegistry, RenderRequest}
@@ -249,12 +250,12 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    * Generates the url to the repository.
    */
   def url(repository: RepositoryService.RepositoryInfo)(implicit context: Context): String =
-    s"${context.path}/${repository.owner}/${repository.name}"
+    s"${context.path}/${encodeRefName(repository.owner)}/${encodeRefName(repository.name)}"
 
   /**
    * Generates the url to the account page.
    */
-  def url(userName: String)(implicit context: Context): String = s"${context.path}/${userName}"
+  def url(userName: String)(implicit context: Context): String = s"${context.path}/${encodeRefName(userName)}"
 
   /**
    * Returns the url to the root of assets.
@@ -272,7 +273,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    * If user does not exist or disabled, this method returns user name as text without link.
    */
   def user(userName: String, mailAddress: String = "", styleClass: String = "")(implicit context: Context): Html =
-    userWithContent(userName, mailAddress, styleClass)(Html(userName))
+    userWithContent(userName, mailAddress, styleClass)(Html(StringUtil.escapeHtml(userName)))
 
   /**
    * Generates the avatar link to the account page.
@@ -315,44 +316,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    */
   def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime
 
-  /**
-   * Returns file type for AceEditor.
-   */
-  def editorType(fileName: String): String = {
-    fileName.toLowerCase match {
-      case x if (x.endsWith(".bat"))     => "batchfile"
-      case x if (x.endsWith(".java"))    => "java"
-      case x if (x.endsWith(".scala"))   => "scala"
-      case x if (x.endsWith(".js"))      => "javascript"
-      case x if (x.endsWith(".css"))     => "css"
-      case x if (x.endsWith(".md"))      => "markdown"
-      case x if (x.endsWith(".html"))    => "html"
-      case x if (x.endsWith(".xml"))     => "xml"
-      case x if (x.endsWith(".c"))       => "c_cpp"
-      case x if (x.endsWith(".cpp"))     => "c_cpp"
-      case x if (x.endsWith(".coffee"))  => "coffee"
-      case x if (x.endsWith(".ejs"))     => "ejs"
-      case x if (x.endsWith(".hs"))      => "haskell"
-      case x if (x.endsWith(".json"))    => "json"
-      case x if (x.endsWith(".jsp"))     => "jsp"
-      case x if (x.endsWith(".jsx"))     => "jsx"
-      case x if (x.endsWith(".cl"))      => "lisp"
-      case x if (x.endsWith(".clojure")) => "lisp"
-      case x if (x.endsWith(".lua"))     => "lua"
-      case x if (x.endsWith(".php"))     => "php"
-      case x if (x.endsWith(".py"))      => "python"
-      case x if (x.endsWith(".rdoc"))    => "rdoc"
-      case x if (x.endsWith(".rhtml"))   => "rhtml"
-      case x if (x.endsWith(".ruby"))    => "ruby"
-      case x if (x.endsWith(".sh"))      => "sh"
-      case x if (x.endsWith(".sql"))     => "sql"
-      case x if (x.endsWith(".tcl"))     => "tcl"
-      case x if (x.endsWith(".vbs"))     => "vbscript"
-      case x if (x.endsWith(".yml"))     => "yaml"
-      case _                             => "plain_text"
-    }
-  }
-
   def pre(value: Html): Html = Html(s"<pre>${value.body.trim.split("\n").map(_.trim).mkString("\n")}</pre>")
 
   /**
@@ -462,4 +425,44 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    */
   def readableSize(size: Option[Long]): String = FileUtil.readableSize(size.getOrElse(0))
 
+  /**
+   * Make HTML fragment of the partial diff for a comment on a line of diff.
+   *
+   * @param jsonString JSON string which is stored in COMMIT_COMMENT table.
+   * @return HTML fragment of diff
+   */
+  def diff(jsonString: String): Html = {
+    import org.json4s._
+    import org.json4s.jackson.JsonMethods._
+    implicit val formats = DefaultFormats
+
+    val diff = parse(jsonString).extract[Seq[CommentDiffLine]]
+
+    val sb = new StringBuilder()
+    sb.append("<table class=\"diff inlinediff\">")
+    diff.foreach { line =>
+      sb.append("<tr>")
+      sb.append(s"""<th class="line-num oldline ${line.`type`}">""")
+      line.oldLine.foreach { oldLine =>
+        sb.append(oldLine)
+      }
+      sb.append("</th>")
+      sb.append(s"""<th class="line-num newline ${line.`type`}">""")
+      line.newLine.foreach { newLine =>
+        sb.append(newLine)
+      }
+      sb.append("</th>")
+
+      sb.append(s"""<td class="body ${line.`type`}">""")
+      sb.append(StringUtil.escapeHtml(line.text))
+      sb.append("</td>")
+      sb.append("</tr>")
+    }
+    sb.append("</table>")
+
+    Html(sb.toString())
+  }
+
+  case class CommentDiffLine(newLine: Option[String], oldLine: Option[String], `type`: String, text: String)
+
 }

src/main/twirl/gitbucket/core/account/activity.scala.html

@@ -1,8 +1,9 @@
 @(account: gitbucket.core.model.Account,
   groupNames: List[String],
-  activities: List[gitbucket.core.model.Activity])(implicit context: gitbucket.core.controller.Context)
+  activities: List[gitbucket.core.model.Activity],
+  extraMailAddresses: List[String])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@gitbucket.core.account.html.main(account, groupNames, "activity"){
+@gitbucket.core.account.html.main(account, groupNames, "activity", extraMailAddresses){
   <div class="pull-right">
     <a href="@context.path/@{account.userName}.atom"><img src="@helpers.assets("/common/images/feed.png")" alt="activities"></a>
   </div>

src/main/twirl/gitbucket/core/account/edit.scala.html

@@ -1,4 +1,4 @@
-@(account: gitbucket.core.model.Account, info: Option[Any], error: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@(account: gitbucket.core.model.Account, extraMailAddresses: List[String], info: Option[Any], error: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.util.LDAPUtil
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Edit your profile"){
@@ -31,6 +31,13 @@
                 <input type="text" name="mailAddress" id="mailAddress" class="form-control" value="@if(!LDAPUtil.isDummyMailAddress(account)){@account.mailAddress}"/>
                 <span id="error-mailAddress" class="error"></span>
               </fieldset>
+              <fieldset class="form-group" id="extraMailAddresses">
+                <span class="strong">Additional Mail Address:</span>
+                @extraMailAddresses.zipWithIndex.map { case (mail, idx) =>
+                  <input type="text" name="extraMailAddresses[@idx]" id="extraMailAddresses[@idx]" class="form-control extraMailAddress" value="@mail"/>
+                  <span id="error-extraMailAddresses_@idx" class="error"></span>
+                }
+              </fieldset>
               <fieldset class="form-group">
                 <label for="url" class="strong">URL (optional):</label>
                 <input type="text" name="url" id="url" class="form-control" value="@account.url"/>
@@ -62,6 +69,8 @@
 }
 <script>
 $(function(){
+  addExtraMailAddress();
+  $('#extraMailAddresses').on('change', '.extraMailAddress', checkExtraMailAddress);
   $('#save').click(function(){
     if($('#password').val() != ''){
       return confirm('Are you sure you want to change password?');

src/main/twirl/gitbucket/core/account/main.scala.html

@@ -1,4 +1,4 @@
-@(account: gitbucket.core.model.Account, groupNames: List[String], active: String,
+@(account: gitbucket.core.model.Account, groupNames: List[String], active: String, extraMailAddresses: List[String],
   isGroupManager: Boolean = false)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(account.userName){
@@ -20,6 +20,16 @@
             <i class="octicon octicon-home"></i> <a href="@account.url">@account.url</a>
           </p>
         }
+        @if(context.settings.showMailAddress){
+          <p style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
+            <i class="octicon octicon-mail"></i> <a href="mailto: @account.mailAddress">@account.mailAddress</a>
+          </p>
+          @extraMailAddresses.map{ mail =>
+            <p style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
+              <i class="octicon octicon-mail"></i> <a href="mailto: @mail">@mail</a>
+            </p>
+          }
+        }
         <p style="color: #999">
           <i class="octicon octicon-clock"></i> Joined on @helpers.date(account.registeredDate)
         </p>

src/main/twirl/gitbucket/core/account/members.scala.html

@@ -1,13 +1,13 @@
-@(account: gitbucket.core.model.Account, members: List[gitbucket.core.model.GroupMember], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
+@(account: gitbucket.core.model.Account, members: List[gitbucket.core.model.GroupMember], extraMailAddresses: List[String], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@gitbucket.core.account.html.main(account, Nil, "members", isGroupManager){
+@gitbucket.core.account.html.main(account, Nil, "members", extraMailAddresses, isGroupManager){
   @if(members.isEmpty){
     No members
   } else {
     @members.map { member =>
       <div class="block">
         <div class="block-header">
-          @helpers.avatar(member.userName, 20) <a href="@helpers.url(member.userName)">@member.userName</a>
+          @helpers.avatarLink(member.userName, 20) <a href="@helpers.url(member.userName)">@member.userName</a>
           @if(member.isManager){ (Manager) }
         </div>
       </div>

src/main/twirl/gitbucket/core/account/menu.scala.html

@@ -19,7 +19,7 @@
             <i class="menu-icon octicon octicon-person"></i> <span>Profile</span>
           </a>
         </li>
-        @if(context.settings.ssh){
+        @if(context.settings.ssh.enabled){
           <li class="menu-item-hover @if(active=="ssh"){active}">
             <a href="@context.path/@userName/_ssh">
               <i class="menu-icon octicon octicon-key"></i> <span>SSH Keys</span>

src/main/twirl/gitbucket/core/account/newrepo.scala.html

@@ -32,7 +32,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
         <dl>
           <dt>Repository name</dt>
           <dd style="margin-left: 0px;">
-            <input type="text" name="name" id="name" class="form-control" style="width: 200px; display: inline;" autofocus/>
+            <input type="text" name="name" id="name" class="form-control" style="width: 300px; display: inline;" autofocus/>
             <span id="error-name" class="error"></span>
           </dd>
         </dl>

src/main/twirl/gitbucket/core/account/register.scala.html

@@ -28,6 +28,9 @@
             <input type="text" name="mailAddress" id="mailAddress" class="form-control" value=""/>
             <span id="error-mailAddress" class="error"></span>
           </fieldset>
+          <div id="extraMailAddresses">
+            <span class="strong">Additional Mail Address:</span>
+          </div>
           <fieldset>
             <label for="url" class="strong">URL (optional):</label>
             <input type="text" name="url" id="url" class="form-control" value=""/>
@@ -52,4 +55,10 @@
     </form>
   </div>
 </div>
+<script>
+  $(function() {
+    addExtraMailAddress();
+    $('#extraMailAddresses').on('change', '.extraMailAddress', checkExtraMailAddress);
+  });
+</script>
 }

src/main/twirl/gitbucket/core/account/repositories.scala.html

@@ -1,8 +1,9 @@
 @(account: gitbucket.core.model.Account, groupNames: List[String],
   repositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  extraMailAddresses: List[String],
   isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@gitbucket.core.account.html.main(account, groupNames, "repositories", isGroupManager){
+@gitbucket.core.account.html.main(account, groupNames, "repositories", extraMailAddresses, isGroupManager){
   @if(repositories.isEmpty){
     No repositories
   } else {

src/main/twirl/gitbucket/core/admin/plugins.scala.html

@@ -1,30 +1,36 @@
-@(plugins: List[(gitbucket.core.plugin.PluginInfoBase, Boolean)], info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@(plugins: List[(gitbucket.core.plugin.PluginInfoBase, Boolean, String)], info: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main("Plugins"){
   @gitbucket.core.admin.html.menu("plugins") {
     @gitbucket.core.helper.html.information(info)
     <form action="@context.path/admin/plugins/_reload" method="POST" class="pull-right">
+      <input type="checkbox" name="pluginNetworkInstall" id="pluginNetworkInstall" value="true" @if(context.settings.pluginNetworkInstall){checked}>
+      <label for="pluginNetworkInstall">Install plugin from <a href="https://plugins.gitbucket-community.org" target="_blank">plugins.gitbucket-community.org</a></label>
       <input type="submit" value="Reload plugins" class="btn btn-default">
     </form>
     <h1 class="system-settings-title">Plugins</h1>
     @if(plugins.size > 0) {
       <ul>
-      @plugins.map { case (plugin, enabled) =>
+        @plugins.map { case (plugin, enabled, updatableVersion) =>
           <li><a href="#@plugin.pluginId">@plugin.pluginId:@plugin.pluginVersion</a></li>
         }
       </ul>
 
-      @plugins.map { case (plugin, enabled) =>
+      @plugins.map { case (plugin, enabled, updatableVersion) =>
         <div class="panel panel-default">
           <div class="panel-heading strong" id="@plugin.pluginId">
+            <form method="POST" class="pull-right">
               @if(enabled){
-              <form action="@{context.path}/admin/plugins/@{plugin.pluginId}/@{plugin.pluginVersion}/_uninstall" method="POST" class="pull-right uninstall-form">
+                @if(updatableVersion.nonEmpty){
-                <input type="submit" value="Uninstall" class="btn btn-danger btn-sm" style="position: relative; top: -5px; left: 10px;" data-name="@plugin.pluginName">
+                  <input type="submit" value="Update" class="btn btn-success btn-sm update-plugin" style="position: relative; top: -5px; left: 10px;"
-              </form>
+                         data-name="@plugin.pluginName" formaction="@{context.path}/admin/plugins/@{plugin.pluginId}/@{updatableVersion}/_install">
-            } else {
-              <form action="@{context.path}/admin/plugins/@{plugin.pluginId}/@{plugin.pluginVersion}/_install" method="POST" class="pull-right install-form">
-                <input type="submit" value="Install" class="btn btn-success btn-sm" style="position: relative; top: -5px; left: 10px;" data-name="@plugin.pluginName">
-              </form>
                 }
+                <input type="submit" value="Uninstall" class="btn btn-danger btn-sm uninstall-plugin" style="position: relative; top: -5px; left: 10px;"
+                       data-name="@plugin.pluginName" formaction="@{context.path}/admin/plugins/@{plugin.pluginId}/_uninstall">
+              } else {
+                <input type="submit" value="Install" class="btn btn-success btn-sm install-plugin" style="position: relative; top: -5px; left: 10px;"
+                       data-name="@plugin.pluginName" formaction="@{context.path}/admin/plugins/@{plugin.pluginId}/@{plugin.pluginVersion}/_install">
+              }
+            </form>
             @plugin.pluginName
           </div>
           <div class="panel-body">
@@ -54,14 +60,19 @@
 }
 <script>
   $(function(){
-    $('.uninstall-form').click(function(e){
+    $('.uninstall-plugin').click(function(e){
       var name = $(e.target).data('name');
       return confirm('Uninstall ' + name + '. Are you sure?');
     });
 
-    $('.install-form').click(function(e){
+    $('.install-plugin').click(function(e){
       var name = $(e.target).data('name');
       return confirm('Install ' + name + '. Are you sure?');
     });
+
+    $('.update-plugin').click(function(e){
+      var name = $(e.target).data('name');
+      return confirm('Update ' + name + '. Are you sure?');
+    });
   });
 </script>

src/main/twirl/gitbucket/core/admin/settings_system.scala.html

@@ -8,6 +8,10 @@
     <th>Property</th>
     <th>Value</th>
   </tr>
+  <tr>
+    <td>GITBUCKET_VERSION</td>
+    <td>@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</td>
+  </tr>
   <tr>
     <td>GITBUCKET_HOME</td>
     <td>@gitbucket.core.util.Directory.GitBucketHome</td>
@@ -132,6 +136,21 @@
   </label>
 </fieldset>
 <!--====================================================================-->
+<!-- Show mail address -->
+<!--====================================================================-->
+<hr>
+<label class="strong">Show mail address</label>
+<fieldset>
+  <label class="radio">
+    <input type="radio" name="showMailAddress" value="true"@if(context.settings.showMailAddress){ checked}>
+    <span class="strong">Show</span> <span class="normal">- Anyone can view mail address by user's profile page.</span>
+  </label>
+  <label class="radio">
+    <input type="radio" name="showMailAddress" value="false"@if(!context.settings.showMailAddress){ checked}>
+    <span class="strong">Hide</span> <span class="normal">- Hide mail address in user's profile page.</span>
+  </label>
+</fieldset>
+<!--====================================================================-->
 <!-- Activity -->
 <!--====================================================================-->
 <hr>
@@ -163,7 +182,7 @@
 <label class="strong">SSH access</label>
 <fieldset>
   <label class="checkbox">
-    <input type="checkbox" id="ssh" name="ssh"@if(context.settings.ssh){ checked}/>
+    <input type="checkbox" id="sshEnabled" name="ssh.enabled"@if(context.settings.ssh.enabled){ checked}/>
     Enable SSH access to git repository
     <span class="muted normal">(Both SSH host and Base URL are required if SSH access is enabled)</span>
   </label>
@@ -172,15 +191,15 @@
   <div class="form-group">
     <label class="control-label col-md-2" for="sshHost">SSH host</label>
     <div class="col-md-10">
-      <input type="text" id="sshHost" name="sshHost" class="form-control" value="@context.settings.sshHost"/>
+      <input type="text" id="sshHost" name="ssh.host" class="form-control" value="@context.settings.ssh.sshHost"/>
-      <span id="error-sshHost" class="error"></span>
+      <span id="error-ssh_host" class="error"></span>
     </div>
   </div>
   <div class="form-group">
     <label class="control-label col-md-2" for="sshPort">SSH port</label>
     <div class="col-md-10">
-      <input type="text" id="sshPort" name="sshPort" class="form-control" value="@context.settings.sshPort"/>
+      <input type="text" id="sshPort" name="ssh.port" class="form-control" value="@context.settings.ssh.sshPort"/>
-      <span id="error-sshPort" class="error"></span>
+      <span id="error-ssh_port" class="error"></span>
     </div>
   </div>
 </div>
@@ -310,7 +329,7 @@ $(function(){
     }
   });
 
-  $('#ssh').change(function(){
+  $('#sshEnabled').change(function(){
     $('.ssh input').prop('disabled', !$(this).prop('checked'));
   }).change();
 

src/main/twirl/gitbucket/core/admin/user.scala.html

@@ -1,4 +1,4 @@
-@(account: Option[gitbucket.core.model.Account], error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
+@(account: Option[gitbucket.core.model.Account], extraMailAddresses: List[String], error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main(if(account.isEmpty) "New user" else "Update user"){
   @gitbucket.core.admin.html.menu("users"){
     @gitbucket.core.helper.html.error(error)
@@ -50,6 +50,13 @@
             </div>
             <input type="text" name="mailAddress" id="mailAddress" class="form-control" value="@account.map(_.mailAddress)"/>
           </fieldset>
+          <fieldset class="form-group" id="extraMailAddresses">
+            <span class="strong">Additional Mail Address:</span>
+            @extraMailAddresses.zipWithIndex.map { case (mail, idx) =>
+            <input type="text" name="extraMailAddresses[@idx]" id="extraMailAddresses[@idx]" class="form-control extraMailAddress" value="@mail"/>
+            <span id="error-extraMailAddresses_@idx" class="error"></span>
+            }
+          </fieldset>
           <fieldset class="form-group">
             <label class="strong">User Type:</label>
             <label class="radio" for="userType_Normal">
@@ -94,6 +101,8 @@
 }
 <script>
 $(function(){
+  addExtraMailAddress();
+  $('#extraMailAddresses').on('change', '.extraMailAddress', checkExtraMailAddress);
   $('#update').click(function(){
     if($('#password').val() != ''){
       return confirm('Are you sure you want to change password of this user?');

src/main/twirl/gitbucket/core/admin/userlist.scala.html

@@ -26,7 +26,7 @@
               }
             </div>
             <div class="strong">
-              @helpers.avatar(account.userName, 20)
+              @helpers.avatarLink(account.userName, 20)
               <a href="@helpers.url(account.userName)">@account.userName</a>
               @if(account.isGroupAccount){
                 (Group)
@@ -39,7 +39,7 @@
               }
               @if(account.isGroupAccount){
                 @members(account.userName).map { userName =>
-                  @helpers.avatar(userName, 20, tooltip = true)
+                  @helpers.avatarLink(userName, 20, tooltip = true)
                 }
               }
             </div>

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

@@ -5,10 +5,9 @@
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
   filter: String,
   groups: List[String],
-  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main("Issues"){
-  @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
+  @gitbucket.core.dashboard.html.sidebar(recentRepositories){
     @gitbucket.core.dashboard.html.tab("issues")
     <div class="container">
       @gitbucket.core.dashboard.html.issuesnavi("issues", filter, openCount, closedCount, condition)

src/main/twirl/gitbucket/core/dashboard/pulls.scala.html

@@ -5,10 +5,9 @@
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
   filter: String,
   groups: List[String],
-  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main("Pull requests"){
-  @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
+  @gitbucket.core.dashboard.html.sidebar(recentRepositories){
     @gitbucket.core.dashboard.html.tab("pulls")
     <div class="container">
       @gitbucket.core.dashboard.html.issuesnavi("pulls", filter, openCount, closedCount, condition)

src/main/twirl/gitbucket/core/dashboard/repos.scala.html

@@ -0,0 +1,71 @@
+@(groups: List[String],
+  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Repositories"){
+  @gitbucket.core.dashboard.html.sidebar(recentRepositories){
+    @gitbucket.core.dashboard.html.tab("repos")
+    <div class="container">
+      <div class="btn-group" id="owner-dropdown">
+        <button id="test" class="dropdown-toggle btn btn-default" data-toggle="dropdown" aria-expanded="false">
+          <span class="strong">All</span>
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <li><a href="javascript:void(0);" data-name=""><i class="octicon octicon-check"></i><span>All</span></a></li>
+          @userRepositories.map(_.owner).distinct.map { userName =>
+            <li><a href="javascript:void(0);" data-name="@userName"><i class="octicon"></i><span>@helpers.avatar(userName, 20) @userName</span></a></li>
+          }
+        </ul>
+      </div>
+      @if(userRepositories.isEmpty){
+        No repositories
+      } else {
+        @userRepositories.map { repository =>
+          <div class="block" data-owner="@repository.owner">
+            <div class="repository-icon">
+              @gitbucket.core.helper.html.repositoryicon(repository, true)
+            </div>
+            <div class="repository-content">
+              <div class="block-header">
+                <a href="@helpers.url(repository)">@repository.owner/@repository.name</a>
+                @if(repository.repository.isPrivate){
+                  <i class="octicon octicon-lock"></i>
+                }
+              </div>
+              @if(repository.repository.originUserName.isDefined){
+                <div class="small muted">forked from <a href="@context.path/@repository.repository.parentUserName/@repository.repository.parentRepositoryName">@repository.repository.parentUserName/@repository.repository.parentRepositoryName</a></div>
+              }
+              @if(repository.repository.description.isDefined){
+                <div>@repository.repository.description</div>
+              }
+              <div><span class="muted small">Updated @gitbucket.core.helper.html.datetimeago(repository.repository.lastActivityDate)</span></div>
+            </div>
+          </div>
+        }
+      }
+    </div>
+  }
+}
+<script>
+$('#owner-dropdown a').click(function(){
+  var userName = $(this).data('name');
+
+  $('#owner-dropdown i').attr('class', 'octicon');
+  $(this).find('i').attr('class', 'octicon octicon-check');
+
+  $('#owner-dropdown span.strong').html($(this).find('span').html());
+
+  $('div.block').each(function(i, e){
+    if(userName == ''){
+      $(e).show();
+    } else {
+      if($(e).data('owner') == userName){
+        $(e).show();
+      } else {
+        $(e).hide();
+      }
+    }
+  });
+});
+</script>

src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html

@@ -1,29 +1,8 @@
-@(recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+@(recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 <div class="main-sidebar">
   <div class="sidebar">
   <ul class="nav sidebar-menu">
-  @if(context.loginAccount.isDefined){
-    <li class="header">
-      <span class="label label-primary pull-right">@userRepositories.size</span>
-      Your repositories
-    </li>
-    @if(userRepositories.isEmpty){
-      <li>No repositories</li>
-    } else {
-      <li><form class="sidebar-form"><input type="text" id="filter-box" class="form-control input-sm" placeholder="Find repository"/></form></li>
-      @userRepositories.zipWithIndex.map { case (repository, i) =>
-        <li class="repo-link menu-item-hover">
-          @if(repository.owner == context.loginAccount.get.userName){
-            <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span class="strong">@repository.name</span></a>
-          } else {
-          <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span>@repository.owner/<span class="strong">@repository.name</span></span></a>
-          }
-        </li>
-      }
-    }
-  } else {
     <li class="header">Recent updated repositories</li>
     @if(recentRepositories.isEmpty){
       <li>No repositories</li>
@@ -35,7 +14,6 @@
         </li>
       }
     }
-  }
   </ul>
   </div>
 </div>

src/main/twirl/gitbucket/core/dashboard/tab.scala.html

@@ -2,6 +2,7 @@
 <ul class="nav nav-tabs" style="margin-bottom: 20px;">
   <li @if(active == ""){ class="active"}><a href="@context.path/">News feed</a></li>
   @if(context.loginAccount.isDefined){
+    <li @if(active == "repos" ){ class="active"}><a href="@context.path/dashboard/repos">Repositories</a></li>
     <li @if(active == "pulls" ){ class="active"}><a href="@context.path/dashboard/pulls">Pull requests</a></li>
     <li @if(active == "issues"){ class="active"}><a href="@context.path/dashboard/issues">Issues</a></li>
     @gitbucket.core.plugin.PluginRegistry().getDashboardTabs.map { tab =>

src/main/twirl/gitbucket/core/helper/activities.scala.html

@@ -67,7 +67,7 @@
   <div>
     <div class="muted small">@gitbucket.core.helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
-      @helpers.avatar(activity.activityUserName, 16)
+      @helpers.avatarLink(activity.activityUserName, 16)
       @helpers.activityMessage(activity.message)
     </div>
     @activity.additionalInfo.map { additionalInfo =>
@@ -83,7 +83,7 @@
   <div>
     <div class="muted small">@gitbucket.core.helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
-      @helpers.avatar(activity.activityUserName, 16)
+      @helpers.avatarLink(activity.activityUserName, 16)
       @helpers.activityMessage(activity.message)
     </div>
     @additionalInfo
@@ -97,7 +97,7 @@
   <div>
     <span class="muted small">@gitbucket.core.helper.html.datetimeago(activity.activityDate)</span>
     <div>
-      @helpers.avatar(activity.activityUserName, 16)
+      @helpers.avatarLink(activity.activityUserName, 16)
       @helpers.activityMessage(activity.message)
     </div>
   </div>

src/main/twirl/gitbucket/core/helper/commitcomment.scala.html

@@ -3,26 +3,16 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-<div class="@if(comment.fileName.isDefined && (!latestCommitId.isDefined || latestCommitId.get == comment.commitId)){inline-comment}"
+<div class="commit-comment-box @if(latestCommitId.contains(comment.commitId)){inline-comment}" id="discussion_r@comment.commentId"
-    id="discussion_r@comment.commentId"
   @if(comment.fileName.isDefined){filename="@comment.fileName.get"}
   @if(comment.newLine.isDefined){newline="@comment.newLine.get"}
   @if(comment.oldLine.isDefined){oldline="@comment.oldLine.get"}>
-  <div class="panel panel-default commit-comment-box commit-comment-@comment.commentId">
+  <div class="commit-comment-@comment.commentId">
-    <div class="panel-heading">
+    <div class="markdown-body">
-      @helpers.avatar(comment.commentedUserName, 20)
+      <div>
+        @helpers.avatarLink(comment.commentedUserName, 20)
         @helpers.user(comment.commentedUserName, styleClass="username strong")
-        <span class="muted">
+        <span class="muted">@gitbucket.core.helper.html.datetimeago(comment.registeredDate)</span>
-          commented on
-          @if(comment.issueId.isDefined){
-            <a href="@helpers.url(repository)/pull/@comment.issueId">#@comment.issueId</a>
-          }
-          @comment.fileName.map { fileName =>
-            @fileName in
-          }
-          <a href="@context.path/@repository.owner/@repository.name/commit/@comment.commitId">@comment.commitId.substring(0, 7)</a>
-          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
-        </span>
         <span class="pull-right">
         @if(hasWritePermission || context.loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
           <a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-pencil"></i></a>&nbsp;
@@ -30,16 +20,17 @@
         }
         </span>
       </div>
-    <div class="panel-body issue-content commit-commentContent-@comment.commentId markdown-body">
+      <div class="commit-commentContent-@comment.commentId">
         @helpers.markdown(
           markdown = comment.content,
           repository = repository,
           enableWikiLink = false,
           enableRefsLink = true,
           enableLineBreaks = true,
-        enableTaskList = false,
+          enableTaskList = true,
           hasWritePermission = hasWritePermission
         )
       </div>
     </div>
+  </div>
 </div>

src/main/twirl/gitbucket/core/helper/commitcomments.scala.html

@@ -0,0 +1,32 @@
+@(comments: gitbucket.core.model.CommitComments,
+  hasWritePermission: Boolean,
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <span class="monospace">@comments.fileName</span>
+    @if(!latestCommitId.contains(comments.comments.head.commitId)) {
+      <span class="pull-right"><a href="javascript:$('.fold-comments-@comments.comments.head.commentId').toggle();"><i class="octicon octicon-unfold"></i></a></span>
+    }
+  </div>
+  <div style="@if(!latestCommitId.contains(comments.comments.head.commitId)){display: none;}" class="fold-comments-@comments.comments.head.commentId">
+    @comments.diff.map(helpers.diff)
+    <div class="panel-body">
+    @comments.comments.map { comment =>
+      @gitbucket.core.helper.html.commitcomment(comment, hasWritePermission, repository, latestCommitId)
+    }
+    </div>
+  </div>
+</div>
+
+@if(!latestCommitId.contains(comments.comments.head.commitId)) {
+  <script>
+    $(function(){
+      var foldComments = $('.fold-comments-@comments.comments.head.commentId');
+      if(foldComments.find('input:checkbox:not(:checked)').length > 0){
+        foldComments.show();
+      }
+    });
+  </script>
+}

src/main/twirl/gitbucket/core/helper/diff.scala.html

@@ -16,9 +16,9 @@
     @if(oldCommitId.isDefined && newCommitId.isDefined) {
       <a href="@helpers.url(repository)/patch/@oldCommitId...@newCommitId" class="btn btn-default">Patch</a>
     }
-    <div class="btn-group" data-toggle="buttons">
+    <div class="btn-group">
-      <input type="button" id="btn-unified" class="btn btn-default active" value="Unified">
+      <a href="javascript:changeDisplaySetting('diff', 'unified');" id="btn-unified" class="btn btn-default">Unified</a>
-      <input type="button" id="btn-split" class="btn btn-default" value="Split">
+      <a href="javascript:changeDisplaySetting('diff', 'split');" id="btn-split" class="btn btn-default">Split</a>
     </div>
   </div>
   Showing <a href="javascript:void(0);" id="toggle-file-list">@diffs.size changed @helpers.plural(diffs.size, "file")</a>
@@ -151,29 +151,22 @@ $(function(){
     });
   }
 
+  window.params = {};
+
   // Render diffs as unified mode initially
   if(("&" + location.search.substring(1)).indexOf("&w=1") != -1){
-    $('.ignore-whitespace').prop('checked',true);
+    $('.ignore-whitespace').prop('checked', true);
+    window.params['w'] = 1;
   }
-  window.viewType = 1;
   if(("&" + location.search.substring(1)).indexOf("&diff=split") != -1){
     window.viewType = 0;
-  }
+    $('#btn-split').addClass('active');
-  renderDiffs();
+    window.params['diff'] = 'split';
-
+  } else {
-  $('#btn-unified').click(function(){
     window.viewType = 1;
     $('#btn-unified').addClass('active');
-    $('#btn-split').removeClass('active');
+  }
   renderDiffs();
-  });
-
-  $('#btn-split').click(function(){
-    window.viewType = 0;
-    $('#btn-unified').removeClass('active');
-    $('#btn-split').addClass('active');
-    renderDiffs();
-  });
 
   $('.toggle-notes').change(function() {
     if (!$(this).prop('checked')) {
@@ -183,14 +176,14 @@ $(function(){
   });
 
   $('.ignore-whitespace').change(function() {
-    renderOneDiff($(this).closest("table").find(".diffText"), viewType);
+    renderOneDiff($(this).closest("table").find(".diffText"), window.viewType);
   });
 
   function getInlineContainer(where) {
-    if (viewType == 0) {
+    if (window.viewType == 0) {
       if (where === 'new') {
         return $('<tr class="not-diff"><td colspan="2"></td><td colspan="2" class="comment-box-container"></td></tr>');
-      } else if (where === 'old') {
+      } else {
         return $('<tr class="not-diff"><td colspan="2" class="comment-box-container"></td><td colspan="2"></td></tr>');
       }
     }
@@ -245,7 +238,7 @@ $(function(){
       var commitId = $this.closest('.table-bordered').attr('commitId'),
       fileName = $this.closest('.table-bordered').attr('fileName'),
       oldLineNumber, newLineNumber;
-      if (viewType == 0) {
+      if (window.viewType == 0) {
         oldLineNumber = $this.parent().prev('.oldline').attr('line-number');
         newLineNumber = $this.parent().prev('.newline').attr('line-number');
       } else {
@@ -274,7 +267,7 @@ $(function(){
   });
 
   function renderOneCommitCommentIntoDiff($v, diff){
-    var filename = $v.attr('filename');
+    //var filename = $v.attr('filename');
     var oldline  = $v.attr('oldline');
     var newline  = $v.attr('newline');
     var tmp;
@@ -335,7 +328,11 @@ $(function(){
         .append(renderStatBar(add, del).attr('title', (add + del) + " lines changed").tooltip());
 
     @if(hasWritePermission) {
-      diffText.find('.body').each(function(){ $('<b class="add-comment">+</b>').prependTo(this); });
+      diffText.find('.body').filter(function(i, e) {
+        return $(e).has('span').length > 0;
+      }).each(function(){
+        $('<b class="add-comment">+</b>').prependTo(this);
+      });
     }
     @if(showLineNotes){
       var fileName = table.attr('filename');
@@ -365,14 +362,14 @@ $(function(){
     });
     for(var key in elements){
       filename = elements[key]['filename'];
-      oldline = elements[key]['oldline'];
+      oldline = elements[key]['oldline']; //? elements[key]['oldline'] : '';
-      newline = elements[key]['newline'];
+      newline = elements[key]['newline']; //? elements[key]['newline'] : '';
 
       var $v = $('<div class="commit-comment-box reply-comment-box">')
-        .append($('<input type="text" class="form-control reply-comment" placeholder="Reply...">')
+        .append($('<input type="text" class="form-control reply-comment" placeholder="Reply..." '
-          .data('filename', filename)
+                       + 'data-filename="' + filename + '" '
-          .data('newline',  newline)
+                       + 'data-newline="' + newline + '" '
-          .data('oldline',  oldline));
+                       + 'data-oldline="' + oldline + '">'));
 
       var tmp;
       if (typeof oldline !== 'undefined') {
@@ -394,7 +391,7 @@ $(function(){
     var i = 0, diffs = $('.diffText');
     function render(){
       if(diffs[i]){
-        var $table = renderOneDiff($(diffs[i]), viewType);
+        var $table = renderOneDiff($(diffs[i]), window.viewType);
         @if(hasWritePermission) {
           renderReplyComment($table);
         }
@@ -405,4 +402,19 @@ $(function(){
     render();
   }
 });
+
+function changeDisplaySetting(key, value){
+  var url = '';
+  window.params[key] = value;
+  for(key in window.params){
+    if(window.params[key] != ''){
+      if(url != ''){
+        url = url + '&' + key + '=' + window.params[key];
+      } else {
+        url = url + '?' + key + '=' + window.params[key];
+      }
+    }
+  }
+  location.href = url;
+}
 </script>

src/main/twirl/gitbucket/core/helper/forkrepository.scala.html

@@ -1,18 +1,24 @@
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  groupAndPerm: Map[String, Boolean])(implicit context: gitbucket.core.controller.Context)
+  groupAndPerm: Seq[(String, Boolean)])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-<h2 class="facebox-header">Where should we fork this repository?</h2>
+<h2 class="facebox-header">
+  Where should we fork this repository?
+  <a class="btn btn-default btn-sm" href="@helpers.url(repository)/network/members">Show forks</a>
+</h2>
 <form action="@helpers.url(repository)/fork" id="fork" method="post">
-  <div class="owner-select-grid">
+  <div class="block">
-    <div class="owner-select-target js-fork-owner-select-target enabled">@helpers.avatar(context.loginAccount.get.userName, 100)<span class="owner css-truncate" title="@@@context.loginAccount.get.userName">@@@context.loginAccount.get.userName</span></div>
+    @helpers.avatar(context.loginAccount.get.userName, 24) <a href="javascript:void(0);" class="js-fork-owner-select-target">@@@context.loginAccount.get.userName</a>
+  </div>
   @for((groupName, isManager) <- groupAndPerm) {
     @if(isManager) {
-        <div class="owner-select-target js-fork-owner-select-target enabled">@helpers.avatar(groupName, 100)<span class="owner css-truncate" title="@@@groupName">@@@groupName</span></div>
+      <div class="block js-fork-owner-select-target">
+        @helpers.avatar(groupName, 24) <a href="javascript:void(0);" class="js-fork-owner-select-target">@@@groupName</a>
+      </div>
     } else {
-        <div title="You don't have permission to fork here."  class="owner-select-target js-fork-owner-select-target disabled">@helpers.avatar(groupName, 100)<span class="owner css-truncate" title="@@@groupName">@@@groupName</span></div>
+      <div class="block" title="You don't have permission to fork here.">
+        @helpers.avatar(groupName, 24) <span class="muted">@@@groupName</span>
+      </div>
     }
   }
-    </div>
-  </div>
   <input id="account" name="account" type="hidden" />
 </form>

src/main/twirl/gitbucket/core/helper/preview.scala.html

@@ -10,12 +10,13 @@
   styleClass: String = "",
   placeholder: String = "Leave a comment",
   elastic: Boolean = false,
+  focus: Boolean = false,
   tabIndex: Int = -2,
   uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 <div class="tabbable">
   <ul class="nav nav-tabs fill-width" style="margin-bottom: 10px;">
-    <li class="active"><a href="#tab@uid" data-toggle="tab">Write</a></li>
+    <li class="active"><a href="#tab@uid" data-toggle="tab" id="write@uid">Write</a></li>
     <li><a href="#tab@(uid + 1)" data-toggle="tab" id="preview@uid">Preview</a></li>
   </ul>
   <div class="tab-content">
@@ -46,6 +47,13 @@ $(function(){
     $('#content@uid').elastic();
     $('#content@uid').trigger('blur');
   }
+  @if(focus){
+    $('#content@uid').trigger('focus');
+  }
+
+  $('#write@uid').on('shown.bs.tab', function(){
+    $('#content@uid').trigger('focus');
+  });
 
   $('#preview@uid').click(function(){
     $('#preview-area@uid').html('<img src="@helpers.assets("/common/images/indicator.gif")"> Previewing...');
@@ -57,6 +65,7 @@ $(function(){
       enableTaskList   : @enableTaskList
     }, function(data){
       $('#preview-area@uid').html(data);
+      $('#preview-area@uid input').prop('disabled', true);
       prettyPrint();
     });
   });

src/main/twirl/gitbucket/core/index.scala.html

@@ -1,10 +1,9 @@
 @(activities: List[gitbucket.core.model.Activity],
   recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
   showBannerToCreatePersonalAccessToken: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("GitBucket"){
-  @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
+  @gitbucket.core.dashboard.html.sidebar(recentRepositories){
     @context.settings.information.map { information =>
       <div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;">
         <button type="button" class="close" data-dismiss="alert">&times;</button>

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

@@ -2,14 +2,15 @@
   comments: List[gitbucket.core.model.Comment],
   isManageable: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  pullreq: Option[gitbucket.core.model.PullRequest] = None)(implicit context: gitbucket.core.controller.Context)
+  pullreq: Option[gitbucket.core.model.PullRequest] = None,
+  commitId: Option[String] = None,
+  renderScript: Boolean = true)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.model.CommitComment
 @issueOrPullRequest()={ @if(issue.exists(_.isPullRequest))( "pull request" )else( "issue" ) }
-@showFormatedComment(comment: gitbucket.core.model.IssueComment)={
+@showFormattedComment(comment: gitbucket.core.model.IssueComment)={
 <div class="panel panel-default issue-comment-box" id="comment-@comment.commentId">
   <div class="panel-heading">
-    @helpers.avatar(comment.commentedUserName, 20)
+    @helpers.avatarLink(comment.commentedUserName, 20)
     @helpers.user(comment.commentedUserName, styleClass="username strong")
     <span class="muted">
       @if(comment.action == "comment"){
@@ -29,7 +30,7 @@
       </span>
     }
   </div>
-  <div class="panel-body issue-content markdown-body" id="commentContent-@comment.commentId">
+  <div class="panel-body markdown-body" id="commentContent-@comment.commentId">
     @helpers.markdown(
       markdown = comment.content,
       repository = repository,
@@ -45,7 +46,7 @@
 @if(issue.isDefined){
   <div class="panel panel-default issue-comment-box">
     <div class="panel-heading">
-      @helpers.avatar(issue.get.openedUserName, 20)
+      @helpers.avatarLink(issue.get.openedUserName, 20)
       @helpers.user(issue.get.openedUserName, styleClass="username strong")
       <span class="muted">commented @gitbucket.core.helper.html.datetimeago(issue.get.registeredDate)</span>
       <span class="pull-right">
@@ -54,7 +55,7 @@
         }
       </span>
     </div>
-    <div class="panel-body issue-content markdown-body" id="issueContent">
+    <div class="panel-body markdown-body" id="issueContent">
       @helpers.markdown(
         markdown = issue.get.content getOrElse "No description provided.",
         repository = repository,
@@ -81,7 +82,7 @@
           <div class="discussion-item discussion-item-commit">
             <div class="discussion-item-header">
               <span class="discussion-item-icon"><i class="octicon octicon-bookmark"></i></span>
-              @helpers.avatar(comment.commentedUserName, 16)
+              @helpers.avatarLink(comment.commentedUserName, 16)
               @helpers.user(comment.commentedUserName, styleClass="username strong")
               added a commit that referenced this @issueOrPullRequest()
               @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -104,7 +105,7 @@
         <div class="discussion-item discussion-item-refer">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-bookmark"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             referenced the @issueOrPullRequest()
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -117,11 +118,11 @@
         </div>
       }
       case "merge" => {
-        @showFormatedComment(comment)
+        @showFormattedComment(comment)
         <div class="discussion-item discussion-item-merge">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-git-merge"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             merged commit
             <code>@pullreq.map(_.commitIdTo.substring(0, 7))</code> into
@@ -136,12 +137,12 @@
       }
       case "close" | "close_comment" => {
         @if(comment.action == "close_comment"){
-          @showFormatedComment(comment)
+          @showFormattedComment(comment)
         }
         <div class="discussion-item discussion-item-close">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-circle-slash"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             closed this @issueOrPullRequest()
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -150,12 +151,12 @@
       }
       case "reopen" | "reopen_comment" => {
         @if(comment.action == "reopen_comment"){
-          @showFormatedComment(comment)
+          @showFormattedComment(comment)
         }
         <div class="discussion-item discussion-item-reopen">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-primitive-dot"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             reopened the @issueOrPullRequest()
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -166,7 +167,7 @@
         <div class="discussion-item discussion-item-delete_branch">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-git-branch"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             deleted the <code>@pullreq.map(_.requestBranch)</code> branch
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -177,7 +178,7 @@
         <div class="discussion-item discussion-item-add-label">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-tag"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             add the <code>@comment.content</code> label
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -188,7 +189,7 @@
         <div class="discussion-item discussion-item-delete-label">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-tag"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             removed the <code>@comment.content</code> label
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -199,7 +200,7 @@
         <div class="discussion-item discussion-item-change-priority">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-flame"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             change priority from <code>@comment.content.split(":")(0)</code> to <code>@comment.content.split(":")(1)</code>
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -210,7 +211,7 @@
         <div class="discussion-item discussion-item-change-milestone">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-milestone"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             change milestone from <code>@comment.content.split(":")(0)</code> to <code>@comment.content.split(":")(1)</code>
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
@@ -221,22 +222,65 @@
         <div class="discussion-item discussion-item-assign">
           <div class="discussion-item-header">
             <span class="discussion-item-icon"><i class="octicon octicon-person"></i></span>
-            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.avatarLink(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             change assignee from <code>@comment.content.split(":")(0)</code> to <code>@comment.content.split(":")(1)</code>
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
           </div>
         </div>
       }
+      case "change_title" => {
+        <div class="discussion-item discussion-item-pencil">
+          <div class="discussion-item-header">
+            <span class="discussion-item-icon"><i class="octicon octicon-pencil"></i></span>
+            @helpers.avatar(comment.commentedUserName, 16)
+            @helpers.user(comment.commentedUserName, styleClass="username strong")
+            change title from <code>@comment.content.split("\r\n")(0)</code> to <code>@comment.content.split("\r\n")(1)</code>
+            @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
+          </div>
+        </div>
+      }
       case _ => {
-        @showFormatedComment(comment)
+        @showFormattedComment(comment)
       }
     }
   }
-  case comment: CommitComment => {
+  case comments: gitbucket.core.model.CommitComments => {
-    @gitbucket.core.helper.html.commitcomment(comment, isManageable, repository, pullreq.map(_.commitIdTo))
+    @gitbucket.core.helper.html.commitcomments(comments, isManageable, repository, commitId.orElse(pullreq.map(_.commitIdTo)))
+  }
+  case comment: gitbucket.core.model.CommitComment => {
+    <div class="panel panel-default commit-comment-box commit-comment-@comment.commentId">
+      <div class="panel-heading">
+        @helpers.avatarLink(comment.commentedUserName, 20)
+        @helpers.user(comment.commentedUserName, styleClass="username strong")
+        <span class="muted">
+          commented
+          <a href="#comment-@comment.commentId">@gitbucket.core.helper.html.datetimeago(comment.registeredDate)</a>
+          on
+          <a href="@helpers.url(repository)/commit/@comment.commitId" class="monospace">@comment.commitId.substring(0, 7)</a>
+        </span>
+        @if((isManageable || context.loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
+          <span class="pull-right">
+            <a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-pencil" aria-label="Edit"></i></a>&nbsp;
+            <a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-x" aria-label="Remove"></i></a>
+          </span>
+        }
+      </div>
+      <div class="panel-body markdown-body commit-commentContent-@comment.commentId">
+        @helpers.markdown(
+          markdown = comment.content,
+          repository = repository,
+          enableWikiLink = false,
+          enableRefsLink = true,
+          enableLineBreaks = true,
+          enableTaskList = true,
+          hasWritePermission = isManageable
+        )
+      </div>
+    </div>
   }
 }
+@if(renderScript){
 <script>
 $(function(){
 @if(issue.isDefined){
@@ -286,38 +330,33 @@ $(function(){
       $.post('@helpers.url(repository)/commit_comments/delete/' + id,
       function(data){
         if(data > 0) {
-          var comment = $('.commit-comment-' + id).closest('.not-diff');
+          var comment = $('.commit-comment-' + id);
-          if(comment.prev('.not-diff').length == 0){
+
-            comment.next('.not-diff').find('.reply-comment').remove();
+          // diff view
+          var tr = comment.closest('.not-diff');
+          if(tr.length > 0){
+            if(tr.prev('.not-diff').length == 0){
+              tr.next('.not-diff:has(.reply-comment)').remove();
             }
+            tr.remove();
+          }
+
+          // comment list view
+          var panel = comment.closest('div.panel:has(.commit-comment-box)');
+          if(panel.length > 0){
+            comment.parent('.commit-comment-box').remove();
+            if(panel.has('.commit-comment-box').length == 0){
+              panel.remove();
+            }
+          } else {
             comment.remove();
           }
+        }
       });
     }
     return false;
   });
 
-  var extractMarkdown = function(data){
-    $('body').append('<div id="tmp"></div>');
-    $('#tmp').html(data);
-    var markdown = $('#tmp textarea').val();
-    $('#tmp').remove();
-    return markdown;
-  };
-
-  var replaceTaskList = function(issueContentHtml, checkboxes) {
-    var ss = [],
-        markdown = extractMarkdown(issueContentHtml),
-        xs = markdown.split(/- \[[x| ]\]/g);
-    for (var i=0; i<xs.length; i++) {
-      ss.push(xs[i]);
-      if (checkboxes.eq(i).prop('checked')) ss.push('- [x]');
-      else ss.push('- [ ]');
-    }
-    ss.pop();
-    return ss.join('');
-  };
-
   $('div[class*=commit-commentContent-]').on('click', ':checkbox', function(ev){
     var $commentContent = $(ev.target).parents('div[class*=commit-commentContent-]'),
         commentId = $commentContent.attr('class').match(/commit-commentContent-.+/)[0].replace(/commit-commentContent-/, ''),
@@ -329,7 +368,7 @@ $(function(){
           type: 'POST',
           data: {
             issueId : 0,
-            content : replaceTaskList(responseContent, checkboxes)
+            content : applyTaskListCheckedStatus(responseContent, checkboxes)
           },
           success: function(data) {
             $('.commit-commentContent-' + commentId).html(data.content);
@@ -349,7 +388,7 @@ $(function(){
           type: 'POST',
           data: {
             title   : $('#issueTitle').text(),
-            content : replaceTaskList(responseContent, checkboxes)
+            content : applyTaskListCheckedStatus(responseContent, checkboxes)
           }
         });
       }
@@ -367,7 +406,7 @@ $(function(){
           type: 'POST',
           data: {
             issueId : 0,
-            content : replaceTaskList(responseContent, checkboxes)
+            content : applyTaskListCheckedStatus(responseContent, checkboxes)
           }
         });
       }
@@ -378,3 +417,4 @@ $(function(){
 
 });
 </script>
+}

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

@@ -12,6 +12,7 @@
   completionContext  = "issues",
   style              = "",
   elastic            = true,
+  focus              = true,
   tabIndex           = 1
 )
 <div class="pull-right">

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

@@ -11,6 +11,7 @@
   completionContext  = "issues",
   style              = "",
   elastic            = true,
+  focus              = true,
   tabIndex           = 1
 )
 <div class="pull-right">

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

@@ -139,7 +139,7 @@
 </div>
 <span id="label-assigned">
   @issue.flatMap(_.assignedUserName).map { userName =>
-    @helpers.avatar(userName, 20) @helpers.user(userName, styleClass="username strong small")
+    @helpers.avatarLink(userName, 20) @helpers.user(userName, styleClass="username strong small")
   }.getOrElse{
     <span class="muted small">No one</span>
   }

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

@@ -4,9 +4,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8">
+    <meta charset="UTF-8" />
-    <title>@title</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <title>@title</title>
     <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/google-fonts/css/source-sans-pro.css")" rel="stylesheet">
@@ -48,9 +49,10 @@
       <header class="main-header">
         <a href="@context.path/" class="logo">
           <span class="logo-mini"><img src="@helpers.assets("/common/images/gitbucket.svg")" alt="GitBucket" /></span>
-          <span class="logo-lg"><img src="@helpers.assets("/common/images/gitbucket.svg")" alt="GitBucket" />
+          <span class="logo-lg">
+            <img src="@helpers.assets("/common/images/gitbucket.svg")" alt="GitBucket" />
             <span class="header-title strong">GitBucket</span>
-          <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span></span>
+          </span>
         </a>
         <nav class="navbar navbar-static-top" role="navigation">
           <!-- Sidebar toggle button-->

src/main/twirl/gitbucket/core/menu.scala.html

@@ -53,9 +53,6 @@
           @menuitem(externalWikiUrl, "wiki", "Wiki", "book")
         }
       }
-      @if(repository.repository.options.allowFork) {
-        @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
-      }
       @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){
         @menuitem("/settings", "settings", "Settings", "gear")
       }
@@ -78,6 +75,20 @@
             @gitbucket.core.plugin.PluginRegistry().getRepositoryHeaders.map { repositoryHeaderComponent =>
               @repositoryHeaderComponent(repository, context)
             }
+            @if(repository.repository.options.allowFork) {
+              @if(context.loginAccount.isEmpty){
+                <a class="btn btn-default btn-sm" href="@context.path/signin?redirect=@helpers.urlEncode(s"${context.path}/${repository.owner}/${repository.name}")">
+                  <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
+                </a>
+              } else {
+                <a class="btn btn-default btn-sm" href="@context.path/@repository.owner/@repository.name/fork" rel="facebox">
+                  <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
+                </a>
+              }
+            }
+            <form id="fork-form" method="post" action="@context.path/@repository.owner/@repository.name/fork" style="display: none;">
+              <input type="hidden" name="account" value="@context.loginAccount.map(_.userName)"/>
+            </form>
           </div>
           @gitbucket.core.helper.html.repositoryicon(repository, true)
           <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
@@ -95,4 +106,19 @@
     @body
   </div>
 </div>
+<script>
+$(function(){
+  $('a[rel*=facebox]').facebox({
+    'loadingImage': '@helpers.assets("/vendors/facebox/loading.gif")',
+    'closeImage': '@helpers.assets("/vendors/facebox/closelabel.png")'
+  });
+
+  $(document).on("click", ".js-fork-owner-select-target", function() {
+    var account = $(this).text().replace("@@", "");
+    $("#account").val(account);
+    $("#fork").submit();
+  });
+});
+</script>
+
 

src/main/twirl/gitbucket/core/pulls/commits.scala.html

@@ -1,9 +1,14 @@
-@(commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
+@(issue: gitbucket.core.model.Issue,
-  comments: Option[List[gitbucket.core.model.Comment]] = None,
+  pullreq: gitbucket.core.model.PullRequest,
+  commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
+  comments: Seq[gitbucket.core.model.Comment],
+  changedFileSize: Int,
+  isManageable: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-<table class="table table-bordered">
+@gitbucket.core.pulls.html.menu("commits", issue, pullreq, commits.flatten, comments, changedFileSize, isManageable, repository){
-@commits.map { day =>
+  <table class="table table-bordered">
+  @commits.map { day =>
     <tr>
       <th rowspan="@day.size" width="100">@helpers.date(day.head.commitTime)</th>
       @day.zipWithIndex.map { case (commit, i) =>
@@ -38,5 +43,6 @@
         </td>
         </tr>
       }
+  }
+  </table>
 }
-</table>

src/main/twirl/gitbucket/core/pulls/compare.scala.html

@@ -142,7 +142,7 @@
             <tr>
               <td style="width: 20%;">
                 <i class="octicon octicon-git-commit"></i>
-                @helpers.avatar(commit, 20)
+                @helpers.avatarLink(commit, 20)
                 @helpers.user(commit.authorName, commit.authorEmailAddress, "username strong")
               </td>
               <td><span class="monospace">@commit.shortMessage</span></td>

src/main/twirl/gitbucket/core/pulls/conversation.scala.html

@@ -1,7 +1,8 @@
 @(issue: gitbucket.core.model.Issue,
   pullreq: gitbucket.core.model.PullRequest,
   commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo],
-  comments: List[gitbucket.core.model.Comment],
+  comments: Seq[gitbucket.core.model.Comment],
+  changedFileSize: Int,
   issueLabels: List[gitbucket.core.model.Label],
   collaborators: List[String],
   milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
@@ -11,11 +12,14 @@
   isManageable: Boolean,
   isManageableForkedRepository: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+  forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  flash: Map[String, String])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-<div class="col-md-9">
+@gitbucket.core.pulls.html.menu("conversation", issue, pullreq, commits, comments, changedFileSize, isManageable, repository, flash){
+  <link href="@helpers.assets("/vendors/jsdifflib/diffview.css")" type="text/css" rel="stylesheet" />
+  <div class="col-md-9">
     <div id="comment-list">
-    @gitbucket.core.issues.html.commentlist(Some(issue), comments, isManageable, repository, Some(pullreq))
+      @gitbucket.core.issues.html.commentlist(Some(issue), comments.toList, isManageable, repository, Some(pullreq))
     </div>
     @defining(comments.flatMap {
       case comment: gitbucket.core.model.IssueComment => Some(comment)
@@ -24,7 +28,7 @@
       @if(!issue.closed){
         <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;">
+            <div class="box-content" style="border: 1px solid #c09853; padding: 10px;">
               <img src="@helpers.assets("/common/images/indicator.gif")"/> Checking...
             </div>
           </div>
@@ -33,7 +37,7 @@
       @if(isManageableForkedRepository && issue.closed && merged &&
         forkedRepository.map(r => (r.branchList.contains(pullreq.requestBranch) && r.repository.defaultBranch != pullreq.requestBranch)).getOrElse(false)){
         <div class="issue-comment-box" style="background-color: #d0eeff;">
-        <div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">
+          <div class="box-content" style="border: 1px solid #87a8c9; padding: 10px;">
             <a href="@helpers.url(repository)/pull/@issue.issueId/delete_branch" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
             <div>
               <span class="strong">Pull request successfully merged and closed</span>
@@ -44,12 +48,12 @@
       }
       @gitbucket.core.issues.html.commentform(issue, !merged, isEditable, isManageable, repository)
     }
-</div>
+  </div>
-<div class="col-md-3">
+  <div class="col-md-3">
-  @gitbucket.core.issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, priorities, None, labels, isManageable, repository)
+    @gitbucket.core.issues.html.issueinfo(Some(issue), comments.toList, issueLabels, collaborators, milestones, priorities, None, labels, isManageable, repository)
-</div>
+  </div>
-<script>
+  <script>
-$(function(){
+  $(function(){
     @if(commits.nonEmpty){
       var checkConflict = $('.check-conflict').show();
       if(checkConflict.length){
@@ -60,5 +64,6 @@ $(function(){
       var branchName = $(e.target).data('name');
       return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
     });
-});
+  });
-</script>
+  </script>
+}

src/main/twirl/gitbucket/core/pulls/files.scala.html

@@ -0,0 +1,22 @@
+@(issue: gitbucket.core.model.Issue,
+  pullreq: gitbucket.core.model.PullRequest,
+  diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
+  commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo],
+  comments: Seq[gitbucket.core.model.Comment],
+  isManageable: Boolean,
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@gitbucket.core.pulls.html.menu("files", issue, pullreq, commits, comments, diffs.size, isManageable, repository) {
+  @gitbucket.core.helper.html.diff(
+    diffs,
+    repository,
+    commits.headOption.map(_.id),
+    Some(pullreq.commitIdFrom),
+    true,
+    Some(pullreq.issueId),
+    isManageable,
+    true
+  )
+  <div id="comment-list" style="display: none;">
+    @gitbucket.core.issues.html.commentlist(Some(issue), comments.toList, isManageable, repository, Some(pullreq))
+  </div>
+}

src/main/twirl/gitbucket/core/pulls/menu.scala.html

@@ -0,0 +1,129 @@
+@(active: String,
+  issue: gitbucket.core.model.Issue,
+  pullreq: gitbucket.core.model.PullRequest,
+  commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo],
+  comments: Seq[gitbucket.core.model.Comment],
+  changedFileSize: Int,
+  isManageable: Boolean,
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  flash: Map[String, String] = Map.empty)(body: => Html)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@import gitbucket.core.model.Comment
+@import gitbucket.core.model.CommitComments
+@import gitbucket.core.model.IssueComment
+@gitbucket.core.html.main(s"${issue.title} - Pull request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("pulls", repository) {
+      <div>
+        <div class="show-title pull-right">
+          @if(isManageable || context.loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)) {
+            <a class="btn btn-default" href="#" id="edit">Edit</a>
+          }
+          @if(context.loginAccount.isDefined) {
+            <a class="btn btn-success" href="@helpers.url(repository)/compare">New pull request</a>
+          }
+        </div>
+        <div class="edit-title pull-right" style="display: none;">
+          <a class="btn btn-success" href="#" id="update">Save</a>  <a class="btn btn-default" href="#" id="cancel">
+          Cancel</a>
+        </div>
+        <h1 class="body-title">
+          <span class="show-title">
+            <span id="show-title">@issue.title</span>
+            <span class="muted">#@issue.issueId</span>
+          </span>
+          <span class="edit-title" style="display: none;">
+            <span id="error-edit-title" class="error"></span>
+            <input type="text" class="form-control" style="width: 700px;" id="edit-title" value="@issue.title"/>
+          </span>
+        </h1>
+      </div>
+      <div style="margin-bottom: 15px">
+      @if(issue.closed) {
+        @comments.flatMap @{
+          case comment: IssueComment => Some(comment)
+          case _ => None
+        }.find(_.action == "merge").map { comment =>
+        <span class="label label-info issue-status">Merged</span>
+        <span class="muted">
+          @helpers.user(comment.commentedUserName, styleClass = "username strong")
+          merged @commits.size @helpers.plural(commits.size, "commit")
+          into <code>@pullreq.userName:@pullreq.branch</code>
+          from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
+          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
+        </span>
+        }.getOrElse {
+          <span class="label label-important issue-status">Closed</span>
+          <span class="muted">
+            @helpers.user(issue.openedUserName, styleClass = "username strong")
+            wants to merge @commits.size @helpers.plural(commits.size, "commit")
+            into <code>@pullreq.userName:@pullreq.branch</code>
+            from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
+          </span>
+        }
+      } else {
+        <span class="label label-success issue-status">Open</span>
+        <span class="muted">
+          @helpers.user(issue.openedUserName, styleClass = "username strong")
+          wants to merge @commits.size @helpers.plural(commits.size, "commit")
+          into <code>@pullreq.userName:@pullreq.branch</code>
+          from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
+        </span>
+      }
+      </div>
+      <ul class="nav nav-tabs fill-width" id="pullreq-tab">
+        <li @if(active=="conversation"){class="active"}><a href="@helpers.url(repository)/pull/@issue.issueId">Conversation <span class="badge">@countConversation(comments)</span></a></li>
+        <li @if(active=="commits"){class="active"}><a href="@helpers.url(repository)/pull/@issue.issueId/commits">Commits <span class="badge">@commits.size</span></a></li>
+        <li @if(active=="files"){class="active"}><a href="@helpers.url(repository)/pull/@issue.issueId/files">Files Changed <span class="badge">@changedFileSize</span></a></li>
+      </ul>
+      <div class="tab-content fill-width" style="padding-top: 20px;">
+        @flash.get("error").map { error =>
+          <div class="alert alert-error">@error</div>
+        }
+        @flash.get("info").map { info =>
+          <div class="alert alert-info">@info</div>
+        }
+        @body
+      </div>
+  }
+}
+<script>
+  $(function(){
+   $('#edit').click(function(){
+      $('.edit-title').show();
+      $('.show-title').hide();
+      return false;
+    });
+
+    $('#update').click(function(){
+      $(this).attr('disabled', 'disabled');
+      $.ajax({
+        url: '@helpers.url(repository)/issues/edit_title/@issue.issueId',
+        type: 'POST',
+        data: {
+          title   : $('#edit-title').val()
+        }
+      }).done(function(data){
+        $('#show-title').empty().text(data.title);
+        $('#cancel').click();
+        $(this).removeAttr('disabled');
+      }).fail(function(req){
+        $(this).removeAttr('disabled');
+        $('#error-edit-title').text($.parseJSON(req.responseText).title);
+      });
+      return false;
+    });
+
+    $('#cancel').click(function(){
+      $('.edit-title').hide();
+      $('.show-title').show();
+      return false;
+    });
+  });
+</script>
+
+@countConversation(comments: Seq[Comment]) = @{
+  comments.collect {
+    case c: CommitComments => c.comments.size
+    case c: IssueComment if c.action.endsWith("comment") => 1
+  }.sum
+}

src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html

@@ -5,7 +5,7 @@
   forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 <div class="issue-comment-box" style="background-color: @if(status.hasProblem){ #fbeed5 }else{ #d8f5cd };">
-  <div class="box-content issue-content" style="border: 1px solid @if(status.hasProblem){ #c09853 }else{ #95c97e };padding:0">
+  <div class="box-content" style="border: 1px solid @if(status.hasProblem){ #c09853 }else{ #95c97e };padding:0">
     <div id="merge-pull-request">
       @if(!status.statuses.isEmpty){
         <div class="build-statuses">
@@ -106,7 +106,7 @@
             @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", forkedRepository.httpUrl){
               <div class="input-group-btn" data-toggle="buttons">
                 <label class="btn btn-sm btn-default active" id="repository-url-http"><input type="radio" checked>HTTP</label>
-                @if(context.settings.ssh && context.loginAccount.isDefined){
+                @if(context.settings.ssh.enabled && context.loginAccount.isDefined){
                   <label class="btn btn-sm btn-default" id="repository-url-ssh"><input type="radio">SSH</label>
                 }
               </div>

src/main/twirl/gitbucket/core/pulls/pullreq.scala.html

@@ -1,159 +0,0 @@
-@(issue: gitbucket.core.model.Issue,
-  pullreq: gitbucket.core.model.PullRequest,
-  comments: List[gitbucket.core.model.Comment],
-  issueLabels: List[gitbucket.core.model.Label],
-  collaborators: List[String],
-  milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
-  priorities: List[gitbucket.core.model.Priority],
-  labels: List[gitbucket.core.model.Label],
-  dayByDayCommits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
-  diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
-  isEditable: Boolean,
-  isManageable: Boolean,
-  isManageableForkedRepository: Boolean,
-  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo],
-  flash: Map[String, String])(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.view.helpers
-@import gitbucket.core.model.IssueComment
-@import gitbucket.core.model.CommitComment
-@gitbucket.core.html.main(s"${issue.title} - Pull request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
-  @gitbucket.core.html.menu("pulls", repository){
-    @defining(dayByDayCommits.flatten){ commits =>
-      <div>
-        <div class="show-title pull-right">
-          @if(isManageable || context.loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
-            <a class="btn btn-default" href="#" id="edit">Edit</a>
-          }
-          @if(context.loginAccount.isDefined){
-            <a class="btn btn-success" href="@helpers.url(repository)/compare">New pull request</a>
-          }
-        </div>
-        <div class="edit-title pull-right" style="display: none;">
-          <a class="btn btn-success" href="#" id="update">Save</a>  <a class="btn btn-default" href="#" id="cancel">Cancel</a>
-        </div>
-        <h1 class="body-title">
-          <span class="show-title">
-            <span id="show-title">@issue.title</span>
-            <span class="muted">#@issue.issueId</span>
-          </span>
-          <span class="edit-title" style="display: none;">
-            <span id="error-edit-title" class="error"></span>
-            <input type="text" class="form-control" style="width: 700px;" id="edit-title" value="@issue.title"/>
-          </span>
-        </h1>
-      </div>
-      <div style="margin-bottom: 15px">
-        @if(issue.closed) {
-          @comments.flatMap @{
-            case comment: IssueComment => Some(comment)
-            case _ => None
-          }.find(_.action == "merge").map{ comment =>
-            <span class="label label-info issue-status">Merged</span>
-            <span class="muted">
-              @helpers.user(comment.commentedUserName, styleClass="username strong") merged @commits.size @helpers.plural(commits.size, "commit")
-              into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-              @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
-            </span>
-          }.getOrElse {
-            <span class="label label-important issue-status">Closed</span>
-            <span class="muted">
-              @helpers.user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @helpers.plural(commits.size, "commit")
-              into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-            </span>
-          }
-        } else {
-          <span class="label label-success issue-status">Open</span>
-          <span class="muted">
-            @helpers.user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @helpers.plural(commits.size, "commit")
-            into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-          </span>
-        }
-      </div>
-      <ul class="nav nav-tabs fill-width" id="pullreq-tab">
-        <li><a href="#conversation">Conversation <span class="badge">@comments.flatMap @{
-          case comment: IssueComment => Some(comment)
-          case _: CommitComment => None
-        }.size</span></a></li>
-        <li><a href="#commits">Commits <span class="badge">@commits.size</span></a></li>
-        <li><a href="#files">Files Changed <span class="badge">@diffs.size</span></a></li>
-      </ul>
-      <div class="tab-content fill-width" style="padding-top: 20px;">
-        <div class="tab-pane" id="conversation">
-          @flash.get("error").map{ error =>
-            <div class="alert alert-error">@error</div>
-          }
-          @flash.get("info").map{ info =>
-            <div class="alert alert-info">@info</div>
-          }
-          @gitbucket.core.pulls.html.conversation(issue, pullreq, commits, comments, issueLabels, collaborators, milestones, priorities, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository)
-        </div>
-        <div class="tab-pane" id="commits">
-          @if(commits.nonEmpty){
-            @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository)
-          }
-        </div>
-        <div class="tab-pane" id="files">
-          @if(commits.nonEmpty){
-            @gitbucket.core.helper.html.diff(diffs, repository, commits.headOption.map(_.id), commits.lastOption.map(_.id), true, Some(pullreq.issueId), isManageable, true)
-          }
-        </div>
-      </div>
-    }
-  }
-}
-<script>
-$(function(){
-  // Determine active tab from hash
-  if(location.hash == '#commits'){
-    $('li:has(a[href="#commits"])').addClass('active');
-    $('div#commits').addClass('active');
-  } else if(location.hash == '#files'){
-    $('li:has(a[href="#files"])').addClass('active');
-    $('div#files').addClass('active');
-  } else {
-    $('li:has(a[href="#conversation"])').addClass('active');
-    $('div#conversation').addClass('active');
-  }
-  // Set hash when tab is clicked
-  $('ul.nav-tabs li a').click(function(e){
-    location.href = $(e.delegateTarget).attr("href");
-  });
-
-  $('#pullreq-tab a').click(function (e) {
-    e.preventDefault();
-    $(this).tab('show');
-  });
-
-  $('#edit').click(function(){
-    $('.edit-title').show();
-    $('.show-title').hide();
-    return false;
-  });
-
-  $('#update').click(function(){
-    $(this).attr('disabled', 'disabled');
-    $.ajax({
-      url: '@helpers.url(repository)/issues/edit_title/@issue.issueId',
-      type: 'POST',
-      data: {
-        title   : $('#edit-title').val()
-      }
-    }).done(function(data){
-      $('#show-title').empty().text(data.title);
-      $('#cancel').click();
-      $(this).removeAttr('disabled');
-    }).fail(function(req){
-      $(this).removeAttr('disabled');
-      $('#error-edit-title').text($.parseJSON(req.responseText).title);
-    });
-    return false;
-  });
-
-  $('#cancel').click(function(){
-    $('.edit-title').hide();
-    $('.show-title').show();
-    return false;
-  });
-});
-</script>

src/main/twirl/gitbucket/core/releases/list.scala.html

@@ -22,7 +22,7 @@
                 @release.map { case (release, assets) =>
                   <h3><a href="@helpers.url(repository)/releases/@release.tag">@release.name</a></h3>
                   <p class="muted">
-                    @helpers.avatar(release.author, 20) @helpers.user(release.author, styleClass="username") released this @gitbucket.core.helper.html.datetimeago(release.registeredDate)
+                    @helpers.avatarLink(release.author, 20) @helpers.user(release.author, styleClass="username") released this @gitbucket.core.helper.html.datetimeago(release.registeredDate)
                   </p>
                   @helpers.markdown(
                     markdown           = release.content getOrElse "No description provided.",

src/main/twirl/gitbucket/core/releases/release.scala.html

@@ -29,7 +29,7 @@
             }
           </h3>
           <p class="muted">
-           @helpers.avatar(release.author, 20) @helpers.user(release.author, styleClass="username") released this @gitbucket.core.helper.html.datetimeago(release.registeredDate)
+           @helpers.avatarLink(release.author, 20) @helpers.user(release.author, styleClass="username") released this @gitbucket.core.helper.html.datetimeago(release.registeredDate)
           </p>
           @helpers.markdown(
             markdown           = release.content getOrElse "No description provided.",

src/main/twirl/gitbucket/core/repo/blob.scala.html

@@ -56,7 +56,7 @@
       }
     </div>
     <div class="box-header">
-      @helpers.avatar(latestCommit, 28)
+      @helpers.avatarLink(latestCommit, 28)
       @helpers.user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
       <span class="muted">@gitbucket.core.helper.html.datetimeago(latestCommit.commitTime)</span>
       <span class="label label-default">@helpers.readableSize(content.size)</span>

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

@@ -4,7 +4,9 @@
   newLineNumber: Option[Int] = None,
   issueId: Option[Int] = None,
   hasWritePermission: Boolean,
-  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  focus: Boolean = false,
+  uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @if(context.loginAccount.isDefined){
   @if(!fileName.isDefined){<hr/><br/>}
@@ -21,16 +23,18 @@
           hasWritePermission = hasWritePermission,
           completionContext  = "issues",
           style              = "height: 100px; max-height: 150px;",
-          elastic            = true
+          elastic            = true,
+          focus              = focus,
+          uid                = uid
         )
-      </div>
         @if(fileName.isDefined){
-        <div class="pull-right" style="margin-top: 10px;">
+          <div class="pull-right">
             <input type="button" class="btn btn-default" value="Cancel"/>
-          <input type="submit" class="btn btn-success btn-inline-comment" formaction="@helpers.url(repository)/commit/@commitId/comment/new" value="Comment"/>
+            <input type="submit" id="btn-inline-comment-@uid" class="btn btn-success" formaction="@helpers.url(repository)/commit/@commitId/comment/new" value="Comment"/>
           </div>
         }
       </div>
+    </div>
     @if(!fileName.isDefined){
       <div class="pull-right">
         <input type="submit" class="btn btn-success" formaction="@helpers.url(repository)/commit/@commitId/comment/new" value="Comment on this commit"/>
@@ -42,13 +46,22 @@
     @newLineNumber.map { newLineNumber => <input type="hidden" name="newLineNumber" value="@newLineNumber"> }
   </form>
   <script>
-    $('.btn-inline-comment').click(function(e) {
+    $('#btn-inline-comment-@uid').click(function(e) {
       e.preventDefault();
       var $form = $(e.target).attr('disabled', 'disabled').closest('form');
       var param = {};
       $($form.serializeArray()).each(function(i, v) {
         param[v.name] = v.value;
       });
+
+      @if(newLineNumber.isDefined){
+        var diff = getDiffData($('table[filename="@fileName"] table.diff tr:has(th.line-num.newline[line-number=@newLineNumber])'));
+        param['diff'] = JSON.stringify(diff);
+      } else if(oldLineNumber.isDefined){
+        var diff = getDiffData($('table[filename="@fileName"] table.diff tr:has(th.line-num.oldline[line-number=@oldLineNumber])'));
+        param['diff'] = JSON.stringify(diff);
+      }
+
       $.ajax({
         url: '@helpers.url(repository)/commit/@commitId/comment/_data/new',
         type: 'POST',
@@ -67,7 +80,28 @@
         var $tr = $form.closest('tr.not-diff');
 
         // Apply comment
-        $tr.removeClass('inline-comment-form').html(tmp).find('.comment-box-container').html(data);
+        var $addedCommentContent = $tr.removeClass('inline-comment-form').html(tmp).find('.comment-box-container');
+        $addedCommentContent.html(data);
+        $addedCommentContent.find('div[class*=commit-commentContent-]').on('click', ':checkbox', function(ev){
+          var $commentContent = $(ev.target).parents('div[class*=commit-commentContent-]'),
+            commentId = $commentContent.attr('class').match(/commit-commentContent-.+/)[0].replace(/commit-commentContent-/, ''),
+            checkboxes = $commentContent.find(':checkbox');
+          $.get('@helpers.url(repository)/commit_comments/_data/' + commentId, { dataType : 'html' },
+            function(responseContent){
+              $.ajax({
+                url: '@helpers.url(repository)/commit_comments/edit/' + commentId,
+                type: 'POST',
+                data: {
+                  issueId : 0,
+                  content : applyTaskListCheckedStatus(responseContent, checkboxes)
+                },
+                success: function(data) {
+                  $('.commit-commentContent-' + commentId).html(data.content);
+                }
+              });
+            }
+          );
+        });
 
         // Show reply comment form
         var replyComment = $tr.prev().find('.reply-comment').closest('.not-diff').show();
@@ -80,23 +114,32 @@
               .data('filename', '@fileName')
               .data('newline',  @newLineNumber.getOrElse("undefined"))
               .data('oldline',  @oldLineNumber.getOrElse("undefined")));
+
+          @if(oldLineNumber.isDefined){
+            @if(newLineNumber.isDefined){
               var tmp = getInlineContainer();
-          tmp.children('td:last').html($v)
+            } else {
+              var tmp = getInlineContainer('old');
+            }
+            tmp.children('td:first').html($v);
+          } else {
+            var tmp = getInlineContainer('new');
+            tmp.children('td:last').html($v);
+          }
           $tr.after(tmp);
         }
 
-        $('#comment-list').append(data);
+        // $('#comment-list').append(data);
-        if (typeof $('#show-notes')[0] !== 'undefined' && !$('#show-notes')[0].checked) {
+        // if (typeof $('#show-notes')[0] !== 'undefined' && !$('#show-notes')[0].checked) {
-          $('#comment-list').children('.inline-comment').hide();
+        //   $('#comment-list').children('.inline-comment').hide();
-        }
+        // }
       }).fail(function(req) {
-        $('.btn-inline-comment').removeAttr('disabled');
+        $(e.target).removeAttr('disabled');
         $('#error-content', $form).html($.parseJSON(req.responseText).content);
       });
     });
 
     function getInlineContainer() {
-      console.log(window.viewType);
       if (window.viewType == 0) {
         if(@newLineNumber.isDefined){
           return $('<tr class="not-diff"><td colspan="2"></td><td colspan="2" class="comment-box-container"></td></tr>');
@@ -107,5 +150,92 @@
       }
       return $('<tr class="not-diff"><td colspan="3" class="comment-box-container"></td></tr>');
     }
+
+    function getDiffData(tr){
+      if(window.viewType === 0) {
+        return getDiffDataOnSplitMode(tr);
+      } else {
+        return getDiffDataOnUnifiedMode(tr);
+      }
+    }
+
+    function getDiffDataOnUnifiedMode(tr) {
+      var result = [];
+      var count = 0;
+
+      while(tr && count < 4){
+        var oldTh = tr.find('th.oldline');
+        var newTh = tr.find('th.newline');
+
+        var oldLineNumber = oldTh.attr('line-number');
+        var newLineNumber = newTh.attr('line-number');
+
+        if(!oldLineNumber && !newLineNumber){
+          break;
+        }
+
+        result.unshift({
+          'oldLine': oldLineNumber,
+          'newLine': newLineNumber,
+          'type': tr.has('td.insert').length > 0 ? 'insert' : tr.has('td.delete').length > 0 ? 'delete' : 'equal',
+          'text': tr.find('td span').text()
+        });
+
+        tr = tr.prev('tr:has(th.line-num)');
+        count++;
+      }
+
+      return result;
+    }
+
+    function getDiffDataOnSplitMode(tr) {
+      var result = [];
+      var count = 0;
+
+      while(tr && count < 4){
+        var oldTh = tr.find('th.oldline');
+        var newTh = tr.find('th.newline');
+
+        var oldLineNumber = oldTh.attr('line-number');
+        var newLineNumber = newTh.attr('line-number');
+
+        if(!oldLineNumber && !newLineNumber){
+          break;
+        }
+
+        var oldTd = oldTh.next();
+        var newTd = newTh.next();
+
+        if (oldTd.hasClass('equal') && newTd.hasClass('equal')) {
+          result.unshift({
+            'oldLine': oldLineNumber,
+            'newLine': newLineNumber,
+            'type': 'equal',
+            'text': newTd.find('span').text()
+          });
+          count++;
+        } else {
+          if(newLineNumber) {
+            result.unshift({
+              'newLine': newLineNumber,
+              'type': 'insert',
+              'text': newTd.find('span').text()
+            });
+            count++;
+          }
+          if(oldLineNumber) {
+            result.unshift({
+              'oldLine': oldLineNumber,
+              'type': 'delete',
+              'text': oldTd.find('span').text()
+            });
+            count++;
+          }
+        }
+        tr = tr.prev('tr:has(th.line-num)');
+      }
+
+      return result;
+    }
   </script>
 }

src/main/twirl/gitbucket/core/repo/commit.scala.html

@@ -9,6 +9,7 @@
   hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @import gitbucket.core.view.helpers.RichHtmlSeq
+@import gitbucket.core.model._
 @gitbucket.core.html.main(commit.shortMessage, Some(repository)){
   @gitbucket.core.html.menu("files", repository){
     <table class="table table-bordered">
@@ -67,7 +68,7 @@
 
           <div class="author-info">
             <div class="author">
-              @helpers.avatar(commit, 20)
+              @helpers.avatarLink(commit, 20)
               <span>@helpers.user(commit.authorName, commit.authorEmailAddress, "username strong")</span>
               <span class="muted">authored @gitbucket.core.helper.html.datetimeago(commit.authorTime)</span>
             </div>
@@ -87,7 +88,30 @@
       <input type="checkbox" id="show-notes"> Show line notes below
     </label>
     <div id="comment-list">
-      @gitbucket.core.issues.html.commentlist(None, comments, hasWritePermission, repository, None)
+      @gitbucket.core.issues.html.commentlist(
+        issue        = None,
+        comments     = comments.filter(_.asInstanceOf[CommitComment].fileName.isEmpty),
+        isManageable = hasWritePermission,
+        repository   = repository,
+        pullreq      = None,
+        renderScript = false)
+      <div style="display: none;">
+        @gitbucket.core.issues.html.commentlist(
+          issue        = None,
+          comments     = comments.map(_.asInstanceOf[CommitComment]).filter(_.fileName.isDefined).groupBy(_.fileName).map { case (fileName, comments) =>
+            CommitComments(
+              fileName          = fileName.get,
+              commentedUserName = comments.head.commentedUserName,
+              registeredDate    = comments.head.registeredDate,
+              comments          = comments,
+              diff              = None
+            )
+          }.toList,
+          isManageable = hasWritePermission,
+          repository   = repository,
+          pullreq      = None,
+          commitId     = Some(commitId))
+      </div>
     </div>
     @gitbucket.core.repo.html.commentform(commitId = commitId, hasWritePermission = hasWritePermission, repository = repository)
   }

src/main/twirl/gitbucket/core/repo/commits.scala.html

@@ -6,7 +6,8 @@
   hasNext: Boolean,
   hasWritePermission: Boolean,
   getStatuses: String => List[gitbucket.core.model.CommitStatus],
-  getSummary: List[gitbucket.core.model.CommitStatus] => (gitbucket.core.model.CommitState, String))(implicit context: gitbucket.core.controller.Context)
+  getSummary: List[gitbucket.core.model.CommitStatus] => (gitbucket.core.model.CommitState, String),
+  getTags: String => List[String])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("files", repository){
@@ -39,6 +40,16 @@
           @if(i != 0){ <tr> }
           <td>
             <div class="pull-right text-right">
+              @defining(getTags(commit.id)) { tags =>
+                @if(tags.nonEmpty){
+                  <span class="muted">
+                    <i class="octicon octicon-tag"></i>
+                    @tags.map { tag =>
+                      <a href="@helpers.url(repository)/tree/@tag" class="tag">@tag</a>
+                    }
+                  </span>
+                }
+              }
               <a href="@helpers.url(repository)/commit/@commit.id" class="monospace commit-message strong"><i class="octicon octicon-diff" style="color: black;"></i>@commit.id.substring(0, 7)</a><br>
               <a href="@helpers.url(repository)/tree/@commit.id" class="button-link">Browse files »</a>
             </div>

src/main/twirl/gitbucket/core/repo/delete.scala.html

@@ -46,7 +46,7 @@
             <input type="text" name="message" class="form-control"/>
           </div>
           <div style="text-align: right;">
-            <a href="@helpers.url(repository)/blob/@helpers.encodeRefName((branch :: pathList).mkString("/"))" class="btn btn-danger">Cancel</a>
+            <a href="@helpers.url(repository)/blob/@helpers.encodeRefName((branch :: pathList).mkString("/"))" class="btn btn-default">Cancel</a>
             <input type="submit" id="commitButton" class="btn btn-success" value="Commit changes"/>
           </div>
         </div>

src/main/twirl/gitbucket/core/repo/editcomment.scala.html

@@ -12,9 +12,10 @@
   completionContext  = "issues",
   style              = "",
   elastic            = true,
+  focus              = true,
   tabIndex           = 1
 )
-<div class="pull-right">
+<div class="text-right">
   <input type="button" class="cancel-comment-@commentId btn btn-small btn-default" value="Cancel"/>
   <input type="button" class="update-comment-@commentId btn btn-small btn-success" value="Update comment"/>
 </div>

src/main/twirl/gitbucket/core/repo/editor.scala.html

@@ -23,7 +23,7 @@
         @pathList.zipWithIndex.map { case (section, i) =>
           <a href="@helpers.url(repository)/tree/@helpers.encodeRefName((branch :: pathList.take(i + 1)).mkString("/"))">@section</a> /
         }
-        <input type="text" name="newFileName" id="newFileName" class="form-control" placeholder="Name your file..." value="@fileName"/>
+        <input type="text" name="newFileName" id="newFileName" class="form-control" placeholder="Name your file..." value="@fileName" style="display: inline; width: 300px;"/>
         <input type="hidden" name="oldFileName" id="oldFileName" value="@fileName"/>
         <input type="hidden" name="branch" id="branch" value="@branch"/>
         <input type="hidden" name="path" id="path" value="@pathList.mkString("/")"/>
@@ -64,7 +64,7 @@
             @if(fileName.isEmpty){
               <a href="@helpers.url(repository)/tree/@helpers.encodeRefName((branch :: pathList).mkString("/"))" class="btn btn-default">Cancel</a>
             } else {
-              <a href="@helpers.url(repository)/blob/@helpers.encodeRefName((branch :: pathList ++ Seq(fileName.get)).mkString("/"))" class="btn btn-danger">Cancel</a>
+              <a href="@helpers.url(repository)/blob/@helpers.encodeRefName((branch :: pathList ++ Seq(fileName.get)).mkString("/"))" class="btn btn-default">Cancel</a>
             }
             <input type="submit" id="commitButton" class="btn btn-success" value="Commit changes" disabled="true"/>
             <input type="hidden" id="charset" name="charset" value="@content.charset"/>
@@ -79,6 +79,7 @@
   }
 }
 <script src="@helpers.assets("/vendors/ace/ace.js")" type="text/javascript" charset="utf-8"></script>
+<script src="@helpers.assets("/vendors/ace/ext-modelist.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>
@@ -93,7 +94,9 @@ $(function(){
   }
 
   @if(fileName.isDefined){
-    editor.getSession().setMode("ace/mode/@helpers.editorType(fileName.get)");
+    var modelist = ace.require("ace/ext/modelist");
+    var mode = modelist.getModeForPath("@fileName.get");
+    editor.getSession().setMode(mode.mode);
   }
   @if(protectedBranch){
     editor.setReadOnly(true);
@@ -164,8 +167,8 @@ $(function(){
       // Show diff
       $('#preview').empty()
         .append($('<div id="diffText">'))
-        .append($('<textarea id="newText" style="display: none;">').data('file-name',$("#newFileName").val()).html(editor.getValue()))
+        .append($('<textarea id="newText" style="display: none;">').data('file-name',$("#newFileName").val()).data('val', editor.getValue()))
-        .append($('<textarea id="oldText" style="display: none;">').data('file-name',$("#oldFileName").val()).html($('#initial').val()));
+        .append($('<textarea id="oldText" style="display: none;">').data('file-name',$("#oldFileName").val()).data('val', $('#initial').val()));
       diffUsingJS('oldText', 'newText', 'diffText', 1);
     }
   });

src/main/twirl/gitbucket/core/repo/files.scala.html

@@ -33,10 +33,11 @@
     <div class="head" style="height: 24px;">
       <div class="pull-right">
         <div class="btn-group">
-          <a href="@helpers.url(repository)/tree/@helpers.encodeRefName((latestCommit.id :: pathList).mkString("/"))" data-hotkey="y" style="display: none;">Transfer to URL with SHA</a>
+          <a href="@{helpers.url(repository)}/archive/@{helpers.encodeRefName(branch)}@if(pathList.length > 0){/@pathList.mkString("/")}/@{helpers.encodeRefName(branch)}.zip" class="btn btn-sm btn-default pc"><i class="octicon octicon-cloud-download"></i> Download ZIP</a>
           <a href="@helpers.url(repository)/find/@helpers.encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t"><i class="octicon octicon-search"></i></a>
           <a href="@helpers.url(repository)/commits/@helpers.encodeRefName((branch :: pathList).mkString("/"))" class="btn btn-sm btn-default"><i class="octicon octicon-history"></i> @if(commitCount > 10000){10000+} else {@commitCount} @helpers.plural(commitCount, "commit")</a>
         </div>
+        <a href="@helpers.url(repository)/tree/@helpers.encodeRefName((latestCommit.id :: pathList).mkString("/"))" data-hotkey="y" style="display: none;">Transfer to URL with SHA</a>
       </div>
       @if(pathList.isEmpty){
         <div class="pull-right pc" style="margin-right: 5px;">
@@ -44,7 +45,6 @@
             @if(context.platform != "linux" && context.platform != null){
               <a href="@RepositoryService.openRepoUrl(repository.httpUrl)" id="repository-clone-url" class="btn btn-sm btn-default"><i class="octicon octicon-desktop-download"></i></a>
             }
-            <a href="@{helpers.url(repository)}/archive/@{helpers.encodeRefName(branch)}.zip" class="btn btn-sm btn-default"><i class="octicon octicon-cloud-download"></i> Download ZIP</a>
           </div>
         </div>
         <div class="pull-right pc">
@@ -116,7 +116,7 @@
             </div>
             <div class="author-info">
               <div class="author">
-                @helpers.avatar(latestCommit, 20)
+                @helpers.avatarLink(latestCommit, 20)
                 <span>@helpers.user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")</span>
                 <span class="muted"> authored @gitbucket.core.helper.html.datetimeago(latestCommit.authorTime)</span>
               </div>

src/main/twirl/gitbucket/core/repo/find.scala.html

@@ -10,7 +10,7 @@
   <div class="find-input">
     <span class="bold"><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a></span>
     /
-    <input type="text" name="query" autocomplete="off" spellcheck="false" autofocus id="tree-finder-field" />
+    <input type="text" name="query" class="form-control" style="display: inline; width: 300px;" autocomplete="off" spellcheck="false" autofocus id="tree-finder-field" />
   </div>
 </div>