Merge pull request #2138 from gitbucket/gitbucket-4.28.0

GitBucket 4.28.0 release

CHANGELOG.md

@@ -1,8 +1,26 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+### 4.28.0 - 1 Sep 2018
+- Proxy support for plugin installation
+- Fix some bugs around pull requests
+
+### 4.27.0 - 29 Jul 2018
+- Create new tag on the browser
+- EditorConfig support
+- Improve issues / pull requests search
+- Some improvements and bug fixes for plugin installation via internet and pull request commenting
+
+### 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 improvement
+- Security improvements
 - Show mail address at the profile page
 - Task list on commit comments
 - More detailed editing history of issues and pull requests

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) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
+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://img.shields.io/maven-central/v/io.github.gitbucket/gitbucket_2.12.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,14 +68,11 @@ 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.25.x
+What's New in 4.27.x
 -------------
-### 4.25.0 - 29 May 2018
-- Security improvement
-- 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.28.0 - 1 Sep 2018
+- Proxy support for plugin installation
+- Fix some bugs around pull requests
+
 
 See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -3,12 +3,13 @@ import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.25.0"
-val ScalatraVersion = "2.6.1"
-val JettyVersion = "9.4.7.v20170914"
+val GitBucketVersion = "4.28.0"
+val ScalatraVersion = "2.6.3"
+val JettyVersion = "9.4.11.v20180605"
+val JgitVersion = "5.0.1.201806211838-r"
 
 lazy val root = (project in file("."))
-  .enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin)
+  .enablePlugins(SbtTwirl, ScalatraPlugin)
   .settings(
     )
 
@@ -30,8 +31,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % "4.11.0.201803080745-r",
-  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % "4.11.0.201803080745-r",
+  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
+  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
   "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
@@ -47,8 +48,8 @@ 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.4",
-  "org.postgresql"                  % "postgresql"                   % "42.1.4",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.2.6",
+  "org.postgresql"                  % "postgresql"                   % "42.2.4",
   "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
   "com.zaxxer"                      % "HikariCP"                     % "2.7.4",
   "com.typesafe"                    % "config"                       % "1.3.2",
@@ -68,7 +69,8 @@ libraryDependencies ++= Seq(
   "com.wix"                         % "wix-embedded-mysql"           % "3.0.0" % "test",
   "ru.yandex.qatools.embed"         % "postgresql-embedded"          % "2.6" % "test",
   "net.i2p.crypto"                  % "eddsa"                        % "0.2.0",
-  "is.tagomor.woothee"              % "woothee-java"                 % "1.7.0"
+  "is.tagomor.woothee"              % "woothee-java"                 % "1.7.0",
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.1"
 )
 
 // Compiler settings
@@ -96,21 +98,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 {
@@ -170,12 +157,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")
-  PluginsJson.getUrls(json).foreach { url =>
-    log info s"Download: ${url}"
-    IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
+  val plugins = IO readLines (Keys.baseDirectory.value / "src" / "main" / "resources" / "bundle-plugins.txt")
+  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/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.15.0",
-        "range": ">=4.25.0",
-        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.15.0/gitbucket-gist-plugin-gitbucket_4.25.0-4.15.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.5
+sbt.version=1.2.0

project/plugins.sbt

@@ -3,8 +3,6 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 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.27.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="COMMIT_COMMENT">
+    <column name="ORIGINAL_COMMIT_ID" type="varchar(100)" nullable="true"/>
+    <column name="ORIGINAL_OLD_LINE" type="int" nullable="true"/>
+    <column name="ORIGINAL_NEW_LINE" type="int" nullable="true"/>
+  </addColumn>
+  <update tableName="COMMIT_COMMENT">
+    <column name="ORIGINAL_COMMIT_ID" valueComputed="COMMIT_ID"/>
+    <column name="ORIGINAL_OLD_LINE" valueComputed="OLD_LINE_NUMBER"/>
+    <column name="ORIGINAL_NEW_LINE" valueComputed="NEW_LINE_NUMBER"/>
+  </update>
+  <addNotNullConstraint columnName="ORIGINAL_COMMIT_ID" tableName="COMMIT_COMMENT" columnDataType="varchar(100)"/>
+</changeSet>

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

@@ -54,5 +54,8 @@ object GitBucketCoreModule
       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.25.0", new LiquibaseMigration("update/gitbucket-core_4.25.xml")),
+      new Version("4.26.0"),
+      new Version("4.27.0", new LiquibaseMigration("update/gitbucket-core_4.27.xml")),
+      new Version("4.28.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

@@ -713,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

@@ -811,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

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

@@ -72,7 +72,7 @@ abstract class ControllerBase
         super.doFilter(request, response, chain)
       }
     } finally {
-      contextCache.remove();
+      contextCache.remove()
     }
 
   private val contextCache = new java.lang.ThreadLocal[Context]()
@@ -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,12 +326,12 @@ 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 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) {

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

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

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

@@ -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,
-          getUserRepositories(account.userName, withoutPhysicalInfo = true),
+          getVisibleRepositories(Some(account), 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
         )
       }
@@ -239,9 +237,19 @@ trait IndexControllerBase extends ControllerBase {
         }
 
         target.toLowerCase match {
-          case "issue" =>
+          case "issues" =>
             gitbucket.core.search.html.issues(
-              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query) else Nil,
+              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
+              false,
+              query,
+              page,
+              repository
+            )
+
+          case "pulls" =>
+            gitbucket.core.search.html.issues(
+              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
+              true,
               query,
               page,
               repository
@@ -273,18 +281,7 @@ trait IndexControllerBase extends ControllerBase {
     val repositories = visibleRepositories.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }
-    context.loginAccount
-      .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)
-      }
+    gitbucket.core.search.html.repositories(query, repositories, visibleRepositories)
   }
 
 }

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

@@ -406,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.
-   *
-   * <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
+   * Provides GitHub compatible URLs (e.g. http://localhost:8080/owner/repo.git) for Git client.
    */
   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

@@ -352,8 +352,17 @@ trait PullRequestsControllerBase extends ControllerBase {
 
                   // close issue by commit message
                   if (pullreq.requestBranch == repository.repository.defaultBranch) {
-                    commits.map { commit =>
-                      closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
+                    commits.foreach { commit =>
+                      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)
+                              )
+                          }
+                      }
                     }
                   }
 
@@ -458,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
-                      )
-                      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))
+                        }
+                      }
+                      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)
@@ -613,7 +642,7 @@ trait PullRequestsControllerBase extends ControllerBase {
                   case _ =>
                     forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
                 }).map { repository =>
-                  (repository.userName, repository.repositoryName)
+                  (repository.userName, repository.repositoryName, repository.defaultBranch)
                 },
                 commits.flatten
                   .map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false))
@@ -714,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 =>
@@ -752,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,
@@ -759,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)
-      .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+      .filter { x =>
+        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,7 +79,7 @@ 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), FileUtil.checkFilename(tagName + "/" + fileId))
       )
     }).getOrElse(NotFound())

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

@@ -26,6 +26,7 @@ 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
 import org.eclipse.jgit.api.{ArchiveCommand, Git}
 import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
 import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
@@ -116,6 +117,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     diff: Option[String]
   )
 
+  case class TagForm(
+    commitId: String,
+    tagName: String,
+    message: Option[String]
+  )
+
   val uploadForm = mapping(
     "branch" -> trim(label("Branch", text(required))),
     "path" -> trim(label("Path", text())),
@@ -152,6 +159,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "diff" -> optional(text())
   )(CommentForm.apply)
 
+  val tagForm = mapping(
+    "commitId" -> trim(label("Commit id", text(required))),
+    "tagName" -> trim(label("Tag name", text(required))),
+    "message" -> trim(label("Message", optional(text())))
+  )(TagForm.apply)
+
   /**
    * Returns converted HTML from Markdown for preview.
    */
@@ -330,17 +343,23 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
 
-        getPathObjectId(git, path, revCommit).map { objectId =>
-          val paths = path.split("/")
-          html.editor(
-            branch = branch,
-            repository = repository,
-            pathList = paths.take(paths.size - 1).toList,
-            fileName = Some(paths.last),
-            content = JGitUtil.getContentInfo(git, path, objectId),
-            protectedBranch = protectedBranch,
-            commit = revCommit.getName
-          )
+        getPathObjectId(git, path, revCommit).map {
+          objectId =>
+            val paths = path.split("/")
+            val info = EditorConfigUtil.getEditorConfigInfo(git, branch, path)
+
+            html.editor(
+              branch = branch,
+              repository = repository,
+              pathList = paths.take(paths.size - 1).toList,
+              fileName = Some(paths.last),
+              content = JGitUtil.getContentInfo(git, path, objectId),
+              protectedBranch = protectedBranch,
+              commit = revCommit.getName,
+              newLineMode = info.newLineMode,
+              useSoftTabs = info.useSoftTabs,
+              tabSize = info.tabSize
+            )
         } getOrElse NotFound()
     }
   })
@@ -420,8 +439,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       commit = form.commit
     )
 
+    println(form.path)
+
     redirect(
-      s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) "" else form.path}"
+      s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) "" else "/" + form.path}"
     )
   })
 
@@ -451,6 +472,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
               // Download (This route is left for backword compatibility)
               responseRawFile(git, objectId, path, repository)
             } else {
+              val info = EditorConfigUtil.getEditorConfigInfo(git, id, path)
               html.blob(
                 branch = id,
                 repository = repository,
@@ -459,7 +481,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                 latestCommit = new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
                 hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
                 isBlame = request.paths(2) == "blame",
-                isLfsFile = isLfsFile(git, objectId)
+                isLfsFile = isLfsFile(git, objectId),
+                tabSize = info.tabSize
               )
             }
         } getOrElse NotFound()
@@ -531,7 +554,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                 repository,
                 diffs,
                 oldCommitId,
-                hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+                hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+                flash.get("info"),
+                flash.get("error")
               )
           }
       }
@@ -628,7 +653,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       newLineNumber,
       issueId,
       hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-      repository = repository
+      repository = repository,
+      focus = true
     )
   })
 
@@ -779,6 +805,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     html.branches(branches, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
   })
 
+  /**
+   * Displays the create tag dialog.
+   */
+  get("/:owner/:repository/tag/:id")(writableUsersOnly { repository =>
+    html.tag(params("id"), repository)
+  })
+
+  /**
+   * Creates a tag.
+   */
+  post("/:owner/:repository/tag", tagForm)(writableUsersOnly { (form, repository) =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      JGitUtil.createTag(git, form.tagName, form.message, form.commitId)
+    } match {
+      case Right(message) =>
+        flash += "info" -> message
+        redirect(s"/${repository.owner}/${repository.name}/commit/${form.commitId}")
+      case Left(message) =>
+        flash += "error" -> message
+        redirect(s"/${repository.owner}/${repository.name}/commit/${form.commitId}")
+    }
+  })
+
   /**
    * Creates a branch.
    */
@@ -821,32 +870,15 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     redirect(s"${repository.owner}/${repository.name}/releases")
   })
 
-  /**
-   * Download repository contents as an archive as compatible URL.
-   */
-  get("/:owner/:repository/archive/:branch.:suffix")(referrersOnly { repository =>
-    val branch = params("branch")
-    val suffix = params("suffix")
-    archiveRepository(branch, branch + "." + suffix, repository, "")
-  })
-
-  /**
-   * Download all repository contents as an archive.
-   */
-  get("/:owner/:repository/archive/:branch/:name")(referrersOnly { repository =>
-    val branch = params("branch")
+  get("/:owner/:repository/archive/:name")(referrersOnly { repository =>
     val name = params("name")
-    archiveRepository(branch, name, repository, "")
+    archiveRepository(name, repository, "")
   })
 
-  /**
-   * Download repositories subtree contents as an archive.
-   */
-  get("/:owner/:repository/archive/:branch/*/:name")(referrersOnly { repository =>
-    val branch = params("branch")
+  get("/:owner/:repository/archive/*/:name")(referrersOnly { repository =>
     val name = params("name")
     val path = multiParams("splat").head
-    archiveRepository(branch, name, repository, path)
+    archiveRepository(name, repository, path)
   })
 
   get("/:owner/:repository/network/members")(referrersOnly { repository =>
@@ -1040,7 +1072,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
@@ -1134,13 +1173,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
 
-  def archiveRepository(
-    revision: String,
+  private def archiveRepository(
     filename: String,
     repository: RepositoryService.RepositoryInfo,
     path: String
   ) = {
-    def archive(archiveFormat: String, archive: ArchiveOutputStream)(
+    def archive(revision: String, archiveFormat: String, archive: ArchiveOutputStream)(
       entryCreator: (String, Long, Int) => ArchiveEntry
     ): Unit = {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
@@ -1176,20 +1214,21 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       }
     }
 
-    val suffix = path.split("/").lastOption.map("-" + _).getOrElse("")
+    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) =>
+      case zipRe(revision) =>
         response.setHeader(
           "Content-Disposition",
-          s"attachment; filename=${repository.name}-${branch}${suffix}.zip"
+          s"attachment; filename=${repository.name}-${revision}${suffix}.zip"
         )
         contentType = "application/octet-stream"
-        response.setBufferSize(1024 * 1024);
+        response.setBufferSize(1024 * 1024)
         using(new ZipArchiveOutputStream(response.getOutputStream)) { zip =>
-          archive(".zip", zip) { (path, size, mode) =>
+          archive(revision, ".zip", zip) { (path, size, mode) =>
             val entry = new ZipArchiveEntry(path)
             entry.setSize(size)
             entry.setUnixMode(mode)
@@ -1197,10 +1236,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           }
         }
         ()
-      case tarRe(branch, compressor) =>
+      case tarRe(revision, compressor) =>
         response.setHeader(
           "Content-Disposition",
-          s"attachment; filename=${repository.name}-${branch}${suffix}.tar.${compressor}"
+          s"attachment; filename=${repository.name}-${revision}${suffix}.tar.${compressor}"
         )
         contentType = "application/octet-stream"
         response.setBufferSize(1024 * 1024)
@@ -1213,7 +1252,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             tar.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR)
             tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU)
             tar.setAddPaxHeadersForNonAsciiNames(true)
-            archive(".tar.gz", tar) { (path, size, mode) =>
+            archive(revision, ".tar.gz", tar) { (path, size, mode) =>
               val entry = new TarArchiveEntry(path)
               entry.setSize(size)
               entry.setMode(mode)
@@ -1223,7 +1262,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         }
         ()
       case _ =>
-        BadRequest()
+        NotFound()
     }
   }
 

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

@@ -45,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())),
-    "sshHost" -> trim(label("SSH host", optional(text()))),
-    "sshPort" -> trim(label("SSH port", optional(number()))),
+    "ssh" -> mapping(
+      "enabled" -> trim(label("SSH access", boolean())),
+      "host" -> trim(label("SSH host", optional(text()))),
+      "port" -> trim(label("SSH port", optional(number()))),
+    )(Ssh.apply),
     "useSMTP" -> trim(label("SMTP", boolean())),
     "smtp" -> optionalIfNotChecked(
       "useSMTP",
@@ -91,13 +93,23 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       )(OIDC.apply)
     ),
     "skinName" -> trim(label("AdminLTE skin name", text(required))),
-    "showMailAddress" -> trim(label("Show mail address", boolean()))
+    "showMailAddress" -> trim(label("Show mail address", boolean())),
+    "pluginNetworkInstall" -> trim(label("Network plugin installation", boolean())),
+    "proxy" -> optionalIfNotChecked(
+      "useProxy",
+      mapping(
+        "host" -> trim(label("Proxy host", text(required))),
+        "port" -> trim(label("Proxy port", number())),
+        "user" -> trim(label("Keystore", optional(text()))),
+        "password" -> trim(label("Keystore", optional(text())))
+      )(Proxy.apply)
+    )
   )(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
@@ -315,42 +327,61 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
     } catch {
       case e: EmailException => s"[Error] ${e.getCause}"
-      case e: Exception      => "[Error] " + e.toString
+      case e: Exception      => s"[Error] ${e.toString}"
     }
   })
 
   get("/admin/plugins")(adminOnly {
     // Installed plugins
     val enabledPlugins = PluginRegistry().getPlugins()
+    val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
+    val gitbucketSemver = Semver.valueOf(gitbucketVersion)
 
-    val gitbucketVersion = Semver.valueOf(GitBucketCoreModule.getVersions.asScala.last.getVersion)
-
-    // Plugins in the local repository
-    val repositoryPlugins = PluginRepository
-      .getPlugins()
-      .filterNot { meta =>
-        enabledPlugins.exists { plugin =>
-          plugin.pluginId == meta.id &&
-          Semver.valueOf(plugin.pluginVersion).greaterThanOrEqualTo(Semver.valueOf(meta.latestVersion.version))
+    // Plugins in the remote repository
+    val repositoryPlugins = if (context.settings.pluginNetworkInstall) {
+      PluginRepository
+        .getPlugins()
+        .map {
+          meta =>
+            (meta, meta.versions.reverse.find {
+              version =>
+                val semver = Semver.valueOf(version.version)
+                gitbucketVersion == version.gitbucketVersion && !enabledPlugins.exists { plugin =>
+                  if (plugin.pluginId == meta.id) {
+                    Semver.valueOf(plugin.pluginVersion) match {
+                      case x if x.greaterThan(semver) => true
+                      case x if x.equals(semver) =>
+                        plugin.gitbucketVersion match {
+                          case None    => true
+                          case Some(x) => Semver.valueOf(x).greaterThanOrEqualTo(gitbucketSemver)
+                        }
+                      case _ => false
+                    }
+                  } else false
+                }
+            })
         }
-      }
-      .map { meta =>
-        (meta, meta.versions.reverse.find { version =>
-          gitbucketVersion.satisfies(version.range)
-        })
-      }
-      .collect {
-        case (meta, Some(version)) =>
-          new PluginInfoBase(
-            pluginId = meta.id,
-            pluginName = meta.name,
-            pluginVersion = version.version,
-            description = meta.description
-          )
-      }
+        .collect {
+          case (meta, Some(version)) =>
+            new PluginInfoBase(
+              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"))
   })
@@ -361,40 +392,45 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     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()
-      .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."
-      }
+
+    if (PluginRegistry().getPlugins().exists(_.pluginId == pluginId)) {
+      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 {
-    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}"),
-              request.getServletContext,
-              loadSystemSettings(),
-              request2Session(request).conn
-            )
-            flash += "info" -> s"${pluginId} was installed."
-          }
-      }
+    if (context.settings.pluginNetworkInstall) {
+      val pluginId = params("pluginId")
+      val version = params("version")
+      val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
+
+      PluginRepository
+        .getPlugins()
+        .collectFirst {
+          case meta if meta.id == pluginId =>
+            (meta, meta.versions.find(x => x.gitbucketVersion == gitbucketVersion && x.version == version))
+        }
+        .foreach {
+          case (meta, version) =>
+            version.foreach { version =>
+              PluginRegistry.install(
+                pluginId,
+                new java.net.URL(version.url),
+                request.getServletContext,
+                loadSystemSettings(),
+                request2Session(request).conn
+              )
+              flash += "info" -> s"${pluginId}:${version.version} was installed."
+            }
+        }
+    }
+
     redirect("/admin/plugins")
   })
 

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/Comment.scala

@@ -54,6 +54,9 @@ trait CommitCommentComponent extends TemplateComponent { self: Profile =>
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     val issueId = column[Option[Int]]("ISSUE_ID")
+    val originalCommitId = column[String]("ORIGINAL_COMMIT_ID")
+    val originalOldLine = column[Option[Int]]("ORIGINAL_OLD_LINE")
+    val originalNewLine = column[Option[Int]]("ORIGINAL_NEW_LINE")
     def * =
       (
         userName,
@@ -67,7 +70,10 @@ trait CommitCommentComponent extends TemplateComponent { self: Profile =>
         newLine,
         registeredDate,
         updatedDate,
-        issueId
+        issueId,
+        originalCommitId,
+        originalOldLine,
+        originalNewLine
       ) <> (CommitComment.tupled, CommitComment.unapply)
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
@@ -86,7 +92,10 @@ case class CommitComment(
   newLine: Option[Int],
   registeredDate: java.util.Date,
   updatedDate: java.util.Date,
-  issueId: Option[Int]
+  issueId: Option[Int],
+  originalCommitId: String,
+  originalOldLine: Option[Int],
+  originalNewLine: Option[Int]
 ) extends Comment
 
 case class CommitComments(

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 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
@@ -18,10 +18,12 @@ import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.DatabaseConfig
 import gitbucket.core.util.Directory._
+import gitbucket.core.util.HttpClientUtil._
 import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
 import org.apache.commons.io.FileUtils
+import org.apache.http.client.methods.HttpGet
 import org.apache.sshd.server.Command
 import org.slf4j.LoggerFactory
 import play.twirl.api.Html
@@ -202,7 +204,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 +224,48 @@ 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()
-          instance = new PluginRegistry()
-          initialize(context, settings, conn)
-        }
+      shutdown(context, settings)
+
+      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())
+
+      withHttpClient(settings.pluginProxy) { httpClient =>
+        val httpGet = new HttpGet(url.toString)
+        try {
+          val response = httpClient.execute(httpGet)
+          val in = response.getEntity.getContent
+          FileUtils.copyToFile(in, new File(PluginHome, new File(url.getFile).getName))
+        } finally {
+          httpGet.releaseConnection()
+        }
+      }
+
       instance = new PluginRegistry()
       initialize(context, settings, conn)
     }
@@ -257,12 +276,33 @@ 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+(-SNAPSHOT)?)-.+".r
+    pluginJarFileName match {
+      case regex(all, _) => Some(all)
+      case _             => None
+    }
+  }
+
+  def getPluginVersion(pluginJarFileName: String): String = {
+    val regex = ".+-((\\d+)\\.(\\d+)(\\.(\\d+))?(-SNAPSHOT)?)\\.jar$".r
+    pluginJarFileName match {
+      case regex(all, major, minor, _, patch, modifier) => {
+        if (patch != null) all
+        else {
+          s"${major}.${minor}.0" + (if (modifier == null) "" else modifier)
+        }
+      }
+      case _ => "0.0.0"
+    }
+  }
+
   /**
    * Initializes all installed plugins.
    */
@@ -278,6 +318,7 @@ object PluginRegistry {
     installedDir.mkdirs()
 
     val pluginJars = listPluginJars(pluginDir)
+
     val extraJars = extraPluginDir
       .map { extraDir =>
         listPluginJars(new File(extraDir))
@@ -288,9 +329,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 +345,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 +369,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 +431,7 @@ class PluginInfoBase(
   val pluginId: String,
   val pluginName: String,
   val pluginVersion: String,
+  val gitbucketVersion: Option[String],
   val description: String
 )
 
@@ -391,11 +439,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,25 +1,44 @@
 package gitbucket.core.plugin
 
+import gitbucket.core.controller.Context
+import gitbucket.core.util.SyntaxSugars.using
+import gitbucket.core.util.HttpClientUtil._
 import org.json4s._
-import gitbucket.core.util.Directory._
-import org.apache.commons.io.FileUtils
+import org.apache.commons.io.IOUtils
+
+import org.apache.http.client.methods.HttpGet
+import org.slf4j.LoggerFactory
 
 object PluginRepository {
+  private val logger = LoggerFactory.getLogger(getClass)
   implicit val formats = DefaultFormats
 
   def parsePluginJson(json: String): Seq[PluginMetadata] = {
     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()(implicit context: Context): Seq[PluginMetadata] = {
+    try {
+      val url = new java.net.URL("https://plugins.gitbucket-community.org/releases/plugins.json")
 
-  def getPlugins(): Seq[PluginMetadata] = {
-    if (LocalRepositoryIndexFile.exists) {
-      parsePluginJson(FileUtils.readFileToString(LocalRepositoryIndexFile, "UTF-8"))
-    } else Nil
+      withHttpClient(context.settings.pluginProxy) { httpClient =>
+        val httpGet = new HttpGet(url.toString)
+        try {
+          val response = httpClient.execute(httpGet)
+          using(response.getEntity.getContent) { in =>
+            val str = IOUtils.toString(in, "UTF-8")
+            parsePluginJson(str)
+          }
+        } finally {
+          httpGet.releaseConnection()
+        }
+      }
+    } catch {
+      case t: Throwable =>
+        logger.warn("Failed to access to the plugin repository: " + t.toString)
+        Nil
+    }
   }
-
 }
 
 // Mapped from plugins.json
@@ -36,7 +55,5 @@ case class PluginMetadata(
 case class VersionDef(
   version: String,
   url: String,
-  range: String
-) {
-  lazy val file = url.substring(url.lastIndexOf("/") + 1)
-}
+  gitbucketVersion: String
+)

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

@@ -49,7 +49,10 @@ trait CommitsService {
       newLine = newLine,
       registeredDate = currentDate,
       updatedDate = currentDate,
-      issueId = issueId
+      issueId = issueId,
+      originalCommitId = commitId,
+      originalOldLine = oldLine,
+      originalNewLine = newLine
     )
 
   def updateCommitCommentPosition(commentId: Int, commitId: String, oldLine: Option[Int], newLine: Option[Int])(

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 =>
@@ -350,9 +351,11 @@ trait IssuesService {
     implicit s: Session
   ) =
     Issues filter { t1 =>
-      repos
-        .map { case (owner, repository) => t1.byRepository(owner, repository) }
-        .foldLeft[Rep[Boolean]](false)(_ || _) &&
+      (if (repos.size == 1) {
+         t1.byRepository(repos.head._1, repos.head._2)
+       } else {
+         ((t1.userName ++ "/" ++ t1.repositoryName) inSetBind (repos.map { case (owner, repo) => s"$owner/$repo" }))
+       }) &&
       (t1.closed === (condition.state == "closed").bind) &&
       (t1.milestoneId.? isEmpty, condition.milestone == Some(None)) &&
       (t1.priorityId.? isEmpty, condition.priority == Some(None)) &&
@@ -511,20 +514,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"),
-        content = s"${oldAssigned}:${assigned}",
+        commentedUserName = assigner.getOrElse("Unknown user"),
+        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))
@@ -625,7 +632,7 @@ trait IssuesService {
    * @param query the keywords separated by whitespace.
    * @return issues with comment count and matched content of issue or comment
    */
-  def searchIssuesByKeyword(owner: String, repository: String, query: String)(
+  def searchIssuesByKeyword(owner: String, repository: String, query: String, pullRequest: Boolean)(
     implicit s: Session
   ): List[(Issue, Int, String)] = {
     //import slick.driver.JdbcDriver.likeEncode
@@ -633,7 +640,9 @@ trait IssuesService {
 
     // Search Issue
     val issues = Issues
-      .filter(_.byRepository(owner, repository))
+      .filter { t =>
+        t.byRepository(owner, repository) && t.pullRequest === pullRequest.bind
+      }
       .join(IssueOutline)
       .on {
         case (t1, t2) =>
@@ -668,11 +677,12 @@ trait IssuesService {
       }
       .filter {
         case ((t1, t2), t3) =>
-          keywords
-            .map { query =>
-              t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
-            }
-            .reduceLeft(_ && _)
+          t2.pullRequest === pullRequest.bind &&
+            keywords
+              .map { query =>
+                t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
+              }
+              .reduceLeft(_ && _)
       }
       .map {
         case ((t1, t2), t3) =>
@@ -683,7 +693,7 @@ trait IssuesService {
       .union(comments)
       .sortBy {
         case (issue, commentId, _, _) =>
-          issue.issueId -> commentId
+          issue.issueId.desc -> commentId
       }
       .list
       .splitWith {

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

@@ -181,9 +181,9 @@ trait PullRequestService { self: IssuesService with CommitsService =>
         // Collect comment positions
         val positions = getCommitComments(pullreq.userName, pullreq.repositoryName, pullreq.commitIdTo, true)
           .collect {
-            case CommitComment(_, _, _, commentId, _, _, Some(file), None, Some(newLine), _, _, _) =>
+            case CommitComment(_, _, _, commentId, _, _, Some(file), None, Some(newLine), _, _, _, _, _, _) =>
               (file, commentId, Right(newLine))
-            case CommitComment(_, _, _, commentId, _, _, Some(file), Some(oldLine), None, _, _, _) =>
+            case CommitComment(_, _, _, commentId, _, _, Some(file), Some(oldLine), None, _, _, _, _, _, _) =>
               (file, commentId, Left(oldLine))
           }
           .groupBy { case (file, _, _) => file }
@@ -348,7 +348,7 @@ trait PullRequestService { self: IssuesService with CommitsService =>
       .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: CommitComment                       => (None, x.fileName, x.originalOldLine, x.originalNewLine)
         case x                                      => throw new MatchError(x)
       }
       .toSeq
@@ -366,7 +366,7 @@ trait PullRequestService { self: IssuesService with CommitsService =>
             diff = loadCommitCommentDiff(
               userName,
               repositoryName,
-              comments.head.asInstanceOf[CommitComment].commitId,
+              comments.head.asInstanceOf[CommitComment].originalCommitId,
               fileName,
               oldLine,
               newLine

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

@@ -14,18 +14,21 @@ import gitbucket.core.model.Profile.profile.blockingApi._
 trait RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._
 
-  def countIssues(owner: String, repository: String, query: String)(implicit session: Session): Int =
-    searchIssuesByKeyword(owner, repository, query).length
+  def countIssues(owner: String, repository: String, query: String, pullRequest: Boolean)(
+    implicit session: Session
+  ): Int =
+    searchIssuesByKeyword(owner, repository, query, pullRequest).length
 
-  def searchIssues(owner: String, repository: String, query: String)(
+  def searchIssues(owner: String, repository: String, query: String, pullRequest: Boolean)(
     implicit session: Session
   ): List[IssueSearchResult] =
-    searchIssuesByKeyword(owner, repository, query).map {
+    searchIssuesByKeyword(owner, repository, query, pullRequest).map {
       case (issue, commentCount, content) =>
         IssueSearchResult(
           issue.issueId,
           issue.isPullRequest,
           issue.title,
+          issue.closed,
           issue.openedUserName,
           issue.registeredDate,
           commentCount,
@@ -142,6 +145,7 @@ object RepositorySearchService {
     issueId: Int,
     isPullRequest: Boolean,
     title: String,
+    isClosed: Boolean,
     openedUserName: String,
     registeredDate: java.util.Date,
     commentCount: Int,

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
@@ -371,6 +371,10 @@ trait RepositoryService { self: AccountService =>
       .list
   }
 
+  /**
+   * Returns the list of repositories which are owned by the specified user.
+   * This list includes group repositories if the specified user is a member of the group.
+   */
   def getUserRepositories(userName: String, withoutPhysicalInfo: Boolean = false)(
     implicit s: Session
   ): List[RepositoryInfo] = {
@@ -388,29 +392,7 @@ trait RepositoryService { self: AccountService =>
       }
       .sortBy(_.lastActivityDate desc)
       .list
-      .map { repository =>
-        new RepositoryInfo(
-          if (withoutPhysicalInfo) {
-            new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName)
-          } else {
-            JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName)
-          },
-          repository,
-          if (withoutPhysicalInfo) {
-            -1
-          } else {
-            getForkedCount(
-              repository.originUserName.getOrElse(repository.userName),
-              repository.originRepositoryName.getOrElse(repository.repositoryName)
-            )
-          },
-          if (withoutPhysicalInfo) {
-            Nil
-          } else {
-            getRepositoryManagers(repository.userName, repository.repositoryName)
-          }
-        )
-      }
+      .map(createRepositoryInfo(_, withoutPhysicalInfo))
   }
 
   /**
@@ -466,40 +448,45 @@ trait RepositoryService { self: AccountService =>
       }
       .sortBy(_.lastActivityDate desc)
       .list
-      .map { repository =>
-        new RepositoryInfo(
-          if (withoutPhysicalInfo) {
-            new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName)
-          } else {
-            JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName)
-          },
-          repository,
-          if (withoutPhysicalInfo) {
-            -1
-          } else {
-            getForkedCount(
-              repository.originUserName.getOrElse(repository.userName),
-              repository.originRepositoryName.getOrElse(repository.repositoryName)
-            )
-          },
-          if (withoutPhysicalInfo) {
-            Nil
-          } else {
-            getRepositoryManagers(repository.userName, repository.repositoryName)
-          }
+      .map(createRepositoryInfo(_, withoutPhysicalInfo))
+  }
+
+  private def createRepositoryInfo(repository: Repository, withoutPhysicalInfo: Boolean = false)(
+    implicit s: Session
+  ): RepositoryInfo = {
+    new RepositoryInfo(
+      if (withoutPhysicalInfo) {
+        new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName)
+      } else {
+        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName)
+      },
+      repository,
+      if (withoutPhysicalInfo) {
+        -1
+      } else {
+        getForkedCount(
+          repository.originUserName.getOrElse(repository.userName),
+          repository.originRepositoryName.getOrElse(repository.repositoryName)
         )
+      },
+      if (withoutPhysicalInfo) {
+        Nil
+      } else {
+        getRepositoryManagers(repository.userName, repository.repositoryName)
       }
+    )
   }
 
   /**
    * 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))
+  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))
+  }
 
   /**
    * Updates the last activity date of the repository.
@@ -772,7 +759,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)
-      settings.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
-      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
+      props.setProperty(SshEnabled, settings.ssh.enabled.toString)
+      settings.ssh.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
+      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,17 +58,29 @@ 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)
+      settings.pluginProxy.foreach { proxy =>
+        props.setProperty(PluginProxyHost, proxy.host)
+        props.setProperty(PluginProxyPort, proxy.port.toString)
+        proxy.user.foreach { user =>
+          props.setProperty(PluginProxyUser, user)
+        }
+        proxy.password.foreach { password =>
+          props.setProperty(PluginProxyPassword, password)
+        }
+      }
+
       using(new java.io.FileOutputStream(GitBucketConf)) { out =>
         props.store(out, null)
       }
@@ -91,9 +103,11 @@ trait SystemSettingsService {
         getValue(props, Gravatar, false),
         getValue(props, Notification, false),
         getOptionValue[Int](props, ActivityLogLimit, None),
-        getValue(props, Ssh, false),
-        getOptionValue[String](props, SshHost, None).map(_.trim),
-        getOptionValue(props, SshPort, Some(DefaultSshPort)),
+        Ssh(
+          getValue(props, SshEnabled, false),
+          getOptionValue[String](props, SshHost, None).map(_.trim),
+          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(
@@ -108,9 +122,7 @@ trait SystemSettingsService {
               getOptionValue(props, SmtpFromName, None)
             )
           )
-        } else {
-          None
-        },
+        } else None,
         getValue(props, LdapAuthentication, false),
         if (getValue(props, LdapAuthentication, false)) {
           Some(
@@ -129,9 +141,7 @@ trait SystemSettingsService {
               getOptionValue(props, LdapKeystore, None)
             )
           )
-        } else {
-          None
-        },
+        } else None,
         getValue(props, OidcAuthentication, false),
         if (getValue(props, OidcAuthentication, false)) {
           Some(
@@ -146,7 +156,18 @@ trait SystemSettingsService {
           None
         },
         getValue(props, SkinName, "skin-blue"),
-        getValue(props, ShowMailAddress, false)
+        getValue(props, ShowMailAddress, false),
+        getValue(props, PluginNetworkInstall, false),
+        if (getValue(props, PluginProxyHost, "").nonEmpty) {
+          Some(
+            Proxy(
+              getValue(props, PluginProxyHost, ""),
+              getValue(props, PluginProxyPort, 8080),
+              getOptionValue(props, PluginProxyUser, None),
+              getOptionValue(props, PluginProxyPassword, None)
+            )
+          )
+        } else None
       )
     }
   }
@@ -167,9 +188,7 @@ object SystemSettingsService {
     gravatar: Boolean,
     notification: Boolean,
     activityLogLimit: Option[Int],
-    ssh: Boolean,
-    sshHost: Option[String],
-    sshPort: Option[Int],
+    ssh: Ssh,
     useSMTP: Boolean,
     smtp: Option[Smtp],
     ldapAuthentication: Boolean,
@@ -177,7 +196,9 @@ object SystemSettingsService {
     oidcAuthentication: Boolean,
     oidc: Option[OIDC],
     skinName: String,
-    showMailAddress: Boolean
+    showMailAddress: Boolean,
+    pluginNetworkInstall: Boolean,
+    pluginProxy: Option[Proxy]
   ) {
 
     def baseUrl(request: HttpServletRequest): String =
@@ -196,12 +217,18 @@ object SystemSettingsService {
         .fold(base)(_ + base.dropWhile(_ != ':'))
     }
 
-    def sshAddress: Option[SshAddress] = sshHost.collect {
-      case host if ssh =>
-        SshAddress(host, sshPort.getOrElse(DefaultSshPort), "git")
+    def sshAddress: Option[SshAddress] = ssh.sshHost.collect {
+      case host if ssh.enabled =>
+        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],
@@ -239,6 +266,13 @@ object SystemSettingsService {
     fromName: Option[String]
   )
 
+  case class Proxy(
+    host: String,
+    port: Int,
+    user: Option[String],
+    password: Option[String],
+  )
+
   case class SshAddress(host: String, port: Int, genericUser: String)
 
   case class Lfs(serverUrl: Option[String])
@@ -255,7 +289,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"
@@ -287,6 +321,11 @@ object SystemSettingsService {
   private val OidcJwsAlgorithm = "oidc.jws_algorithm"
   private val SkinName = "skinName"
   private val ShowMailAddress = "showMailAddress"
+  private val PluginNetworkInstall = "plugin.networkInstall"
+  private val PluginProxyHost = "plugin.proxy.host"
+  private val PluginProxyPort = "plugin.proxy.port"
+  private val PluginProxyUser = "plugin.proxy.user"
+  private val PluginProxyPassword = "plugin.proxy.password"
 
   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,10 +296,12 @@ 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) {
-                    getAccountByUserName(pusher).map { pusherAccount =>
+                    getAccountByUserName(pusher).foreach { pusherAccount =>
                       closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId =>
-                        getIssue(owner, repository, issueId.toString).map { issue =>
+                        getIssue(owner, repository, issueId.toString).foreach { issue =>
                           callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount)
+                          PluginRegistry().getIssueHooks
+                            .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount))
                         }
                       }
                     }
@@ -316,7 +318,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                     c.id == pull.commitIdTo
                   }.isDefined) {
                 markMergeAndClosePullRequest(pusher, owner, repository, pull)
-                getAccountByUserName(pusher).map { pusherAccount =>
+                getAccountByUserName(pusher).foreach { pusherAccount =>
                   callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, pusherAccount)
                 }
               }
@@ -345,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,
@@ -437,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,40 +135,30 @@ 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)
-          FileUtils.write(PluginRepository.LocalRepositoryIndexFile, pluginsJson, "UTF-8")
+          plugins.asScala.foreach { plugin =>
+            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)) {
-                      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))
-                    }
+                  FileUtils.forceMkdirParent(file)
+                  using(in, new FileOutputStream(file)) {
+                    case (in, out) => IOUtils.copy(in, out)
                   }
-              }
+                }
+              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/EditorConfigUtil.scala

@@ -0,0 +1,146 @@
+package gitbucket.core.util
+
+import java.io.{IOException, InputStreamReader, Reader}
+import java.nio.charset.StandardCharsets
+
+import org.ec4j.core.Resource.Resources.StringRandomReader
+import org.ec4j.core.model.PropertyType.{EndOfLineValue, IndentStyleValue}
+import org.ec4j.core.model.{Ec4jPath, PropertyType, Version}
+import org.ec4j.core.parser.ParseException
+import org.ec4j.core._
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.lib.{ObjectReader, Repository}
+import org.eclipse.jgit.revwalk.{RevTree, RevWalk}
+import org.eclipse.jgit.treewalk.TreeWalk
+import gitbucket.core.util.SyntaxSugars._
+
+object EditorConfigUtil {
+  private class JGitResource(repo: Repository, revStr: String, path: Ec4jPath) extends Resource {
+    private def removeInitialSlash(path: Ec4jPath) = Ec4jPath.Ec4jPaths.root.relativize(path).toString
+
+    def this(git: Git, revStr: String, path: String) = {
+      this(git.getRepository, revStr, Ec4jPath.Ec4jPaths.of(if (path.startsWith("/")) path else "/" + path))
+    }
+
+    def this(repo: Repository, revStr: String, path: String) = {
+      this(repo, revStr, Ec4jPath.Ec4jPaths.of(if (path.startsWith("/")) path else "/" + path))
+    }
+
+    private def getRevTree: RevTree = {
+      using(repo.newObjectReader()) { reader: ObjectReader =>
+        val revWalk = new RevWalk(reader)
+        val id = repo.resolve(revStr)
+        val commit = revWalk.parseCommit(id)
+        commit.getTree
+      }
+    }
+
+    override def exists(): Boolean = {
+      using(repo.newObjectReader()) { reader: ObjectReader =>
+        try {
+          val treeWalk = Option(TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree))
+          treeWalk.isDefined
+        } catch {
+          case e: IOException => false
+        }
+      }
+    }
+
+    override def getPath: Ec4jPath = {
+      path
+    }
+
+    override def getParent: ResourcePath = {
+      Option(path.getParentPath).map { new JGitResourcePath(repo, revStr, _) }.getOrElse(null)
+    }
+
+    override def openRandomReader(): Resource.RandomReader = {
+      StringRandomReader.ofReader(openReader())
+    }
+
+    override def openReader(): Reader = {
+      using(repo.newObjectReader) { reader: ObjectReader =>
+        val treeWalk = TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree)
+        new InputStreamReader(reader.open(treeWalk.getObjectId(0)).openStream, StandardCharsets.UTF_8)
+      }
+    }
+  }
+
+  private class JGitResourcePath(repo: Repository, revStr: String, path: Ec4jPath) extends ResourcePath {
+
+    override def getParent: ResourcePath = {
+      Option(path.getParentPath).map { new JGitResourcePath(repo, revStr, _) }.getOrElse(null)
+    }
+
+    override def getPath: Ec4jPath = {
+      path
+    }
+
+    override def hasParent: Boolean = {
+      Option(path.getParentPath).isDefined
+    }
+
+    override def relativize(resource: Resource): Resource = {
+      resource match {
+        case r: JGitResource =>
+          new JGitResource(repo, revStr, path.relativize(r.getPath).toString)
+      }
+    }
+
+    override def resolve(name: String): Resource = {
+      Option(path)
+        .map { p =>
+          new JGitResource(repo, revStr, p.resolve(name))
+        }
+        .getOrElse {
+          new JGitResource(repo, revStr, name)
+        }
+    }
+  }
+
+  private object JGitResourcePath {
+    def RootDirectory(git: Git, revStr: String) =
+      new JGitResourcePath(git.getRepository, revStr, Ec4jPath.Ec4jPaths.of("/"))
+  }
+
+  private val TabSizeDefault: Int = 8
+  private val NewLineModeDefault: String = "auto"
+  private val UseSoftTabsDefault = false
+
+  case class EditorConfigInfo(
+    tabSize: Int,
+    newLineMode: String,
+    useSoftTabs: Boolean
+  )
+
+  def getEditorConfigInfo(git: Git, rev: String, path: String): EditorConfigInfo = {
+    try {
+      val resourcePropertiesService = ResourcePropertiesService
+        .builder()
+        .configFileName(EditorConfigConstants.EDITORCONFIG)
+        .rootDirectory(JGitResourcePath.RootDirectory(git, rev))
+        .loader(EditorConfigLoader.of(Version.CURRENT))
+        .keepUnset(true)
+        .build()
+
+      val props = resourcePropertiesService.queryProperties(new JGitResource(git, rev, path))
+      EditorConfigInfo(
+        tabSize = props.getValue[Integer](PropertyType.tab_width, TabSizeDefault, false),
+        newLineMode = props.getValue[EndOfLineValue](PropertyType.end_of_line, null, false) match {
+          case EndOfLineValue.cr   => "cr"
+          case EndOfLineValue.lf   => "lf"
+          case EndOfLineValue.crlf => "crlf"
+          case _                   => "auto"
+        },
+        props.getValue[IndentStyleValue](PropertyType.indent_style, null, false) match {
+          case IndentStyleValue.space => true
+          case IndentStyleValue.tab   => false
+          case _                      => false
+        }
+      )
+    } catch {
+      case e: ParseException => EditorConfigInfo(TabSizeDefault, NewLineModeDefault, UseSoftTabsDefault)
+      case e: IOException    => EditorConfigInfo(TabSizeDefault, NewLineModeDefault, UseSoftTabsDefault)
+    }
+  }
+}

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)

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

@@ -0,0 +1,35 @@
+package gitbucket.core.util
+
+import gitbucket.core.service.SystemSettingsService
+import org.apache.http.HttpHost
+import org.apache.http.auth.{AuthScope, UsernamePasswordCredentials}
+import org.apache.http.impl.client.{BasicCredentialsProvider, CloseableHttpClient, HttpClientBuilder}
+
+object HttpClientUtil {
+
+  def withHttpClient[T](proxy: Option[SystemSettingsService.Proxy])(f: CloseableHttpClient => T): T = {
+    val builder = HttpClientBuilder.create.useSystemProperties
+
+    proxy.foreach { proxy =>
+      builder.setProxy(new HttpHost(proxy.host, proxy.port))
+
+      for (user <- proxy.user; password <- proxy.password) {
+        val credential = new BasicCredentialsProvider()
+        credential.setCredentials(
+          new AuthScope(proxy.host, proxy.port),
+          new UsernamePasswordCredentials(user, password)
+        )
+        builder.setDefaultCredentialsProvider(credential)
+      }
+    }
+
+    val httpClient = builder.build()
+
+    try {
+      f(httpClient)
+    } finally {
+      httpClient.close()
+    }
+  }
+
+}

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

@@ -143,6 +143,7 @@ object JDBCUtil {
                       case Types.BOOLEAN | Types.BIT                                   => rs.getBoolean(columnName)
                       case Types.VARCHAR | Types.CLOB | Types.CHAR | Types.LONGVARCHAR => rs.getString(columnName)
                       case Types.INTEGER                                               => rs.getInt(columnName)
+                      case Types.BIGINT                                                => rs.getLong(columnName)
                       case Types.TIMESTAMP                                             => rs.getTimestamp(columnName)
                     }
                   }
@@ -202,8 +203,7 @@ object JDBCUtil {
 
     private def allTablesOrderByDependencies(meta: DatabaseMetaData): Seq[String] = {
       val tables = allTableNames.map { tableName =>
-        val result = TableDependency(tableName, childTables(meta, tableName))
-        result
+        TableDependency(tableName, childTables(meta, tableName))
       }
 
       val edges = tables.flatMap { table =>
@@ -212,7 +212,10 @@ object JDBCUtil {
         }
       }
 
-      tsort(edges).toSeq
+      val ordered = tsort(edges).toSeq
+      val orphans = tables.collect { case x if !ordered.contains(x.tableName) => x.tableName }
+
+      ordered ++ orphans
     }
 
     def tsort[A](edges: Traversable[(A, A)]): Iterable[A] = {

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

@@ -23,12 +23,7 @@ import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
 
 import org.cache2k.Cache2kBuilder
-import org.eclipse.jgit.api.errors.{
-  InvalidRefNameException,
-  JGitInternalException,
-  NoHeadException,
-  RefAlreadyExistsException
-}
+import org.eclipse.jgit.api.errors._
 import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter, RawTextComparator}
 import org.eclipse.jgit.dircache.DirCacheEntry
 import org.eclipse.jgit.util.io.DisabledOutputStream
@@ -390,7 +385,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 +395,7 @@ object JGitUtil {
                 }
               }
             }
-            rest.values.map {
+            rest.values.foreach {
               case (tuple, parentsMap) =>
                 val restParentsMap = parentsMap - newCommit
                 if (restParentsMap.isEmpty) {
@@ -836,6 +831,25 @@ object JGitUtil {
       .find(_._1 != null)
   }
 
+  def createTag(git: Git, name: String, message: Option[String], commitId: String) = {
+    try {
+      val objectId: ObjectId = git.getRepository.resolve(commitId)
+      using(new RevWalk(git.getRepository)) { walk =>
+        val tagCommand = git.tag().setName(name).setObjectId(walk.parseCommit(objectId))
+        message.foreach { message =>
+          tagCommand.setMessage(message)
+        }
+        tagCommand.call()
+      }
+      Right("Tag added.")
+    } catch {
+      case e: GitAPIException              => Left("Sorry, some Git operation error occurs.")
+      case e: ConcurrentRefUpdateException => Left("Sorry some error occurs.")
+      case e: InvalidTagNameException      => Left("Sorry, that name is invalid.")
+      case e: NoHeadException              => Left("Sorry, this repo doesn't have HEAD reference")
+    }
+  }
+
   def createBranch(git: Git, fromBranch: String, newBranch: String) = {
     try {
       git.branchCreate().setStartPoint(fromBranch).setName(newBranch).call()

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

@@ -5,8 +5,11 @@ import SyntaxSugars._
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.service.SystemSettingsService.Ldap
 import com.novell.ldap._
-import java.security.Security
+import java.security.{Provider, Security}
+import java.util.concurrent.atomic.AtomicReference
+
 import org.slf4j.LoggerFactory
+
 import scala.annotation.tailrec
 
 /**
@@ -15,10 +18,11 @@ import scala.annotation.tailrec
 object LDAPUtil {
 
   private val LDAP_VERSION: Int = LDAPConnection.LDAP_V3
-  private val logger = LoggerFactory.getLogger(getClass().getName())
-
   private val LDAP_DUMMY_MAL = "@ldap-devnull"
 
+  private val logger = LoggerFactory.getLogger(getClass().getName())
+  private val provider = new AtomicReference[Provider](null)
+
   /**
    * Returns true if mail address ends with "@ldap-devnull"
    */
@@ -120,6 +124,17 @@ object LDAPUtil {
     }).replaceAll("[^a-zA-Z0-9\\-_.]", "").replaceAll("^[_\\-]", "")
   }
 
+  private def getSslProvider(): Provider = {
+    val cachedInstance = provider.get()
+    if (cachedInstance == null) {
+      val newInstance = Class.forName("com.sun.net.ssl.internal.ssl.Provider").newInstance().asInstanceOf[Provider]
+      provider.compareAndSet(null, newInstance)
+      newInstance
+    } else {
+      cachedInstance
+    }
+  }
+
   private def bind[A](
     host: String,
     port: Int,
@@ -132,7 +147,7 @@ object LDAPUtil {
   )(f: LDAPConnection => Either[String, A]): Either[String, A] = {
     if (tls) {
       // Dynamically set Sun as the security provider
-      Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider())
+      Security.addProvider(getSslProvider())
 
       if (keystore.compareTo("") != 0) {
         // Dynamically set the property that JSSE uses to identify

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/admin/plugins.scala.html

@@ -1,4 +1,4 @@
-@(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)
@@ -8,23 +8,27 @@
     <h1 class="system-settings-title">Plugins</h1>
     @if(plugins.size > 0) {
       <ul>
-      @plugins.map { case (plugin, enabled) =>
-        <li><a href="#@plugin.pluginId">@plugin.pluginId:@plugin.pluginVersion</a></li>
-      }
+        @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">
-            @if(enabled){
-              <form action="@{context.path}/admin/plugins/@{plugin.pluginId}/@{plugin.pluginVersion}/_uninstall" method="POST" class="pull-right uninstall-form">
-                <input type="submit" value="Uninstall" class="btn btn-danger btn-sm" style="position: relative; top: -5px; left: 10px;" data-name="@plugin.pluginName">
-              </form>
-            } 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>
-            }
+            <form method="POST" class="pull-right">
+              @if(enabled){
+                @if(updatableVersion.nonEmpty){
+                  <input type="submit" value="Update" class="btn btn-success btn-sm update-plugin" style="position: relative; top: -5px; left: 10px;"
+                         data-name="@plugin.pluginName" formaction="@{context.path}/admin/plugins/@{plugin.pluginId}/@{updatableVersion}/_install">
+                }
+                <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 +58,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.scala.html

@@ -8,6 +8,7 @@
       <ul class="nav nav-tabs fill-width" id="pullreq-tab">
         <li><a href="#system">System settings</a></li>
         <li><a href="#authentication">Authentication</a></li>
+        <li><a href="#plugins">Plugins</a></li>
       </ul>
       <div class="tab-content fill-width" style="padding-top: 20px;">
         <div class="tab-pane" id="system">
@@ -16,6 +17,9 @@
         <div class="tab-pane" id="authentication">
           @settings_authentication(info)
         </div>
+        <div class="tab-pane" id="plugins">
+          @settings_plugins(info)
+        </div>
       </div>
       <hr>
       <div class="align-right" style="margin-top: 20px;">
@@ -30,6 +34,9 @@ $(function(){
   if(location.hash == '#authentication'){
     $('li:has(a[href="#authentication"])').addClass('active');
     $('div#authentication').addClass('active');
+  } else if(location.hash == '#plugins'){
+    $('li:has(a[href="#plugins"])').addClass('active');
+    $('div#plugins').addClass('active');
   } else {
     $('li:has(a[href="#system"])').addClass('active');
     $('div#system').addClass('active');

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

@@ -0,0 +1,52 @@
+@(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+<label class="strong">Plugin repositories</label>
+<fieldset>
+  <label class="checkbox">
+    <input type="checkbox" id="pluginNetworkInstall" name="pluginNetworkInstall"@if(context.settings.pluginNetworkInstall){ checked} />
+    <a href="https://plugins.gitbucket-community.org" target="_blank">plugins.gitbucket-community.org</a>
+  </label>
+</fieldset>
+<hr>
+<fieldset>
+  <label class="checkbox">
+    <input type="checkbox" id="useProxy" name="useProxy"@if(context.settings.pluginProxy.isDefined){ checked} />
+    Use proxy
+  </label>
+</fieldset>
+<div class="proxy">
+  <div class="form-group">
+    <label class="control-label col-md-2" for="proxyHost">Proxy host</label>
+    <div class="col-md-10">
+      <input type="text" id="proxyHost" name="proxy.host" class="form-control" value="@context.settings.pluginProxy.map(_.host)"/>
+      <span id="error-proxy_host" class="error"></span>
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="control-label col-md-2" for="proxyPort">Proxy port</label>
+    <div class="col-md-10">
+      <input type="text" id="proxyPort" name="proxy.port" class="form-control input-mini" value="@context.settings.pluginProxy.map(_.port)"/>
+      <span id="error-proxy_port" class="error"></span>
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="control-label col-md-2" for="proxyUser">Proxy user</label>
+    <div class="col-md-10">
+      <input type="text" id="proxyUser" name="proxy.user" class="form-control" value="@context.settings.pluginProxy.map(_.user)"/>
+      <span id="error-proxy_user" class="error"></span>
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="control-label col-md-2" for="proxyPassword">Proxy password</label>
+    <div class="col-md-10">
+      <input type="text" id="proxyPassword" name="proxy.password" class="form-control" value="@context.settings.pluginProxy.map(_.password)"/>
+      <span id="error-proxy_password" class="error"></span>
+    </div>
+  </div>
+</div>
+<script>
+$(function(){
+  $('#useProxy').change(function(){
+    $('.proxy input').prop('disabled', !$(this).prop('checked'));
+  }).change();
+});
+</script>

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

@@ -182,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>
@@ -191,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"/>
-      <span id="error-sshHost" class="error"></span>
+      <input type="text" id="sshHost" name="ssh.host" class="form-control" value="@context.settings.ssh.sshHost"/>
+      <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"/>
-      <span id="error-sshPort" class="error"></span>
+      <input type="text" id="sshPort" name="ssh.port" class="form-control" value="@context.settings.ssh.sshPort"/>
+      <span id="error-ssh_port" class="error"></span>
     </div>
   </div>
 </div>
@@ -329,7 +329,7 @@ $(function(){
     }
   });
 
-  $('#ssh').change(function(){
+  $('#sshEnabled').change(function(){
     $('.ssh input').prop('disabled', !$(this).prop('checked'));
   }).change();
 

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],
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+  recentRepositories: 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],
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+  recentRepositories: 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],
+  visibleRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  recentRepositories: 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>
+          @visibleRepositories.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(visibleRepositories.isEmpty){
+        No repositories
+      } else {
+        @visibleRepositories.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],
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
+@(recentRepositories: 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/commitcomments.scala.html

@@ -7,7 +7,7 @@
   <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>
+      <span class="pull-right"><a href="javascript:void(0);" onclick="$('.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">
@@ -19,3 +19,14 @@
     </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">
-      <input type="button" id="btn-unified" class="btn btn-default active" value="Unified">
-      <input type="button" id="btn-split" class="btn btn-default" value="Split">
+    <div class="btn-group">
+      <a href="javascript:changeDisplaySetting('diff', 'unified');" id="btn-unified" class="btn btn-default">Unified</a>
+      <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>
@@ -103,8 +103,8 @@
         } else {
           @if(diff.newContent != None || diff.oldContent != None){
             <div id="diffText-@i" class="diffText"></div>
-            <textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath" data-val='@diff.newContent.getOrElse("")'></textarea>
-            <textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath" data-val='@diff.oldContent.getOrElse("")'></textarea>
+            <input type="hidden" id="newText-@i" data-file-name="@diff.oldPath" value="@diff.newContent">
+            <input type="hidden" id="oldText-@i" data-file-name="@diff.newPath" value="@diff.oldContent">
           } else {
             @if(diff.newIsImage || diff.oldIsImage){
               <div class="diff-image-render diff2up">
@@ -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;
-  }
-  renderDiffs();
-
-  $('#btn-unified').click(function(){
+    $('#btn-split').addClass('active');
+    window.params['diff'] = 'split';
+  } else {
     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();
-  });
+  }
+  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,8 +362,8 @@ $(function(){
     });
     for(var key in elements){
       filename = elements[key]['filename'];
-      oldline = elements[key]['oldline'] ? elements[key]['oldline'] : '';
-      newline = elements[key]['newline'] ? elements[key]['newline'] : '';
+      oldline = elements[key]['oldline']; //? elements[key]['oldline'] : '';
+      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..." '
@@ -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="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>
-    @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>
-      } 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>
+  <div class="block">
+    @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="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 class="block" title="You don't have permission to fork here.">
+        @helpers.avatar(groupName, 24) <span class="muted">@@@groupName</span>
+      </div>
+    }
+  }
   <input id="account" name="account" type="hidden" />
-</form>
+</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...');

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

@@ -3,7 +3,8 @@
   isManageable: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   pullreq: Option[gitbucket.core.model.PullRequest] = None,
-  commitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
+  commitId: Option[String] = None,
+  renderScript: Boolean = true)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @issueOrPullRequest()={ @if(issue.exists(_.isPullRequest))( "pull request" )else( "issue" ) }
 @showFormattedComment(comment: gitbucket.core.model.IssueComment)={
@@ -279,6 +280,7 @@
     </div>
   }
 }
+@if(renderScript){
 <script>
 $(function(){
 @if(issue.isDefined){
@@ -415,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/list.scala.html

@@ -25,7 +25,7 @@
     <form method="GET" action="@helpers.url(repository)/search" id="search-filter-form" class="form-inline pull-right" autocomplete="off">
       <div class="input-group">
         <input type="text" class="form-control" name="q" placeholder="Search..."/>
-        <input type="hidden" name="type" value="issue"/>
+        <input type="hidden" name="type" value="@target"/>
         <span class="input-group-btn">
           <button type="submit" id="search-btn" class="btn btn-default"><i class="fa fa-search"></i></button>
         </span>

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/compare.scala.html

@@ -1,7 +1,7 @@
 @(title: String,
   commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
   diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
-  members: List[(String, String)],
+  members: List[(String, String, String)],
   comments: List[gitbucket.core.model.Comment],
   originId: String,
   forkedId: String,
@@ -22,8 +22,8 @@
     <div class="pullreq-info">
       <div id="compare-edit">
         @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork", filter=("origin_repo", "Find Repository...")) {
-          @members.map { case (owner, name) =>
-            <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
+          @members.map { case (owner, name, defaultBranch) =>
+            <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name" data-default-branch="@defaultBranch">@gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
           }
         }
         @gitbucket.core.helper.html.dropdown(originId, "base", filter=("origin_branch", "Find Branch...")) {
@@ -33,8 +33,8 @@
         }
         ...
         @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork", filter=("forked_repo", "Find Repository...")) {
-          @members.map { case (owner, name) =>
-            <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
+          @members.map { case (owner, name, defaultBranch) =>
+            <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name" data-default-branch="@defaultBranch">@gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
           }
         }
         @gitbucket.core.helper.html.dropdown(forkedId, "compare", filter=("forked_branch", "Find Branch...")) {
@@ -170,25 +170,46 @@
 }
 <script>
 $(function(){
-  $('a.origin-owner, a.forked-owner, a.origin-branch, a.forked-branch').click(function(){
-    var e = $(this);
+  function updateSelector(e){
     e.parents('ul').find('i').attr('class', 'octicon');
     e.find('i').addClass('octicon-check');
     e.parents('div.btn-group').find('button span.strong').text(e.text());
+  }
 
-    @if(members.isEmpty){
-      location.href = '@helpers.url(repository)/compare/' +
-        $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')) + '...' +
-        $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'));
-    } else {
-      location.href = '@context.path/' +
-        $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + '/' +
-        $.trim($('i.octicon-check').parents('a.forked-owner' ).data('name')) +'/compare/' +
-        $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ':' +
-        $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')) + '...' +
-        $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ':' +
-        $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'));
-    }
+  $('a.origin-owner').click(function(){
+    updateSelector($(this));
+
+    location.href = '@context.path/' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + '/' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('name')) +'/compare/' +
+      $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ':' +
+      $.trim($('i.octicon-check').parents('a.origin-owner' ).data('default-branch')) + '...' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ':' +
+      $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'));
+  });
+
+  $('a.forked-owner').click(function(){
+    updateSelector($(this));
+
+    location.href = '@context.path/' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + '/' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('name')) +'/compare/' +
+      $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ':' +
+      $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')) + '...' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ':' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('default-branch'));
+  });
+
+  $('a.origin-branch, a.forked-branch').click(function(){
+    updateSelector($(this));
+
+    location.href = '@context.path/' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + '/' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('name')) +'/compare/' +
+      $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ':' +
+      $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')) + '...' +
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ':' +
+      $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'));
   });
 
   $('#show-form').click(function(){
@@ -206,19 +227,12 @@ $(function(){
         function(data){ $('.check-conflict').html(data); });
     }
 
-    @if(members.isEmpty){
-      checkConflict(
-        $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')),
-        $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'))
-      );
-    } else {
-      checkConflict(
-        $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ":" +
-        $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')),
-        $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ":" +
-        $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'))
-      );
-    }
+    checkConflict(
+      $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ":" +
+      $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')),
+      $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ":" +
+      $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'))
+    );
   }
 });
 </script>

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

@@ -10,7 +10,7 @@
       @if(!status.statuses.isEmpty){
         <div class="build-statuses">
           @defining(status.commitStateSummary){ case (summaryState, summary) =>
-            <a class="pull-right" id="toggle-all-checks"></a>
+            <a class="pull-right" id="toggle-all-checks" href="javascript:void(0);"></a>
             <span class="build-status-icon text-@{summaryState.name}">@helpers.commitStateIcon(summaryState)</span>
             <strong class="text-@{summaryState.name}">@helpers.commitStateText(summaryState, pullreq.commitIdTo)</strong>
             <span class="text-@{summaryState.name}">— @summary checks</span>
@@ -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/proposals.scala.html

@@ -7,7 +7,7 @@
     <div class="box-content" style="line-height: 20pt; margin-bottom: 6px; padding: 10px 6px 10px 10px; background-color: #fff9ea">
       <strong><i class="menu-icon octicon octicon-git-branch"></i><span class="muted">@branch</span></strong>
       <a class="pull-right btn btn-success" style="position: relative; top: -4px;"
-         href="@helpers.url(repository)/compare/@{parent.owner}:@{parent.repository.defaultBranch}...@{repository.owner}:@{branch}">Compare & pull request</a>
+         href="@helpers.url(repository)/compare/@{parent.owner}:@{helpers.urlEncode(parent.repository.defaultBranch)}...@{repository.owner}:@{helpers.urlEncode(branch)}">Compare & pull request</a>
     </div>
   }
-}
+}

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

@@ -5,10 +5,16 @@
   latestCommit: gitbucket.core.util.JGitUtil.CommitInfo,
   hasWritePermission: Boolean,
   isBlame: Boolean,
-  isLfsFile: Boolean)(implicit context: gitbucket.core.controller.Context)
+  isLfsFile: Boolean,
+  tabSize: Int)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"${(repository.name :: pathList).mkString("/")} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("files", repository){
+    <style>
+      .prettyprint {
+        tab-size: @tabSize
+      }
+    </style>
     <div class="head">
       <div class="pull-right hide-if-blame"><div class="btn-group">
         <a href="@helpers.url(repository)/blob/@helpers.encodeRefName((latestCommit.id :: pathList).mkString("/"))" data-hotkey="y" style="display: none;">Transfer to URL with SHA</a>

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

@@ -5,6 +5,7 @@
   issueId: Option[Int] = None,
   hasWritePermission: Boolean,
   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){
@@ -23,15 +24,16 @@
           completionContext  = "issues",
           style              = "height: 100px; max-height: 150px;",
           elastic            = true,
+          focus              = focus,
           uid                = uid
         )
+        @if(fileName.isDefined){
+          <div class="pull-right">
+            <input type="button" class="btn btn-default" value="Cancel"/>
+            <input type="submit" id="btn-inline-comment-@uid" class="btn btn-success" formaction="@helpers.url(repository)/commit/@commitId/comment/new" value="Comment"/>
+          </div>
+        }
       </div>
-      @if(fileName.isDefined){
-        <div class="pull-right" style="margin-top: 10px;">
-          <input type="button" class="btn btn-default" value="Cancel"/>
-          <input type="submit" id="btn-inline-comment-@uid" class="btn btn-success" formaction="@helpers.url(repository)/commit/@commitId/comment/new" value="Comment"/>
-        </div>
-      }
     </div>
     @if(!fileName.isDefined){
       <div class="pull-right">
@@ -112,8 +114,18 @@
               .data('filename', '@fileName')
               .data('newline',  @newLineNumber.getOrElse("undefined"))
               .data('oldline',  @oldLineNumber.getOrElse("undefined")));
-          var tmp = getInlineContainer();
-          tmp.children('td:last').html($v)
+
+          @if(oldLineNumber.isDefined){
+            @if(newLineNumber.isDefined){
+              var tmp = getInlineContainer();
+            } 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);
         }
 
@@ -122,7 +134,7 @@
         //   $('#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);
       });
     });
@@ -140,6 +152,14 @@
     }
 
     function getDiffData(tr){
+      if(window.viewType === 0) {
+        return getDiffDataOnSplitMode(tr);
+      } else {
+        return getDiffDataOnUnifiedMode(tr);
+      }
+    }
+
+    function getDiffDataOnUnifiedMode(tr) {
       var result = [];
       var count = 0;
 
@@ -147,16 +167,19 @@
         var oldTh = tr.find('th.oldline');
         var newTh = tr.find('th.newline');
 
-        if(!oldTh.attr('line-number') && !newTh.attr('line-number')){
+        var oldLineNumber = oldTh.attr('line-number');
+        var newLineNumber = newTh.attr('line-number');
+
+        if(!oldLineNumber && !newLineNumber){
           break;
         }
 
         result.unshift({
-          'oldLine': oldTh.attr('line-number'),
-          'newLine': newTh.attr('line-number'),
+          '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()
-        })
+          'text': tr.find('td span').text()
+        });
 
         tr = tr.prev('tr:has(th.line-num)');
         count++;
@@ -164,5 +187,55 @@
 
       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

@@ -1,4 +1,3 @@
-@import gitbucket.core.model.CommitComment
 @(commitId: String,
   commit: gitbucket.core.util.JGitUtil.CommitInfo,
   branches: List[String],
@@ -7,17 +6,22 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
   oldCommitId: Option[String],
-  hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+  hasWritePermission: Boolean,
+  info: Option[Any] = None,
+  error: Option[Any] = None)(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){
+  @gitbucket.core.html.menu("files", repository, None, info, error){
     <table class="table table-bordered">
       <tr>
         <th class="box-header">
-          <div class="pull-right align-right">
+          <div class="pull-right align-right btn-group">
             <a href="@helpers.url(repository)/tree/@commit.id" class="btn btn-default">Browse code</a>
+            @if(hasWritePermission) {
+              <a href="@helpers.url(repository)/tag/@commit.id" class="btn btn-default" rel="facebox">Add tag</a>
+            }
           </div>
           <div class="commit-log">@helpers.link(commit.summary, repository)</div>
           @if(commit.description.isDefined){
@@ -26,7 +30,7 @@
           <div class="small" style="font-weight: normal;">
             @if(branches.nonEmpty){
               <span class="muted">
-                  <i class="octicon octicon-git-branch"></i>
+                <i class="octicon octicon-git-branch"></i>
                 @branches.zipWithIndex.map { case (branch, i) =>
                   <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
                 }
@@ -34,7 +38,7 @@
             }
             @if(tags.nonEmpty){
               <span class="muted">
-                  <i class="octicon octicon-tag"></i>
+                <i class="octicon octicon-tag"></i>
                 @tags.zipWithIndex.map { case (tag, i) =>
                   <a href="@helpers.url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a>
                 }
@@ -90,15 +94,16 @@
     </label>
     <div id="comment-list">
       @gitbucket.core.issues.html.commentlist(
-        None,
-        comments.filter(_.asInstanceOf[gitbucket.core.model.CommitComment].fileName.isEmpty),
-        hasWritePermission,
-        repository,
-        None)
+        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(
-          None,
-          comments.map(_.asInstanceOf[CommitComment]).filter(_.fileName.isDefined).groupBy(_.fileName).map { case (fileName, comments) =>
+          issue        = None,
+          comments     = comments.map(_.asInstanceOf[CommitComment]).filter(_.fileName.isDefined).groupBy(_.fileName).map { case (fileName, comments) =>
             CommitComments(
               fileName          = fileName.get,
               commentedUserName = comments.head.commentedUserName,
@@ -107,10 +112,10 @@
               diff              = None
             )
           }.toList,
-          hasWritePermission,
-          repository,
-          None,
-          Some(commitId))
+          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/delete.scala.html

@@ -32,8 +32,8 @@
         <tr>
           <td>
             <div id="diffText"></div>
-            <textarea id="newText" style="display: none;" data-file-name="@fileName"></textarea>
-            <textarea id="oldText" style="display: none;" data-file-name="@fileName">@content.content</textarea>
+            <input type="hidden" id="newText" data-file-name="@fileName" value="">
+            <input type="hidden" id="oldText" data-file-name="@fileName" value="@content.content">
           </td>
         </tr>
       </table>
@@ -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-default">Cancel</a>
+            <a href="@helpers.url(repository)/blob/@helpers.encodeRefName((branch :: pathList ::: List(fileName)).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,6 +12,7 @@
   completionContext  = "issues",
   style              = "",
   elastic            = true,
+  focus              = true,
   tabIndex           = 1
 )
 <div class="text-right">

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

@@ -4,7 +4,11 @@
   fileName: Option[String],
   content: gitbucket.core.util.JGitUtil.ContentInfo,
   protectedBranch: Boolean,
-  commit: String)(implicit context: gitbucket.core.controller.Context)
+  commit: String,
+  newLineMode: String = "auto",
+  useSoftTabs: Boolean = false,
+  tabSize: Int = 8
+)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("files", repository){
@@ -19,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("/")"/>
@@ -97,6 +101,9 @@ $(function(){
   @if(protectedBranch){
     editor.setReadOnly(true);
   }
+  editor.getSession().setOption("tabSize", @tabSize);
+  editor.getSession().setOption("newLineMode", "@newLineMode");
+  editor.getSession().setOption("useSoftTabs", @useSoftTabs);
 
   editor.on('change', function(){
     updateCommitButtonStatus();

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

@@ -33,7 +33,7 @@
     <div class="head" style="height: 24px;">
       <div class="pull-right">
         <div class="btn-group">
-          <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)}/archive@if(pathList.length > 0){/@pathList.map(helpers.urlEncode).mkString("/")}/@{helpers.urlEncode(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>

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>
 

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

@@ -5,23 +5,7 @@
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("fork", repository){
-    <h1 class="body-title">
-      Forked repositories
-      @if(context.loginAccount.isEmpty){
-        <a href="@context.path/signin?redirect=@helpers.urlEncode(s"${context.path}/${repository.owner}/${repository.name}")" class="btn btn-success">Fork</a>
-      } else {
-        @if(groupNames.isEmpty) {
-          <a id="fork-link" href="javascript:void(0);" class="btn btn-success">Fork</a>
-        } else {
-          <a href="@context.path/@repository.owner/@repository.name/fork" class="btn btn-success" rel="facebox">Fork</a>
-        }
-      }
-    </h1>
-    @if(context.loginAccount.isDefined && groupNames.isEmpty){
-      <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.get.userName"/>
-      </form>
-    }
+    <h1 class="body-title">Forked repositories</h1>
     <div class="block">
       @if(originRepository.isDefined){
         @helpers.avatarLink(originRepository.get.owner, 20)
@@ -46,26 +30,3 @@
     }
   }
 }
-<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() {
-    if (!$(this).hasClass("disabled")) {
-      var account = $(this).text().replace("@@", "");
-      $("#account").val(account);
-      $("#fork").submit();
-    }
-  });
-
-  @if(context.loginAccount.isDefined){
-  $(document).on("click", "a#fork-link", function(e) {
-    e.preventDefault();
-    $('#fork-form').submit();
-  });
-  }
-});
-</script>

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

@@ -0,0 +1,26 @@
+@(commitId: String,
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+<h2 class="facebox-header">
+  Add tag
+</h2>
+<form action="@helpers.url(repository)/tag" id="tag" method="post" validate="true">
+  <fieldset style="margin-top: 20px;">
+    <div class="form-group">
+      <label class="control-label" for="tagName">Tag name</label>
+      <input type="text" id="tagName" name="tagName" class="form-control">
+      <span class="error" id="error-tagName"></span>
+    </div>
+  </fieldset>
+  <fieldset>
+    <div class="form-group">
+      <label class="control-label" for="message">Message</label>
+      <input type="text" id="message" name="message" class="form-control">
+      <span class="error" id="error-message"></span>
+    </div>
+  </fieldset>
+  <div class="text-right">
+    <input type="hidden" name="commitId" value="@commitId">
+    <input type="submit" class="btn btn-success" value="Add tag">
+  </div>
+</form>

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

@@ -1,21 +1,27 @@
 @(issues: List[gitbucket.core.service.RepositorySearchService.IssueSearchResult],
+  pullRequest: Boolean,
   query: String,
   page: Int,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
-  @gitbucket.core.search.html.menu("issues", query, repository){
+  @gitbucket.core.search.html.menu(if(pullRequest) "pulls" else "issues", query, repository){
     @if(query.nonEmpty) {
       @if(issues.isEmpty) {
-        <h4>We couldn't find any code matching '@query'</h4>
+        <h4>We couldn't find any @{if(pullRequest) "pull requests" else "issues"} matching '@query'</h4>
       } else {
-        <h4>We've found @issues.size @helpers.plural(issues.size, "issue")</h4>
+        <h4>We've found @issues.size @helpers.plural(issues.size, if(pullRequest) "pull request" else "issue")</h4>
       }
     }
     @issues.drop((page - 1) * RepositorySearchService.IssueLimit).take(RepositorySearchService.IssueLimit).map { issue =>
       <div class="block">
-        <div class="pull-right muted">#@issue.issueId</div>
+        <div class="pull-right muted">
+          @if(issue.isClosed){
+            <span class="label label-danger">Closed</span>
+          }
+          #@issue.issueId
+        </div>
         <h4 style="margin-top: 0px;"><a href="@helpers.url(repository)/@if(issue.isPullRequest){pull} else {issues}/@issue.issueId">@issue.title</a></h4>
         @if(issue.highlightText.nonEmpty){
           <pre>@Html(issue.highlightText)</pre>
@@ -31,6 +37,6 @@
       </div>
     }
     @gitbucket.core.helper.html.paginator(page, issues.size, RepositorySearchService.IssueLimit, 10,
-      s"${helpers.url(repository)}/search?q=${helpers.urlEncode(query)}&type=issue")
+      s"${helpers.url(repository)}/search?q=${helpers.urlEncode(query)}&type=${if(pullRequest) "pulls" else "issues"}")
   }
-}
+}

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

@@ -6,7 +6,10 @@
     <select class="form-control" name="type">
       <option value="code" @if(active == "files"){ selected }>Files</option>
       @if(repository.repository.options.issuesOption != "DISABLE") {
-        <option value="issue" @if(active == "issues"){ selected }>Issues</option>
+        <option value="issues" @if(active == "issues"){ selected }>Issues</option>
+      }
+      @if(repository.repository.options.issuesOption != "DISABLE") {
+        <option value="pulls" @if(active == "pulls"){ selected }>Pull requests</option>
       }
       @if(repository.repository.options.wikiOption != "DISABLE") {
         <option value="wiki" @if(active == "wiki"){ selected }>Wiki</option>
@@ -17,4 +20,4 @@
     <input type="hidden" name="type" value="@active"/>
   </form>
   @body
-}
+}

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

@@ -1,10 +1,9 @@
 @(query: String,
   repositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
-  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
-  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(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){
     <form action="@context.path/search" method="GET" class="form-inline">
       <input type="text" name="query" value="@query" class="form-control" style="width: 250px; margin-bottom: 0px;"/>
       <input type="submit" value="Search" class="btn btn-default"/>

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

@@ -8,7 +8,7 @@
   @gitbucket.core.search.html.menu("wiki", query, repository){
     @if(query.nonEmpty) {
       @if(wikis.isEmpty) {
-        <h4>We could not find any code matching '@query'</h4>
+        <h4>We could not find any pages matching '@query'</h4>
       } else {
         <h4>We've found @wikis.size @helpers.plural(wikis.size, "page")</h4>
       }
@@ -23,4 +23,4 @@
     @gitbucket.core.helper.html.paginator(page, wikis.size, RepositorySearchService.CodeLimit, 10,
       s"${helpers.url(repository)}/search?q=${helpers.urlEncode(query)}&type=wiki")
   }
-}
+}

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

@@ -8,15 +8,15 @@
     <a href="@helpers.url(repository)/settings/collaborators">Collaborators</a>
   </li>
   @if(!repository.branchList.isEmpty){
-  <li@if(active=="branches"){ class="active"}>
-    <a href="@helpers.url(repository)/settings/branches">Branches</a>
-  </li>
+    <li@if(active=="branches"){ class="active"}>
+      <a href="@helpers.url(repository)/settings/branches">Branches</a>
+    </li>
   }
   <li@if(active=="hooks"){ class="active"}>
     <a href="@helpers.url(repository)/settings/hooks">Service Hooks</a>
   </li>
   <li@if(active=="deploykeys"){ class="active"}>
-  <a href="@helpers.url(repository)/settings/deploykey">Deploy Keys</a>
+    <a href="@helpers.url(repository)/settings/deploykey">Deploy Keys</a>
   </li>
   <li@if(active=="danger"){ class="active"}>
     <a href="@helpers.url(repository)/settings/danger">Danger Zone</a>

src/main/webapp/WEB-INF/web.xml

@@ -89,5 +89,10 @@
     <param-value>PATH_TO_DATADIR</param-value>
   </context-param>
   -->
+  
+  <mime-mapping>
+    <extension>svg</extension>
+    <mime-type>image/svg+xml</mime-type>
+  </mime-mapping>
 
 </web-app>

src/main/webapp/assets/common/css/gitbucket.css

@@ -254,9 +254,11 @@ div.row {
   margin-right: 0px;
 }
 
+/*
 ul.nav-tabs {
   height: 42px;
 }
+*/
 
 ul.nav-pills .link {
   color: #4078c0;

src/main/webapp/assets/common/js/gitbucket.js

@@ -76,17 +76,22 @@ function displayErrors(data, elem){
  * @param ignoreSpace {Number} 0: include, 1: ignore
  */
 function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) {
-  var old = $('#'+oldTextId), head = $('#'+newTextId);
+  var old = $('#'+oldTextId), head = $('#' + newTextId);
   var render = new JsDiffRender({
-    oldText: old.attr('data-val'),
+    oldText: old.val(),
     oldTextName: old.attr('data-file-name'),
-    newText: head.attr('data-val'),
+    newText: head.val(),
     newTextName: head.attr('data-file-name'),
     ignoreSpace: ignoreSpace,
     contextSize: 4
   });
-  var diff = render[viewType==1 ? "unified" : "split"]();
-  diff.appendTo($('#'+outputId).html(""));
+  var diff = render[viewType == 1 ? "unified" : "split"]();
+  if(viewType == 1){
+    diff.find('tr:last').after($('<tr><td></td><td></td><td></td></tr>'));
+  } else {
+    diff.find('tr:last').after($('<tr><td></td><td></td><td></td><td></td></tr>'));
+  }
+  diff.appendTo($('#' + outputId).html(""));
 }
 
 

src/main/webapp/assets/vendors/facebox/facebox.css

@@ -80,63 +80,9 @@
 }
 
 .facebox-header {
-  margin: -15px -15px 15px;
+  margin: -15px -15px 0px -15px;
   padding: 15px;
   border-bottom: 1px solid #e5e5e5;
   font-size: 18px;
   font-weight: normal;
 }
-
-.owner-select-grid {
-  margin-left: -8px;
-  overflow: hidden;
-}
-
-.owner-select-target {
-  float: left;
-  padding: 10px;
-  margin: 0 8px 10px;
-  text-align: center;
-  background-color: #f2f2f2;
-  border-radius: 3px;
-}
-
-.owner-select-target.enabled {
-  font-weight: bold;
-  cursor: pointer;
-}
-
-.owner-select-target.disabled {
-  color: #999;
-  cursor: not-allowed;
-}
-
-.owner-select-grid .avatar {
-  display: block;
-  overflow: hidden;
-  line-height: 1;
-  vertical-align: middle;
-  border-radius: 3px;
-}
-
-.owner-select-target.enabled .avatar {
-  opacity: 1;
-}
-
-.owner-select-target.disabled .avatar {
-  margin-bottom: 9px;
-  opacity: 0.3;
-}
-
-.css-truncate {
-  display: inline-block;
-  max-width: 125px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  vertical-align: top;
-}
-
-.owner-select-target .css-truncate {
-  max-width: 90px;
-}

src/test/scala/gitbucket/core/api/JsonFormatSpec.scala

@@ -345,7 +345,7 @@ class JsonFormatSpec extends FunSuite {
     commit_id = "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
     // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
     user = apiUser,
-    body = "Maybe you should use more emojji on this line.",
+    body = "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("baxterthehacker/public-repo"), 1)
@@ -359,7 +359,7 @@ class JsonFormatSpec extends FunSuite {
     "commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
     // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
     "user": $apiUserJson,
-    "body": "Maybe you should use more emojji on this line.",
+    "body": "Maybe you should use more emoji on this line.",
     "created_at": "2015-05-05T23:40:27Z",
     "updated_at": "2015-05-05T23:40:27Z",
     "html_url": "http://gitbucket.exmple.com/baxterthehacker/public-repo/pull/1#discussion_r29724692",

src/test/scala/gitbucket/core/util/EditorConfigUtilSpec.scala

@@ -0,0 +1,49 @@
+package gitbucket.core.util
+
+import org.scalatest.FunSuite
+import GitSpecUtil._
+
+class EditorConfigUtilSpec extends FunSuite {
+  val simpleConfig =
+    """[*.txt]
+      |indent_style = tab
+      |indent_size = 4""".stripMargin
+
+  test("no EditorConfig file") {
+    withTestRepository { git =>
+      createFile(git, "master", "README.md", "body", message = "commit1")
+      val info = EditorConfigUtil.getEditorConfigInfo(git, "master", "test.txt")
+      assert(info.tabSize == 8)
+      assert(info.useSoftTabs == false)
+      assert(info.newLineMode == "auto")
+
+      val subdirInfo = EditorConfigUtil.getEditorConfigInfo(git, "master", "dir1/dir2/dir3/dir4/test.txt")
+      assert(subdirInfo.tabSize == 8)
+      assert(subdirInfo.useSoftTabs == false)
+      assert(subdirInfo.newLineMode == "auto")
+    }
+  }
+
+  test("simple EditorConfig") {
+    withTestRepository { git =>
+      createFile(git, "master", ".editorconfig", simpleConfig, message = "commit1")
+
+      val info = EditorConfigUtil.getEditorConfigInfo(git, "master", "test.txt")
+      assert(info.tabSize == 4)
+
+      val subdirInfo = EditorConfigUtil.getEditorConfigInfo(git, "master", "dir1/dir2/dir3/dir4/test.txt")
+      assert(subdirInfo.tabSize == 4)
+    }
+  }
+
+  test(".editorconfig parse error") {
+    withTestRepository { git =>
+      createFile(git, "master", ".editorconfig", "equal_missing", message = "commit1")
+
+      val info = EditorConfigUtil.getEditorConfigInfo(git, "master", "test.txt")
+      assert(info.tabSize == 8)
+      assert(info.useSoftTabs == false)
+      assert(info.newLineMode == "auto")
+    }
+  }
+}

src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

@@ -7,7 +7,7 @@ import javax.servlet.http.{HttpServletRequest, HttpSession}
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Account
 import gitbucket.core.service.RequestCache
-import gitbucket.core.service.SystemSettingsService.SystemSettings
+import gitbucket.core.service.SystemSettingsService.{Ssh, SystemSettings}
 import org.mockito.Mockito._
 import org.scalatest.FunSpec
 import org.scalatest.mockito.MockitoSugar
@@ -125,9 +125,11 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
       gravatar = useGravatar,
       notification = false,
       activityLogLimit = None,
-      ssh = false,
-      sshHost = None,
-      sshPort = None,
+      ssh = Ssh(
+        enabled = false,
+        sshHost = None,
+        sshPort = None
+      ),
       useSMTP = false,
       smtp = None,
       ldapAuthentication = false,
@@ -135,7 +137,9 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
       oidcAuthentication = false,
       oidc = None,
       skinName = "skin-blue",
-      showMailAddress = false
+      showMailAddress = false,
+      pluginNetworkInstall = false,
+      pluginProxy = None
     )
 
   /**