(refs #1687)Bump notification plugin to 1.1.0

Handle errors to show errors prettify and logging it.

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.java]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4

.github/CONTRIBUTING.md

@@ -1,7 +1,8 @@
-# Guideline for Issues
+# The guidelines for contributing
 
-- At first, See [FAQ](https://github.com/gitbucket/gitbucket/wiki/FAQ) and check issues whether there is a same question or request in the past.
+- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
-- 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. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before staring your work.
-- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
+- We can also support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- Write an issue in English. At least, write subject in English.
+- You can edit the GitBucket documentation on Wiki if you have a GitHub account. When you find any mistakes or lacks in the documentation, please update it directly.
-- First priority of GitBucket is easy installation and reproduce GitHub behavior, so we might reject if your request is against it.
+- Write an issue, a pull request, commit messages and comments in source code in English.
+- All your contributions are handled as [Apache Software License, Version 2.0](https://github.com/gitbucket/gitbucket/blob/master/LICENSE). When you create a pull request or update the documentation, we assume you agreed this clause.

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-### Before submitting an issue to Gitbucket I have first:
+### Before submitting an issue to GitBucket I have first:
 
 - [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
 - [] searched for similar already existing issue
@@ -9,7 +9,7 @@
 ## Issue
 **Impacted version**: xxxx
 
-**Deployment mode**: *explain here how you use gitbucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
+**Deployment mode**: *explain here how you use GitBucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
 
 **Problem description**:
 - *be as explicit has you can*

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,8 @@
-### Before submitting a pull-request to Gitbucket I have first:
+### Before submitting a pull-request to GitBucket I have first:
 
 - [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
 - [] rebased my branch over master
 - [] verified that project is compiling
 - [] verified that tests are passing
 - [] squashed my commits as appropriate *(keep several commits if it is relevant to understand the PR)*
-- [] [marked as closed](https://help.github.com/articles/closing-issues-via-commit-messages/) all issue ID that this PR should correct
+- [] [marked as closed using commit message](https://help.github.com/articles/closing-issues-via-commit-messages/) all issue ID that this PR should correct

.github/SUPPORT.md

@@ -0,0 +1,6 @@
+# The support guidelines
+
+- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
+- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
+- We can also support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
+- Write an issue in English. Since we can't support issues written in other languages, we close them forcibly.

.gitignore

@@ -16,8 +16,11 @@ project/plugins/project/
 .classpath
 .project
 .cache
+.cache-main
+.cache-tests
 .settings
 
 # IntelliJ specific
 .idea/
 .idea_modules/
+*.iml

.travis.yml

@@ -1,11 +1,18 @@
 language: scala
 sudo: true
-script:
-  - sbt test
 jdk: 
   - oraclejdk8
+script:
+  - sbt test
 before_script:
-  - sudo apt-get install libaio1
   - sudo /etc/init.d/mysql stop
   - sudo /etc/init.d/postgresql stop
-
+  - sudo chmod +x /usr/local/bin/sbt
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt/boot
+    - $HOME/.sbt/launchers
+    - $HOME/.coursier
+    - $HOME/.embedmysql
+    - $HOME/.embedpostgresql

LICENSE

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

README.md

@@ -1,71 +1,133 @@
 GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket)
 =========
 
-GitBucket is a Git platform powered by Scala offering:
+GitBucket is a Git web platform powered by Scala offering:
-- easy installation
+
-- high extensibility by plugins
+- Easy installation
-- API compatibility with Github
+- Intuitive UI
+- High extensibility by plugins
+- API compatibility with GitHub
+
+You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/).
 
 Features
 --------
-The current version of GitBucket provides a basic features below:
+The current version of GitBucket provides many features such as:
 
-- Public / Private Git repository (http and ssh access)
+- Public / Private Git repositories (with http/https and ssh access)
-- Repository viewer and online file editing
+- GitLFS support
-- Wiki
+- Repository viewer including an online file editor
-- Issues / Pull request
+- Issues, Pull Requests and Wiki for repositories
-- Email notification
+- Activity timeline and email notifications
-- Simple user and group management with LDAP integration
+- Account and group management with LDAP integration
-- Plug-in system
+- a Plug-in system
 
-If you want to try the development version of GitBucket, see [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
+If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
 
 Installation
 --------
-GitBucket requires **Java8**. You have to install beforehand when it's not installed.
+GitBucket requires **Java8**. You have to install it, if it is not already installed.
 
-1. Download latest **gitbucket.war** from [the release page](https://github.com/gitbucket/gitbucket/releases).
+1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
-2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
+2. Go to `http://[hostname]:8080/` and log in with ID: **root** / Pass: **root**.
-3. Access **http://[hostname]:[port]/gitbucket/** using your web browser and logged-in with **root** / **root**.
 
-or you can start GitBucket by `java -jar gitbucket.war` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.
+You can specify following options:
 
-- --port=[NUMBER]
+- `--port=[NUMBER]`
-- --prefix=[CONTEXTPATH]
+- `--prefix=[CONTEXTPATH]`
-- --host=[HOSTNAME]
+- `--host=[HOSTNAME]`
-- --gitbucket.home=[DATA_DIR]
+- `--gitbucket.home=[DATA_DIR]`
+- `--temp_dir=[TEMP_DIR]`
+- `--max_file_size=[MAX_FILE_SIZE]`
 
-To upgrade GitBucket, only replace gitbucket.war after stop GitBucket. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.
+`TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home.
 
-About installation on Mac or Windows Server (with IIS), configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
+`MAX_FILE_SIZE` is the max file size for upload files.
 
-Plug-ins
+You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
+
+For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
+
+To upgrade GitBucket, replace `gitbucket.war` with the new version, after stopping GitBucket. All GitBucket data is stored in `HOME/.gitbucket` by default. So if you want to back up GitBucket's data, copy this directory to the backup location.
+
+Plugins
 --------
-GitBucket has the plug-in system to extend GitBucket from outside of GitBucket. Some plug-ins are available now:
+GitBucket has a plug-in system that allows extra functionality. Officially the following plug-ins are provided:
 
 - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
-- [gitbucket-announce-plugin](https://github.com/gitbucket-plugins/gitbucket-announce-plugin)
-- [gitbucket-h2-backup-plugin](https://github.com/gitbucket-plugins/gitbucket-h2-backup-plugin)
-- [gitbucket-desktopnotify-plugin](https://github.com/yoshiyoshifujii/gitbucket-desktopnotify-plugin)
-- [gitbucket-commitgraphs-plugin](https://github.com/yoshiyoshifujii/gitbucket-commitgraphs-plugin)
-- [gitbucket-asciidoctor-plugin](https://github.com/lefou/gitbucket-asciidoctor-plugin)
-- [gitbucket-network-plugin](https://github.com/mrkm4ntr/gitbucket-network-plugin)
 - [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
+- [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin)
+- [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin)
 
-You can find community plugins other than them at [gitbucket community plugins](http://gitbucket-plugins.github.io/).
+You can find more plugins made by the community at [GitBucket community plugins](https://gitbucket-plugins.github.io/).
 
 Support
 --------
 
-- If you have any question about GitBucket, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raise an issue.
+- If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
-- Make sure check whether there is a same question or request in the past.
+- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
-- When raise a new issue, write subject in **English** at least.
+- We can also provide support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
+- Write an issue in English. At least, write subject in English.
-- First priority of GitBucket is easy installation and API compatibility with GitHub, so we might reject if your request is against it.
+- 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.
 
 Release Notes
 -------------
-## 4.8 - 23 Dec 2016
+### 4.16.0 - 2 Sep 2017
+- Support AdminLTE color skin
+- Improve unexpected error handling
+- Show commit status on the commits list
+
+### 4.15.0 - 5 Aug 2017
+- Bundle GitBucket organization plugins
+- Notifications plugin
+- Plugin hot deployment
+- Update Slick to 3.2.1 from 3.2.0
+- Support ed25519 keys for SSH
+- Markdown preview in comment editing forms
+
+### 4.14.1 - 4 Jul 2017
+- Bug fix: Possibility of error in forking repository
+
+### 4.14 - 1 Jul 2017
+- Support priority in issues and pull requests
+- Show icons when the sidebar is collapsed
+- Support gollum events in web hook
+- Support account (user / group) level web hook
+- Add `--max_file_size` option
+- Configuration by system property or environment variable
+
+### 4.13 - 29 May 2017
+- Uploading files into the repository
+- HTML is available in Markdown
+- Added filter box to dropdown menus
+
+### 4.12 - 30 Apr 2017
+- [Gist plug-in](https://github.com/gitbucket/gitbucket-gist-plugin) provides JavaScript to embed snippet
+- Dropdown menu filter in the branch comparing page
+- Caution for the embedded H2 database
+
+### 4.11 - 1 Apr 2017
+- Deploy keys support
+- Auto generate avatar images
+- Collaborators of the private forked repository are copied from the original repository
+- Cache avatar images in the browser
+- New extension point to receive events about repository
+
+### 4.10 - 25 Feb 2017
+- Update to Scala 2.12, Scalatra 2.5 and Slick 3.2
+- Display file size in the file viewer
+
+### 4.9 - 29 Jan 2017
+- GitLFS support
+- Template for issues and pull requests
+- Manual label color editing
+- Account description
+- `--tmp-dir` option for standalone mode
+- More APIs for issues
+  - [List issues for a repository](https://developer.github.com/v3/issues/#list-issues-for-a-repository)
+  - [Create an issue](https://developer.github.com/v3/issues/#create-an-issue)
+
+### 4.8 - 23 Dec 2016
 - Search for repository names from the global header
 - Filter repositories on the sidebar of the dashboard
 - Search issues and wiki

build.sbt

@@ -1,8 +1,8 @@
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.8"
+val GitBucketVersion = "4.16.0"
-val ScalatraVersion = "2.4.1"
+val ScalatraVersion = "2.5.0"
-val JettyVersion = "9.3.9.v20160517"
+val JettyVersion = "9.3.19.v20170502"
 
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)
 
@@ -10,7 +10,7 @@ sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.3"
 
 // dependency settings
 resolvers ++= Seq(
@@ -21,44 +21,48 @@ resolvers ++= Seq(
   "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
 )
 libraryDependencies ++= Seq(
-  "org.scala-lang.modules"   %% "scala-java8-compat"           % "0.7.0",
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.8.0.201706111038-r",
-  "org.eclipse.jgit"          % "org.eclipse.jgit.http.server" % "4.1.2.201602141800-r",
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.8.0.201706111038-r",
-  "org.eclipse.jgit"          % "org.eclipse.jgit.archive"     % "4.1.2.201602141800-r",
   "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
-  "org.json4s"               %% "json4s-jackson"               % "3.3.0",
+  "org.json4s"                      %% "json4s-jackson"               % "3.5.1",
-  "io.github.gitbucket"      %% "scalatra-forms"               % "1.0.0",
+  "io.github.gitbucket"             %% "scalatra-forms"               % "1.1.0",
-  "commons-io"                % "commons-io"                   % "2.4",
+  "commons-io"                      %  "commons-io"                   % "2.5",
-  "io.github.gitbucket"       % "solidbase"                    % "1.0.0",
+  "io.github.gitbucket"             %  "solidbase"                    % "1.0.2",
-  "io.github.gitbucket"       % "markedj"                      % "1.0.9",
+  "io.github.gitbucket"             %  "markedj"                      % "1.0.14",
-  "org.apache.commons"        % "commons-compress"             % "1.11",
+  "org.apache.commons"              %  "commons-compress"             % "1.13",
   "org.apache.commons"              %  "commons-email"                % "1.4",
-  "org.apache.httpcomponents" % "httpclient"                   % "4.5.1",
+  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.3",
-  "org.apache.sshd"           % "apache-sshd"                  % "1.2.0",
+  "org.apache.sshd"                 %  "apache-sshd"                  % "1.4.0" exclude("org.slf4j","slf4j-jdk14"),
-  "org.apache.tika"           % "tika-core"                    % "1.13",
+  "org.apache.tika"                 %  "tika-core"                    % "1.14",
-  "com.typesafe.slick"       %% "slick"                        % "2.1.0",
+  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.10",
+  "joda-time"                       %  "joda-time"                    % "2.9.9",
   "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
-  "com.h2database"            % "h2"                           % "1.4.192",
+  "com.h2database"                  %  "h2"                           % "1.4.195",
-  "mysql"                     % "mysql-connector-java"         % "5.1.39",
+  "org.mariadb.jdbc"                %  "mariadb-java-client"          % "2.0.3",
-  "org.postgresql"            % "postgresql"                   % "9.4.1208",
+  "org.postgresql"                  %  "postgresql"                   % "42.0.0",
-  "ch.qos.logback"            % "logback-classic"              % "1.1.7",
+  "ch.qos.logback"                  %  "logback-classic"              % "1.2.3",
-  "com.zaxxer"                % "HikariCP"                     % "2.4.6",
+  "com.zaxxer"                      %  "HikariCP"                     % "2.6.1",
-  "com.typesafe"              % "config"                       % "1.3.0",
+  "com.typesafe"                    %  "config"                       % "1.3.1",
-  "com.typesafe.akka"        %% "akka-actor"                   % "2.3.15",
+  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.0",
   "fr.brouillard.oss.security.xhub" %  "xhub4j-core"                  % "1.0.0",
   "com.github.bkromhout"            %  "java-diff-utils"              % "2.1.1",
   "org.cache2k"                     %  "cache2k-all"                  % "1.0.0.CR1",
-  "com.enragedginger"        %% "akka-quartz-scheduler"        % "1.4.0-akka-2.3.x" exclude("c3p0","c3p0"),
+  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.0-akka-2.4.x" exclude("c3p0","c3p0"),
+  "net.coobird"                     %  "thumbnailator"                % "0.4.8",
+  "com.github.zafarkhaja"           %  "java-semver"                  % "0.9.0",
   "org.eclipse.jetty"               %  "jetty-webapp"                 % JettyVersion     % "provided",
   "javax.servlet"                   %  "javax.servlet-api"            % "3.1.0"          % "provided",
   "junit"                           %  "junit"                        % "4.12"           % "test",
   "org.scalatra"                    %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "com.wix"                   % "wix-embedded-mysql"           % "1.0.3"          % "test",
+  "org.mockito"                     %  "mockito-core"                 % "2.7.22"         % "test",
-  "ru.yandex.qatools.embed"   % "postgresql-embedded"          % "1.14"           % "test"
+  "com.wix"                         %  "wix-embedded-mysql"           % "2.1.4"          % "test",
+  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.0"            % "test",
+  "net.i2p.crypto"                  % "eddsa"                         % "0.1.0"
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 
@@ -141,6 +145,22 @@ executableKey := {
     IO copyFile (classDir / name, temp / name)
   }
 
+  // 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.parse(json).foreach { case (plugin, version) =>
+    val url = if(plugin == "gitbucket-pages-plugin"){
+      s"https://github.com/gitbucket/${plugin}/releases/download/v${version}/${plugin}_${scalaBinaryVersion.value}-${version}.jar"
+    } else {
+      s"https://github.com/gitbucket/${plugin}/releases/download/${version}/${plugin}_${scalaBinaryVersion.value}-${version}.jar"
+    }
+    log info s"Download: ${url}"
+    IO download(new java.net.URL(url), pluginsDir / s"${plugin}_${scalaBinaryVersion.value}-${version}.jar")
+  }
+
   // zip it up
   IO delete (temp / "META-INF" / "MANIFEST.MF")
   val contentMappings   = (temp.*** --- PathFinder(temp)).get pair relativeTo(temp)
@@ -165,9 +185,9 @@ executableKey := {
   log info s"built executable webapp ${outputFile}"
   outputFile
 }
-publishTo <<= version { (v: String) =>
+publishTo := {
   val nexus = "https://oss.sonatype.org/"
-  if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
+  if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
   else                             Some("releases"  at nexus + "service/local/staging/deploy/maven2")
 }
 publishMavenStyle := true

command.bat

@@ -1,2 +0,0 @@
-%~d0
-cmd /k cd %~p0

contrib/linux/redhat/README.md

@@ -3,6 +3,7 @@
 RPM spec file and init script for Red Hat Enterprise Linux 6.x. 
 
 To create RPM:
+
 1. Edit `../../gitbucket.conf` to suit.
 2. Edit `gitbucket.init` to suit.
 3. Edit `gitbucket.spec` to suit.

doc/how_to_run.md

@@ -1,18 +1,24 @@
 How to run from the source tree
 ========
 
+Install [sbt](http://www.scala-sbt.org/index.html) at first.
+
+```
+$ brew install sbt
+```
+
 Run for Development
 --------
 
-If you want to test GitBucket, input following command at the root directory of the source tree.
+If you want to test GitBucket, type the following command in the root directory of the source tree.
 
 ```
 $ sbt ~jetty:start
 ```
 
-Then access to `http://localhost:8080/` by your browser. The default administrator account is `root` and password is `root`.
+Then access `http://localhost:8080/` in your browser. The default administrator account is `root` and password is `root`.
 
-Source code modification is detected and reloaded automatically. You can modify logging configuration by editing `src/main/resources/logback-dev.xml`.
+Source code modifications are detected and a reloaded happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`.
 
 Build war file
 --------
@@ -23,9 +29,9 @@ To build war file, run the following command:
 $ sbt package
 ```
 
-`gitbucket_2.11-x.x.x.war` is generated into `target/scala-2.11`.
+`gitbucket_2.12-x.x.x.war` is generated into `target/scala-2.12`.
 
-To build executable war file, run
+To build an executable war file, run
 
 ```
 $ sbt executable
@@ -35,8 +41,8 @@ at the top of the source tree. It generates executable `gitbucket.war` into `tar
 
 Run tests spec
 ---------
-To run the full serie of tests, run the following command:
+To run the full series of tests, run the following command:
 
 ```
-sbt test
+$ sbt test
 ```

doc/jrebel.md

@@ -1,7 +1,7 @@
 JRebel integration (optional)
 =============================
 
-[JRebel](http://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
+[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 following slow "app restart" in sbt following a code change:
 
 ```
@@ -22,12 +22,12 @@ Sign up for a [usage plan](https://my.jrebel.com/). You will need to create an a
 
 ## 2. Download JRebel
 
-Download the most recent ["nosetup" JRebel zip](http://zeroturnaround.com/software/jrebel/download/prev-releases/).
+Download the most recent ["nosetup" JRebel zip](https://zeroturnaround.com/software/jrebel/download/prev-releases/).
 Next, unzip the downloaded file.
 
 ## 3. Activate
 
-Follow the [instructions on the JRebel website](http://zeroturnaround.com/software/jrebel/download/prev-releases/) to activate your downloaded JRebel.
+Follow the [instructions on the JRebel website](https://zeroturnaround.com/software/jrebel/download/prev-releases/) to activate your downloaded JRebel.
 
 You can use the default settings for all the configurations.
 

doc/notification.md

@@ -1,23 +0,0 @@
-Notification Email
-========
-
-GitBucket sends email to target users by enabling the notification email by an administrator.
-
-The timing of the notification are as follows:
-
-##### at the issue registration (new issue, new pull request)
-When a record is saved into the ```ISSUE``` table, GitBucket does the notification.
-
-##### at the comment registration
-Among the records in the ```ISSUE_COMMENT``` table, them to be counted as a comment (i.e. the record ```ACTION``` column value is "comment" or "close_comment" or "reopen_comment") are saved, GitBucket does the notification.
-
-##### at the status update (close, reopen, merge)
-When the ```CLOSED``` column value is updated, GitBucket does the notification.
-
-Notified users are as follows:
-
-* individual repository's owner
-* collaborators
-* participants
-
-However, the operation in person is excluded from the target.

doc/readme.md

@@ -6,7 +6,6 @@ Developer's Guide
  * [Authentication in Controller](authenticator.md)
  * [About Action in Issue Comment](comment_action.md)
  * [Activity Types](activity.md)
- * [Notification Email](notification.md)
  * [Automatic Schema Updating](auto_update.md)
  * [Release Operation](release.md)
  * [JRebel integration (optional)](jrebel.md)

doc/release.md

@@ -34,8 +34,6 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 Generate release files
 --------
 
-Note: Release operation requires [Ant](http://ant.apache.org/) and [Maven](https://maven.apache.org/).
-
 ### Make release war file
 
 Run `sbt executable`. The release war file and fingerprint are generated into `target/executable/gitbucket.war`.
@@ -52,4 +50,12 @@ For plug-in development, we have to publish the GitBucket jar file to the Maven
 $ sbt publish-signed
 ```
 
-Then operate release sequence at https://oss.sonatype.org/.
+Then logged-in https://oss.sonatype.org/ and delete following files from the staging repository:
+
+- gitbucket_2.12-x.x.x.war
+- gitbucket_2.12-x.x.x.war.asc
+- gitbucket_2.12-x.x.x.war.asc.md5
+- gitbucket_2.12-x.x.x.war.asc.sha1
+- gitbucket_2.12-x.x.x.war.md5
+
+At last, close and release the repository.

plugins.json

@@ -0,0 +1,54 @@
+[
+  {
+    "id": "notifications",
+    "name": "Notifications Plugin",
+    "description": "Provides notifications feature on GitBucket.",
+    "versions": [
+      {
+        "version": "1.1.0",
+        "range": ">=4.16.0",
+        "file": "gitbucket-notifications-plugin_2.12-1.1.0.jar"
+      }
+    ],
+    "default": true
+  },
+  {
+    "id": "emoji",
+    "name": "Emoji Plugin",
+    "description": "Provides Emoji support for GitBucket.",
+    "versions": [
+      {
+        "version": "4.4.0",
+        "range": ">=4.10.0",
+        "file": "gitbucket-emoji-plugin_2.12-4.4.0.jar"
+      }
+    ],
+    "default": false
+  },
+  {
+    "id": "gist",
+    "name": "Gist Plugin",
+    "description": "Provides Gist feature on GitBucket.",
+    "versions": [
+      {
+        "version": "4.10.0",
+        "range": ">=4.15.0",
+        "file": "gitbucket-gist-plugin_2.12-4.10.0.jar"
+      }
+    ],
+    "default": false
+  },
+  {
+    "id": "pages",
+    "name": "Pages Plugin",
+    "description": "Project pages for gitbucket",
+    "versions": [
+      {
+        "version": "1.5.0",
+        "range": ">=4.15.0",
+        "file": "gitbucket-pages-plugin_2.12-1.5.0.jar"
+      }
+    ],
+    "default": false
+  }
+]

project/Checksums.scala

@@ -1,7 +1,6 @@
-import java.security.MessageDigest;
+import java.security.MessageDigest
 import scala.annotation._
 import sbt._
-import sbt.Using._
 
 object Checksums {
   private val bufferSize = 2048

project/PluginsJson.scala

@@ -0,0 +1,17 @@
+import com.eclipsesource.json.Json
+import scala.collection.JavaConverters._
+
+object PluginsJson {
+
+  def parse(json: String): Seq[(String, String)] = {
+    val value = Json.parse(json)
+    value.asArray.values.asScala.map { plugin =>
+      val obj = plugin.asObject.get("versions").asArray.asScala.head.asObject
+      val pluginName = obj.get("file").asString.split("_2.12-").head
+      val version = obj.get("version").asString
+      (pluginName, version)
+    }
+  }
+
+}
+

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.15

project/build.sbt

@@ -0,0 +1 @@
+libraryDependencies += "com.eclipsesource.minimal-json" % "minimal-json" % "0.9.4"

project/plugins.sbt

@@ -1,7 +1,8 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.0.4")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.0")
-addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.12.0")
+addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.3")
-addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "2.1.0")
+addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "2.1.1")
 addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
 addSbtPlugin("com.typesafe.sbt"     % "sbt-pgp"           % "0.8.3")
+addSbtPlugin("io.get-coursier"      % "sbt-coursier"      % "1.0.0-M15")

project/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")

sbt.bat

@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.12.jar" %*

sbt.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.12.jar "$@"

src/main/java/JettyLauncher.java

@@ -1,4 +1,9 @@
+import org.eclipse.jetty.server.ConnectionFactory;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.StatisticsHandler;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
@@ -8,24 +13,47 @@ import java.security.ProtectionDomain;
 
 public class JettyLauncher {
     public static void main(String[] args) throws Exception {
+        System.setProperty("java.awt.headless", "true");
+
         String host = null;
         int port = 8080;
         InetSocketAddress address = null;
         String contextPath = "/";
+        String tmpDirPath="";
         boolean forceHttps = false;
 
         for(String arg: args) {
             if(arg.startsWith("--") && arg.contains("=")) {
                 String[] dim = arg.split("=");
                 if(dim.length >= 2) {
-                    if(dim[0].equals("--host")) {
+                    switch (dim[0]) {
+                        case "--host":
                             host = dim[1];
-                    } else if(dim[0].equals("--port")) {
+                            break;
+                        case "--port":
                             port = Integer.parseInt(dim[1]);
-                    } else if(dim[0].equals("--prefix")) {
+                            break;
+                        case "--prefix":
                             contextPath = dim[1];
-                    } else if(dim[0].equals("--gitbucket.home")){
+                            if (!contextPath.startsWith("/")) {
+                                contextPath = "/" + contextPath;
+                            }
+                            break;
+                        case "--max_file_size":
+                            System.setProperty("gitbucket.maxFileSize", dim[1]);
+                            break;
+                        case "--gitbucket.home":
                             System.setProperty("gitbucket.home", dim[1]);
+                            break;
+                        case "--temp_dir":
+                            tmpDirPath = dim[1];
+                            break;
+                        case "--plugin_dir":
+                            System.setProperty("gitbucket.pluginDir", dim[1]);
+                            break;
+                        case "--validate_password":
+                            System.setProperty("gitbucket.validate.password", dim[1]);
+                            break;
                     }
                 }
             }
@@ -48,14 +76,38 @@ public class JettyLauncher {
 //        connector.setPort(port);
 //        server.addConnector(connector);
 
+        // Disabling Server header
+        for (Connector connector : server.getConnectors()) {
+            for (ConnectionFactory factory : connector.getConnectionFactories()) {
+                if (factory instanceof HttpConnectionFactory) {
+                    ((HttpConnectionFactory) factory).getHttpConfiguration().setSendServerVersion(false);
+                }
+            }
+        }
+
         WebAppContext context = new WebAppContext();
 
-        File tmpDir = new File(getGitBucketHome(), "tmp");
+        File tmpDir;
+        if(tmpDirPath.equals("")){
+            tmpDir = new File(getGitBucketHome(), "tmp");
             if(!tmpDir.exists()){
                 tmpDir.mkdirs();
             }
+        } else {
+            tmpDir = new File(tmpDirPath);
+            if(!tmpDir.exists()){
+                throw new java.io.FileNotFoundException(
+                    String.format("temp_dir \"%s\" not found", tmpDirPath));
+            } else if(!tmpDir.isDirectory()) {
+                throw new IllegalArgumentException(
+                    String.format("temp_dir \"%s\" is not a directory", tmpDirPath));
+            }
+        }
         context.setTempDirectory(tmpDir);
 
+        // Disabling the directory listing feature.
+        context.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
+
         ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
         URL location = domain.getCodeSource().getLocation();
 
@@ -67,7 +119,9 @@ public class JettyLauncher {
             context.setInitParameter("org.scalatra.ForceHttps", "true");
         }
 
-        server.setHandler(context);
+        Handler handler = addStatisticsHandler(context);
+
+        server.setHandler(handler);
         server.setStopAtShutdown(true);
         server.setStopTimeout(7_000);
         server.start();
@@ -86,14 +140,11 @@ public class JettyLauncher {
         return new File(System.getProperty("user.home"), ".gitbucket");
     }
 
-    private static void deleteDirectory(File dir){
+    private static Handler addStatisticsHandler(Handler handler) {
-        for(File file: dir.listFiles()){
+        // The graceful shutdown is implemented via the statistics handler.
-            if(file.isFile()){
+        // See the following: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420142
-                file.delete();
+        final StatisticsHandler statisticsHandler = new StatisticsHandler();
-            } else if(file.isDirectory()){
+        statisticsHandler.setHandler(handler);
-                deleteDirectory(file);
+        return statisticsHandler;
-            }
-        }
-        dir.delete();
     }
 }

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="DEPLOY_KEY">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="DEPLOY_KEY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="TITLE" type="varchar(100)" nullable="false"/>
+    <column name="PUBLIC_KEY" type="text" nullable="false"/>
+    <column name="ALLOW_WRITE" type="boolean" nullable="false" defaultValueBoolean="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_DEPLOY_KEY_PK" tableName="DEPLOY_KEY" columnNames="USER_NAME, REPOSITORY_NAME, DEPLOY_KEY_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_DEPLOY_KEY_FK0" baseTableName="DEPLOY_KEY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.14.sql

@@ -0,0 +1,26 @@
+CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+
+ SELECT
+   A.USER_NAME,
+   A.REPOSITORY_NAME,
+   A.ISSUE_ID,
+   COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT,
+   COALESCE(D.ORDERING, 9999) AS PRIORITY
+
+ FROM ISSUE A
+
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+   WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) B
+ ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
+
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) C
+ ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID)
+
+ LEFT OUTER JOIN PRIORITY D
+ ON (A.PRIORITY_ID = D.PRIORITY_ID);

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="PRIORITY">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="PRIORITY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="PRIORITY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="DESCRIPTION" type="varchar(255)" nullable="true"/>
+    <column name="ORDERING" type="int" nullable="false"/>
+    <column name="IS_DEFAULT" type="boolean" nullable="false"/>
+    <column name="COLOR" type="char(6)" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_PRIORITY_PK" tableName="PRIORITY" columnNames="USER_NAME, REPOSITORY_NAME, PRIORITY_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_PRIORITY_FK0" baseTableName="PRIORITY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+
+  <addColumn tableName="ISSUE">
+    <column name="PRIORITY_ID" type="int" nullable="true" />
+  </addColumn>
+
+  <addForeignKeyConstraint constraintName="IDX_ISSUE_FK3" baseTableName="ISSUE" baseColumnNames="PRIORITY_ID" referencedTableName="PRIORITY" referencedColumnNames="PRIORITY_ID"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="TOKEN" type="varchar(100)" nullable="true"/>
+    <column name="CTYPE" type="varchar(10)" nullable="true"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_ACCOUNT_WEB_HOOK_PK" tableName="ACCOUNT_WEB_HOOK" columnNames="USER_NAME, URL"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_WEB_HOOK_FK0" baseTableName="ACCOUNT_WEB_HOOK" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK_EVENT">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="EVENT" type="varchar(30)" nullable="false"/>
+  </createTable>
+</changeSet>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="ACCOUNT">
+    <column name="DESCRIPTION" type="text" nullable="true" />
+  </addColumn>
+</changeSet>

src/main/scala/ScalatraBootstrap.scala

@@ -25,15 +25,12 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
     context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
     context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
-    context.addFilter("ghCompatRepositoryAccessFilter", new GHCompatRepositoryAccessFilter)
-    context.getFilterRegistration("ghCompatRepositoryAccessFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
     // Register controllers
-    context.mount(new AnonymousAccessController, "/*")
+    context.mount(new PreProcessController, "/*")
 
-    PluginRegistry().getControllers.foreach { case (controller, path) =>
+    context.addFilter("pluginControllerFilter", new PluginControllerFilter)
-      context.mount(controller, path)
+    context.getFilterRegistration("pluginControllerFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
-    }
 
     context.mount(new IndexController, "/")
     context.mount(new ApiController, "/api/v3")
@@ -44,6 +41,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     context.mount(new RepositoryViewerController, "/*")
     context.mount(new WikiController, "/*")
     context.mount(new LabelsController, "/*")
+    context.mount(new PrioritiesController, "/*")
     context.mount(new MilestonesController, "/*")
     context.mount(new IssuesController, "/*")
     context.mount(new PullRequestsController, "/*")

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

@@ -24,5 +24,22 @@ object GitBucketCoreModule extends Module("gitbucket-core",
     new SqlMigration("update/gitbucket-core_4.7.sql")
   ),
   new Version("4.7.1"),
-  new Version("4.8")
+  new Version("4.8"),
+  new Version("4.9.0",
+    new LiquibaseMigration("update/gitbucket-core_4.9.xml")
+  ),
+  new Version("4.10.0"),
+  new Version("4.11.0",
+    new LiquibaseMigration("update/gitbucket-core_4.11.xml")
+  ),
+  new Version("4.12.0"),
+  new Version("4.12.1"),
+  new Version("4.13.0"),
+  new Version("4.14.0",
+    new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
+    new SqlMigration("update/gitbucket-core_4.14.sql")
+  ),
+  new Version("4.14.1"),
+  new Version("4.15.0"),
+  new Version("4.16.0")
 )

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

@@ -8,7 +8,7 @@ import gitbucket.core.util.RepositoryName
  */
 case class ApiBranch(
   name: String,
-  // commit: ApiBranchCommit,
+  commit: ApiBranchCommit,
   protection: ApiBranchProtection)(repositoryName:RepositoryName) extends FieldSerializable {
   def _links = Map(
    "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),

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

@@ -1,18 +1,28 @@
 package gitbucket.core.api
 
-import gitbucket.core.util.JGitUtil.FileInfo
+import java.util.Base64
-import org.apache.commons.codec.binary.Base64
 
-case class ApiContents(`type`: String, name: String, content: Option[String], encoding: Option[String])
+import gitbucket.core.util.JGitUtil.FileInfo
+import gitbucket.core.util.RepositoryName
+
+case class ApiContents(
+  `type`: String,
+  name: String,
+  path: String,
+  sha: String,
+  content: Option[String],
+  encoding: Option[String])(repositoryName: RepositoryName){
+  val download_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/raw/${sha}/${path}")
+}
 
 object ApiContents{
-  def apply(fileInfo: FileInfo, content: Option[Array[Byte]]): ApiContents = {
+  def apply(fileInfo: FileInfo, repositoryName: RepositoryName, content: Option[Array[Byte]]): ApiContents = {
     if(fileInfo.isDirectory) {
-      ApiContents("dir", fileInfo.name, None, None)
+      ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)
     } else {
       content.map(arr =>
-        ApiContents("file", fileInfo.name, Some(Base64.encodeBase64String(arr)), Some("base64"))
+        ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.getEncoder.encodeToString(arr)), Some("base64"))(repositoryName)
-      ).getOrElse(ApiContents("file", fileInfo.name, None, None))
+      ).getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
     }
   }
 }

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

@@ -37,7 +37,7 @@ object ApiRepository{
       name           = repository.repositoryName,
       full_name      = s"${repository.userName}/${repository.repositoryName}",
       description    = repository.description.getOrElse(""),
-      watchers       = 0,
+      watchers       = watchers,
       forks          = forkedCount,
       `private`      = repository.isPrivate,
       default_branch = repository.defaultBranch,
@@ -53,4 +53,14 @@ object ApiRepository{
   def forPushPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
     ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount, urlIsHtmlUrl=true)
 
+  def forDummyPayload(owner: ApiUser): ApiRepository =
+    ApiRepository(
+      name="dummy",
+      full_name=s"${owner.login}/dummy",
+      description="",
+      watchers=0,
+      forks=0,
+      `private`=false,
+      default_branch="master",
+      owner=owner)(true)
 }

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

@@ -19,8 +19,8 @@ case class CreateAStatus(
   def isValid: Boolean = {
     CommitState.valueOf(state).isDefined &&
       // only http
-      target_url.filterNot(f => "\\Ahttps?://".r.findPrefixOf(f).isDefined && f.length<255).isEmpty &&
+      target_url.forall(f => "\\Ahttps?://".r.findPrefixOf(f).isDefined && f.length < 255) &&
-      context.filterNot(f => f.length<255).isEmpty &&
+      context.forall(f => f.length < 255) &&
-      description.filterNot(f => f.length<1000).isEmpty
+      description.forall(f => f.length < 1000)
   }
 }

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

@@ -0,0 +1,11 @@
+package gitbucket.core.api
+
+/**
+  * https://developer.github.com/v3/issues/#create-an-issue
+  */
+case class CreateAnIssue(
+    title: String,
+    body: Option[String],
+    assignees: List[String],
+    milestone: Option[Int],
+    labels: List[String])

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

@@ -31,6 +31,7 @@ object JsonFormat {
     FieldSerializer[ApiPullRequest.Commit]() +
     FieldSerializer[ApiIssue]() +
     FieldSerializer[ApiComment]() +
+    FieldSerializer[ApiContents]() +
     FieldSerializer[ApiLabel]() +
     ApiBranchProtection.enforcementLevelSerializer
 

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

@@ -2,37 +2,37 @@ package gitbucket.core.controller
 
 import gitbucket.core.account.html
 import gitbucket.core.helper
-import gitbucket.core.model.GroupMember
+import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, RepositoryWebHookEvent, Role, WebHook, WebHookContentType}
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
+import gitbucket.core.service.WebHookService._
 import gitbucket.core.ssh.SshUtil
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util._
-
 import io.github.gitbucket.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.scalatra.BadRequest
 
-
 class AccountController extends AccountControllerBase
   with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
   with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-  with AccessTokenService with WebHookService with RepositoryCreationService
+  with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService
 
 
 trait AccountControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
     with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-    with AccessTokenService with WebHookService with RepositoryCreationService =>
+    with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService =>
 
   case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
-                            url: Option[String], fileId: Option[String])
+                            description: Option[String], url: Option[String], fileId: Option[String])
 
   case class AccountEditForm(password: Option[String], fullName: String, mailAddress: String,
-                             url: Option[String], fileId: Option[String], clearImage: Boolean)
+                             description: Option[String], url: Option[String], fileId: Option[String], clearImage: Boolean)
 
   case class SshKeyForm(title: String, publicKey: String)
 
@@ -40,17 +40,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   val newForm = mapping(
     "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
+    "password"    -> trim(label("Password"     , text(required, maxlength(20), password))),
     "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
+    "description" -> trim(label("bio"          , optional(text()))),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      , optional(text())))
   )(AccountNewForm.apply)
 
   val editForm = mapping(
-    "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
+    "password"    -> trim(label("Password"     , optional(text(maxlength(20), password)))),
     "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "description" -> trim(label("bio"          , optional(text()))),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      , optional(text()))),
     "clearImage"  -> trim(label("Clear image"  , boolean()))
@@ -58,18 +60,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   val sshKeyForm = mapping(
     "title"     -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey" -> trim(label("Key"  , text(required, validPublicKey)))
+    "publicKey" -> trim2(label("Key" , text(required, validPublicKey)))
   )(SshKeyForm.apply)
 
   val personalTokenForm = mapping(
     "note" -> trim(label("Token", text(required, maxlength(100))))
   )(PersonalTokenForm.apply)
 
-  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
+  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String)
-  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
+  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
 
   val newGroupForm = mapping(
     "groupName"   -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "description" -> trim(label("Group description", optional(text()))),
     "url"         -> trim(label("URL"        ,optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"    ,optional(text()))),
     "members"     -> trim(label("Members"    ,text(required, members)))
@@ -77,6 +80,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   val editGroupForm = mapping(
     "groupName"   -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "description" -> trim(label("Group description", optional(text()))),
     "url"         -> trim(label("URL"         ,optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"     ,optional(text()))),
     "members"     -> trim(label("Members"     ,text(required, members))),
@@ -105,6 +109,47 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "account" -> trim(label("Group/User name", text(required, validAccountName)))
   )(AccountForm.apply)
 
+  // for account web hook url addition.
+  case class AccountWebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
+
+  def accountWebHookForm(update:Boolean) = mapping(
+    "url"    -> trim(label("url", text(required, accountWebHook(update)))),
+    "events" -> accountWebhookEvents,
+    "ctype" -> label("ctype", text()),
+    "token" -> optional(trim(label("token", text(maxlength(100)))))
+  )(
+    (url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+  )
+  /**
+    * Provides duplication check for web hook url. duplicated from RepositorySettingsController.scala
+    */
+  private def accountWebHook(needExists: Boolean): Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(getAccountWebHook(params("userName"), value).isDefined != needExists){
+        Some(if(needExists){
+          "URL had not been registered yet."
+        } else {
+          "URL had been registered already."
+        })
+      } else {
+        None
+      }
+  }
+
+  private def accountWebhookEvents = new ValueType[Set[WebHook.Event]]{
+    def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
+      WebHook.Event.values.flatMap { t =>
+        params.get(name + "." + t.name).map(_ => t)
+      }.toSet
+    }
+    def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+      Seq(name -> messages("error.required").format(name))
+    } else {
+      Nil
+    }
+  }
+
+
   /**
    * Displays user information.
    */
@@ -145,10 +190,20 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   get("/:userName/_avatar"){
     val userName = params("userName")
-    getAccountByUserName(userName).flatMap(_.image).map { image =>
-      RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
-    } getOrElse {
     contentType = "image/png"
+    getAccountByUserName(userName).flatMap{ account =>
+      response.setDateHeader("Last-Modified", account.updatedDate.getTime)
+      account.image.map{ image =>
+        Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image)))
+      }.getOrElse{
+        if (account.isGroupAccount) {
+          TextAvatarUtil.textGroupAvatar(account.fullName)
+        } else {
+          TextAvatarUtil.textAvatar(account.fullName)
+        }
+      }
+    }.getOrElse{
+      response.setHeader("Cache-Control", "max-age=3600")
       Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
     }
   }
@@ -167,6 +222,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         password    = form.password.map(sha1).getOrElse(account.password),
         fullName    = form.fullName,
         mailAddress = form.mailAddress,
+        description = form.description,
         url         = form.url))
 
       updateImage(userName, form.fileId, form.clearImage)
@@ -176,6 +232,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     } getOrElse NotFound()
   })
 
+  get("/captures/(.*)".r) {
+    multiParams("captures").head
+  }
+
   get("/:userName/_delete")(oneselfOnly {
     val userName = params("userName")
 
@@ -191,9 +251,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
 //        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
 //      }
-//      // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+        // Remove from GROUP_MEMBER and COLLABORATOR
         removeUserRelatedData(userName)
         updateAccount(account.copy(isRemoved = true))
+
+        // call hooks
+        PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
         session.invalidate
         redirect("/")
       }
@@ -254,6 +318,113 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     redirect(s"/${userName}/_application")
   })
 
+  get("/:userName/_hooks")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { account =>
+      gitbucket.core.account.html.hooks(account, getAccountWebHooks(account.userName), flash.get("info"))
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Display the account web hook edit page.
+   */
+  get("/:userName/_hooks/new")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { account =>
+      val webhook = AccountWebHook(userName, "", WebHookContentType.FORM, None)
+      html.edithook(webhook, Set(WebHook.Push), account, true)
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Add the account web hook URL.
+   */
+  post("/:userName/_hooks/new", accountWebHookForm(false))(oneselfOnly { form =>
+    val userName = params("userName")
+    addAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
+    flash += "info" -> s"Webhook ${form.url} created"
+    redirect(s"/${userName}/_hooks")
+  })
+
+  /**
+   * Delete the account web hook URL.
+   */
+  get("/:userName/_hooks/delete")(oneselfOnly {
+    val userName = params("userName")
+    deleteAccountWebHook(userName, params("url"))
+    flash += "info" -> s"Webhook ${params("url")} deleted"
+    redirect(s"/${userName}/_hooks")
+  })
+
+  /**
+   * Display the account web hook edit page.
+   */
+  get("/:userName/_hooks/edit")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).flatMap { account =>
+      getAccountWebHook(userName, params("url")).map { case (webhook, events) =>
+        html.edithook(webhook, events, account, false)
+      }
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Update account web hook settings.
+   */
+  post("/:userName/_hooks/edit", accountWebHookForm(true))(oneselfOnly { form =>
+    val userName = params("userName")
+    updateAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
+    flash += "info" -> s"webhook ${form.url} updated"
+    redirect(s"/${userName}/_hooks")
+  })
+
+  /**
+   * Send the test request to registered account web hook URLs.
+   */
+  ajaxPost("/:userName/_hooks/test")(oneselfOnly {
+    // TODO Is it possible to merge with [[RepositorySettingsController.ajaxPost]]?
+    import scala.concurrent.duration._
+    import scala.concurrent._
+    import scala.util.control.NonFatal
+    import org.apache.http.util.EntityUtils
+    import scala.concurrent.ExecutionContext.Implicits.global
+
+    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h => Array(h.getName, h.getValue) }
+
+    val userName = params("userName")
+    val url = params("url")
+    val token = Some(params("token"))
+    val ctype = WebHookContentType.valueOf(params("ctype"))
+    val dummyWebHookInfo = RepositoryWebHook(userName, "dummy", url, ctype, token)
+    val dummyPayload = {
+      val ownerAccount = getAccountByUserName(userName).get
+      WebHookPushPayload.createDummyPayload(ownerAccount)
+    }
+
+    val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
+
+    val toErrorMap: PartialFunction[Throwable, Map[String,String]] = {
+      case e: java.net.UnknownHostException => Map("error"-> ("Unknown host " + e.getMessage))
+      case e: java.lang.IllegalArgumentException => Map("error"-> ("invalid url"))
+      case e: org.apache.http.client.ClientProtocolException => Map("error"-> ("invalid url"))
+      case NonFatal(e) => Map("error"-> (e.getClass + " "+ e.getMessage))
+    }
+
+    contentType = formats("json")
+    org.json4s.jackson.Serialization.write(Map(
+      "url" -> url,
+      "request" -> Await.result(reqFuture.map(req => Map(
+        "headers" -> _headers(req.getAllHeaders),
+        "payload" -> json
+      )).recover(toErrorMap), 20 seconds),
+      "response" -> Await.result(resFuture.map(res => Map(
+        "status"  -> res.getStatusLine(),
+        "body"    -> EntityUtils.toString(res.getEntity()),
+        "headers" -> _headers(res.getAllHeaders())
+      )).recover(toErrorMap), 20 seconds)
+    ))
+  })
+
   get("/register"){
     if(context.settings.allowAccountRegistration){
       if(context.loginAccount.isDefined){
@@ -266,18 +437,18 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   post("/register", newForm){ form =>
     if(context.settings.allowAccountRegistration){
-      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
+      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.description, form.url)
       updateImage(form.userName, form.fileId, false)
       redirect("/signin")
     } else NotFound()
   }
 
   get("/groups/new")(usersOnly {
-    html.group(None, List(GroupMember("", context.loginAccount.get.userName, true)))
+    html.creategroup(List(GroupMember("", context.loginAccount.get.userName, true)))
   })
 
   post("/groups/new", newGroupForm)(usersOnly { form =>
-    createGroup(form.groupName, form.url)
+    createGroup(form.groupName, form.description, form.url)
     updateGroupMembers(form.groupName, form.members.split(",").map {
       _.split(":") match {
         case Array(userName, isManager) => (userName, isManager.toBoolean)
@@ -289,7 +460,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   get("/:groupName/_editgroup")(managersOnly {
     defining(params("groupName")){ groupName =>
-      html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+      // TODO Don't use Option.get
+      getAccountByUserName(groupName, true).map { account =>
+        html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
+      } getOrElse NotFound()
     }
   })
 
@@ -297,13 +471,17 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     defining(params("groupName")){ groupName =>
       // Remove from GROUP_MEMBER
       updateGroupMembers(groupName, Nil)
-      // Remove repositories
+      // Disable group
-      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
+      getAccountByUserName(groupName, false).foreach { account =>
-        deleteRepository(groupName, repositoryName)
+        updateGroup(groupName, account.description, account.url, true)
-        FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
-        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
-        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
       }
+//      // Remove repositories
+//      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
+//        deleteRepository(groupName, repositoryName)
+//        FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+//        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+//        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+//      }
     }
     redirect("/")
   })
@@ -315,7 +493,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       }
     }.toList){ case (groupName, members) =>
       getAccountByUserName(groupName, true).map { account =>
-        updateGroup(groupName, form.url, false)
+        updateGroup(groupName, form.description, form.url, false)
 
         // Update GROUP_MEMBER
         updateGroupMembers(form.groupName, members)
@@ -328,7 +506,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        }
 
         updateImage(form.groupName, form.fileId, form.clearImage)
-        redirect(s"/${form.groupName}")
+
+        flash += "info" -> "Account information has been updated."
+        redirect(s"/${groupName}/_editgroup")
 
       } getOrElse NotFound()
     }
@@ -347,12 +527,16 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   post("/new", newRepositoryForm)(usersOnly { form =>
     LockUtil.lock(s"${form.owner}/${form.name}"){
       if(getRepository(form.owner, form.name).isEmpty){
+        // Create the repository
         createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.createReadme)
+
+        // Call hooks
+        PluginRegistry().getRepositoryHooks.foreach(_.created(form.owner, form.name))
+      }
     }
 
     // redirect to the repository
     redirect(s"/${form.owner}/${form.name}")
-    }
   })
 
   get("/:owner/:repository/fork")(readableUsersOnly { repository =>
@@ -402,29 +586,42 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             parentUserName       = Some(repository.owner)
           )
 
-//          // Add collaborators for group repository
+          // Set default collaborators for the private fork
-//          val ownerAccount = getAccountByUserName(accountName).get
+          if(repository.repository.isPrivate){
-//          if(ownerAccount.isGroupAccount){
+            // Copy collaborators from the source repository
-//            getGroupMembers(accountName).foreach { member =>
+            getCollaborators(repository.owner, repository.name).foreach { case (collaborator, _) =>
-//              addCollaborator(accountName, repository.name, member.userName)
+              addCollaborator(accountName, repository.name, collaborator.collaboratorName, collaborator.role)
-//            }
+            }
-//          }
+            // Register an owner of the source repository as a collaborator
+            addCollaborator(accountName, repository.name, repository.owner, Role.ADMIN.name)
+          }
 
           // Insert default labels
           insertDefaultLabels(accountName, repository.name)
+          // Insert default priorities
+          insertDefaultPriorities(accountName, repository.name)
 
           // clone repository actually
           JGitUtil.cloneRepository(
             getRepositoryDir(repository.owner, repository.name),
-            getRepositoryDir(accountName, repository.name))
+            FileUtil.deleteIfExists(getRepositoryDir(accountName, repository.name)))
 
           // Create Wiki repository
-          JGitUtil.cloneRepository(
+          JGitUtil.cloneRepository(getWikiRepositoryDir(repository.owner, repository.name),
-            getWikiRepositoryDir(repository.owner, repository.name),
+            FileUtil.deleteIfExists(getWikiRepositoryDir(accountName, repository.name)))
-            getWikiRepositoryDir(accountName, repository.name))
+
+          // Copy LFS files
+          val lfsDir = getLfsDir(repository.owner, repository.name)
+          if(lfsDir.exists){
+            FileUtils.copyDirectory(lfsDir, FileUtil.deleteIfExists(getLfsDir(accountName, repository.name)))
+          }
 
           // Record activity
           recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
+
+          // Call hooks
+          PluginRegistry().getRepositoryHooks.foreach(_.forked(repository.owner, accountName, repository.name))
+
           // redirect to the repository
           redirect(s"/${accountName}/${repository.name}")
         }

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

@@ -1,14 +0,0 @@
-package gitbucket.core.controller
-
-class AnonymousAccessController extends AnonymousAccessControllerBase
-
-trait AnonymousAccessControllerBase extends ControllerBase {
-  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
-    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
-      !context.currentPath.startsWith("/register")) {
-      Unauthorized()
-    } else {
-      pass()
-    }
-  }
-}

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

@@ -5,14 +5,15 @@ import gitbucket.core.model._
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service._
-import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.JGitUtil._
-import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.view.helpers.{renderMarkup, isRenderable}
+import gitbucket.core.util.JGitUtil._
+import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util._
+import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
 import org.eclipse.jgit.api.Git
-import org.scalatra.{NoContent, UnprocessableEntity, Created}
+import org.scalatra.{Created, NoContent, UnprocessableEntity}
+
 import scala.collection.JavaConverters._
 
 class ApiController extends ApiControllerBase
@@ -21,16 +22,19 @@ class ApiController extends ApiControllerBase
   with ProtectedBranchService
   with IssuesService
   with LabelsService
+  with MilestonesService
   with PullRequestService
   with CommitsService
   with CommitStatusService
   with RepositoryCreationService
+  with IssueCreationService
   with HandleCommentService
   with WebHookService
   with WebHookPullRequestService
   with WebHookIssueCommentService
   with WikiService
   with ActivityService
+  with PrioritiesService
   with OwnerAuthenticator
   with UsersAuthenticator
   with GroupManagerAuthenticator
@@ -44,10 +48,13 @@ trait ApiControllerBase extends ControllerBase {
     with ProtectedBranchService
     with IssuesService
     with LabelsService
+    with MilestonesService
     with PullRequestService
     with CommitStatusService
     with RepositoryCreationService
+    with IssueCreationService
     with HandleCommentService
+    with PrioritiesService
     with OwnerAuthenticator
     with UsersAuthenticator
     with GroupManagerAuthenticator
@@ -55,6 +62,13 @@ trait ApiControllerBase extends ControllerBase {
     with ReadableUsersAuthenticator
     with WritableUsersAuthenticator =>
 
+  /**
+    * 404 for non-implemented api
+    */
+  get("/api/v3/*") {
+    NotFound()
+  }
+
   /**
     * https://developer.github.com/v3/#root-endpoint
     */
@@ -73,9 +87,10 @@ trait ApiControllerBase extends ControllerBase {
 
   /**
    * https://developer.github.com/v3/users/#get-a-single-user
+   * This API also returns group information (as GitHub).
    */
   get("/api/v3/users/:userName") {
-    getAccountByUserName(params("userName")).filterNot(account => account.isGroupAccount).map { account =>
+    getAccountByUserName(params("userName")).map { account =>
       JsonFormat(ApiUser(account))
     } getOrElse NotFound()
   }
@@ -107,6 +122,20 @@ trait ApiControllerBase extends ControllerBase {
     })
   })
 
+  /**
+    * https://developer.github.com/v3/repos/branches/#get-branch
+    */
+  get ("/api/v3/repos/:owner/:repo/branches/*")(referrersOnly { repository =>
+    //import gitbucket.core.api._
+    (for{
+      branch <- params.get("splat") if repository.branchList.contains(branch)
+      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
+    } yield {
+      val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
+      JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), ApiBranchProtection(protection))(RepositoryName(repository)))
+    }) getOrElse NotFound()
+  })
+
   /*
    * https://developer.github.com/v3/repos/contents/#get-contents
    */
@@ -158,11 +187,11 @@ trait ApiControllerBase extends ControllerBase {
               )
             }
             case _ =>
-              Some(JsonFormat(ApiContents(f, content)))
+              Some(JsonFormat(ApiContents(f, RepositoryName(repository), content)))
           }
         }).getOrElse(NotFound())
       } else { // directory
-        JsonFormat(fileList.map{f => ApiContents(f, None)})
+        JsonFormat(fileList.map{f => ApiContents(f, RepositoryName(repository), None)})
       }
     }
   })
@@ -175,7 +204,7 @@ trait ApiControllerBase extends ControllerBase {
     using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
       //JsonFormat( (revstr, git.getRepository().resolve(revstr)) )
       // getRef is deprecated by jgit-4.2. use exactRef() or findRef()
-      val sha = git.getRepository().getRef(revstr).getObjectId().name()
+      val sha = git.getRepository().exactRef(revstr).getObjectId().name()
       JsonFormat(ApiRef(revstr, ApiObject(sha)))
     }
   })
@@ -258,18 +287,19 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
    */
-  patch("/api/v3/repos/:owner/:repo/branches/:branch")(ownerOnly { repository =>
+  patch("/api/v3/repos/:owner/:repo/branches/*")(ownerOnly { repository =>
     import gitbucket.core.api._
     (for{
-      branch     <- params.get("branch") if repository.branchList.find(_ == branch).isDefined
+      branch     <- params.get("splat") if repository.branchList.contains(branch)
       protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
+      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
     } yield {
       if(protection.enabled){
         enableBranchProtection(repository.owner, repository.name, branch, protection.status.enforcement_level == ApiBranchProtection.Everyone, protection.status.contexts)
       } else {
         disableBranchProtection(repository.owner, repository.name, branch)
       }
-      JsonFormat(ApiBranch(branch, protection)(RepositoryName(repository)))
+      JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), protection)(RepositoryName(repository)))
     }) getOrElse NotFound()
   })
 
@@ -283,6 +313,32 @@ trait ApiControllerBase extends ControllerBase {
     org.scalatra.NotFound(ApiError("Rate limiting is not enabled."))
   }
 
+  /**
+    * https://developer.github.com/v3/issues/#list-issues-for-a-repository
+    */
+  get("/api/v3/repos/:owner/:repository/issues")(referrersOnly { repository =>
+    val page = IssueSearchCondition.page(request)
+    // TODO: more api spec condition
+    val condition = IssueSearchCondition(request)
+    val baseOwner = getAccountByUserName(repository.owner).get
+
+    val issues: List[(Issue, Account)] =
+      searchIssueByApi(
+        condition = condition,
+        offset    = (page - 1) * PullRequestLimit,
+        limit     = PullRequestLimit,
+        repos     = repository.owner -> repository.name
+      )
+
+    JsonFormat(issues.map { case (issue, issueUser) =>
+      ApiIssue(
+        issue          = issue,
+        repositoryName = RepositoryName(repository),
+        user           = ApiUser(issueUser)
+      )
+    })
+  })
+
   /**
    * https://developer.github.com/v3/issues/#get-a-single-issue
    */
@@ -296,13 +352,37 @@ trait ApiControllerBase extends ControllerBase {
     }) getOrElse NotFound()
   })
 
+  /**
+    * https://developer.github.com/v3/issues/#create-an-issue
+    */
+  post("/api/v3/repos/:owner/:repository/issues")(readableUsersOnly { repository =>
+    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
+      (for{
+        data <- extractFromJsonBody[CreateAnIssue]
+        loginAccount <- context.loginAccount
+      } yield {
+        val milestone = data.milestone.flatMap(getMilestone(repository.owner, repository.name, _))
+        val issue = createIssue(
+          repository,
+          data.title,
+          data.body,
+          data.assignees.headOption,
+          milestone.map(_.milestoneId),
+          None,
+          data.labels,
+          loginAccount)
+        JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(loginAccount)))
+      }) getOrElse NotFound()
+    } else Unauthorized()
+  })
+
   /**
    * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
    */
   get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
     (for{
       issueId  <- params("id").toIntOpt
-      comments =  getCommentsForApi(repository.owner, repository.name, issueId.toInt)
+      comments =  getCommentsForApi(repository.owner, repository.name, issueId)
     } yield {
       JsonFormat(comments.map{ case (issueComment, user, issue) => ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest) })
     }) getOrElse NotFound()
@@ -551,5 +631,19 @@ trait ApiControllerBase extends ControllerBase {
   private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 
+  /**
+    * non-GitHub compatible API for Jenkins-Plugin
+    */
+  get("/api/v3/repos/:owner/:repo/raw/*")(referrersOnly { repository =>
+    val (id, path) = repository.splitPath(multiParams("splat").head)
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        responseRawFile(git, objectId, path, repository)
+      } getOrElse NotFound()
+    }
+  })
+
 }
 

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

@@ -1,25 +1,32 @@
 package gitbucket.core.controller
 
+import java.io.FileInputStream
+
 import gitbucket.core.api.ApiError
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, SystemSettingsService}
+import gitbucket.core.service.{AccountService, SystemSettingsService,RepositoryService}
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
-
+import gitbucket.core.util.JGitUtil._
 import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.io.FileUtils
 import org.json4s._
 import org.scalatra._
 import org.scalatra.i18n._
 import org.scalatra.json._
-
+import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
-import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import javax.servlet.{FilterChain, ServletRequest, ServletResponse}
-import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
 
 import scala.util.Try
+import net.coobird.thumbnailator.Thumbnails
 
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.lib.ObjectId
+import org.eclipse.jgit.revwalk.RevCommit
+import org.eclipse.jgit.treewalk._
+import org.apache.commons.io.IOUtils
+import org.slf4j.LoggerFactory
 
 /**
  * Provides generic features for controller implementations.
@@ -28,16 +35,14 @@ abstract class ControllerBase extends ScalatraFilter
   with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
   with SystemSettingsService {
 
+  private val logger = LoggerFactory.getLogger(getClass)
+
   implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
 
   before("/api/v3/*") {
     contentType = formats("json")
   }
 
-// TODO Scala 2.11
-//  // Don't set content type via Accept header.
-//  override def format(implicit request: HttpServletRequest) = ""
-
   override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
     val httpRequest  = request.asInstanceOf[HttpServletRequest]
     val httpResponse = response.asInstanceOf[HttpServletResponse]
@@ -57,7 +62,7 @@ abstract class ControllerBase extends ScalatraFilter
         // Redirect to dashboard
         httpResponse.sendRedirect(baseUrl + "/")
       }
-    } else if(path.startsWith("/git/")){
+    } else if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
       // Git repository
       chain.doFilter(request, response)
     } else {
@@ -145,7 +150,20 @@ abstract class ControllerBase extends ScalatraFilter
       }
     }
 
-  // TODO Scala 2.11
+  error{
+    case e => {
+      logger.error(s"Catch unhandled error in request: ${request}", e)
+      if(request.hasAttribute(Keys.Request.Ajax)){
+        org.scalatra.InternalServerError()
+      } else if(request.hasAttribute(Keys.Request.APIv3)){
+        contentType = formats("json")
+        org.scalatra.InternalServerError(ApiError("Internal Server Error"))
+      } else {
+        org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
+      }
+    }
+  }
+
   override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
                    includeContextPath: Boolean = true, includeServletPath: Boolean = true,
                    absolutize: Boolean = true, withSessionId: Boolean = true)
@@ -153,6 +171,18 @@ abstract class ControllerBase extends ScalatraFilter
     if (path.startsWith("http")) path
     else baseUrl + super.url(path, params, false, false, false)
 
+  /**
+   * Extends scalatra-form's trim rule to eliminate CR and LF.
+   */
+  protected def trim2[T](valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T](){
+    def convert(value: String, messages: Messages): T = valueType.convert(trim(value), messages)
+
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Seq[(String, String)] =
+      valueType.validate(name, trim(value), params, messages)
+
+    private def trim(value: String): String = if(value == null) null else value.replace("\r\n", "").trim
+  }
+
   /**
    * Use this method to response the raw data against XSS.
    */
@@ -174,6 +204,49 @@ abstract class ControllerBase extends ScalatraFilter
       case _ => Some(parse(request.body))
     }).filterNot(_ == JNothing).flatMap(j => Try(j.extract[A]).toOption)
   }
+
+  protected def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
+    @scala.annotation.tailrec
+    def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true  => _getPathObjectId(path, walk)
+      case false => None
+    }
+
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
+      treeWalk.addTree(revCommit.getTree)
+      treeWalk.setRecursive(true)
+      _getPathObjectId(path, treeWalk)
+    }
+  }
+
+  protected def responseRawFile(git: Git, objectId: ObjectId, path: String,
+                              repository: RepositoryService.RepositoryInfo): Unit = {
+    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+      contentType = FileUtil.getMimeType(path)
+
+      if(loader.isLarge){
+        response.setContentLength(loader.getSize.toInt)
+        loader.copyTo(response.outputStream)
+      } else {
+        val bytes = loader.getCachedBytes
+        val text = new String(bytes, "UTF-8")
+
+        val attrs = JGitUtil.getLfsObjects(text)
+        if(attrs.nonEmpty) {
+          response.setContentLength(attrs("size").toInt)
+          val oid = attrs("oid").split(":")(1)
+
+          using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))){ in =>
+            IOUtils.copy(in, response.getOutputStream)
+          }
+        } else {
+          response.setContentLength(loader.getSize.toInt)
+          response.getOutputStream.write(bytes)
+        }
+      }
+    }
+  }
 }
 
 /**
@@ -225,10 +298,13 @@ trait AccountManagementControllerBase extends ControllerBase {
     } else {
       fileId.map { fileId =>
         val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
-        FileUtils.moveFile(
+        val uploadDir = getUserUploadDir(userName)
-          new java.io.File(getTemporaryDir(session.getId), fileId),
+        if(!uploadDir.exists){
-          new java.io.File(getUserUploadDir(userName), filename)
+          uploadDir.mkdirs()
-        )
+        }
+        Thumbnails.of(new java.io.File(getTemporaryDir(session.getId), fileId))
+          .size(324, 324)
+          .toFile(new java.io.File(uploadDir, filename))
         updateAvatarImage(userName, Some(filename))
       }
     }

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

@@ -1,19 +1,19 @@
 package gitbucket.core.controller
 
 import gitbucket.core.model.Account
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.dircache.DirCache
-import org.eclipse.jgit.lib.{FileMode, Constants}
+import org.eclipse.jgit.lib.{Constants, FileMode}
-import org.scalatra
 import org.scalatra._
-import org.scalatra.servlet.{MultipartConfig, FileUploadSupport, FileItem}
+import org.scalatra.servlet.{FileItem, FileUploadSupport, MultipartConfig}
-import org.apache.commons.io.{IOUtils, FileUtils}
+import org.apache.commons.io.{FileUtils, IOUtils}
 
 /**
  * Provides Ajax based file upload functionality.
@@ -22,7 +22,12 @@ import org.apache.commons.io.{IOUtils, FileUtils}
  */
 class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
 
-  configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
+  val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
+    System.getProperty("gitbucket.maxFileSize").toLong
+  else
+    3 * 1024 * 1024
+
+  configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize)))
 
   post("/image"){
     execute({ (file, fileId) =>
@@ -31,6 +36,13 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
     }, FileUtil.isImage)
   }
 
+  post("/tmp"){
+    execute({ (file, fileId) =>
+      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+      session += Keys.Session.Upload(fileId) -> file.name
+    }, _ => true)
+  }
+
   post("/file/:owner/:repository"){
     execute({ (file, fileId) =>
       FileUtils.writeByteArrayToFile(new java.io.File(
@@ -46,7 +58,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
       val repository = params("repository")
 
       // Check whether logged-in user is collaborator
-      collaboratorsOnly(owner, repository, loginAccount){
+      onlyWikiEditable(owner, repository, loginAccount){
         execute({ (file, fileId) =>
           val fileName = file.getName
           LockUtil.lock(s"${owner}/${repository}/wiki") {
@@ -88,13 +100,17 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
     redirect("/admin/data")
   }
 
-  private def collaboratorsOnly(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
+  private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
     implicit val session = Database.getSession(request)
-    loginAccount match {
+    getRepository(owner, repository) match {
-      case x if(x.isAdmin) => action
+      case Some(x) => x.repository.options.wikiOption match {
-      case x if(getCollaborators(owner, repository).contains(x.userName)) => action
+        case "ALL"     if !x.repository.isPrivate => action
+        case "PUBLIC"  if hasGuestRole(owner, repository, Some(loginAccount)) => action
+        case "PRIVATE" if hasDeveloperRole(owner, repository, Some(loginAccount)) => action
         case _  => BadRequest()
       }
+      case None => BadRequest()
+    }
   }
 
   private def execute(f: (FileItem, String) => Unit, mimeTypeChcker: (String) => Boolean) = fileParams.get("file") match {

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

@@ -4,8 +4,8 @@ import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, StringUtil, UsersAuthenticator}
+import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
 import io.github.gitbucket.scalatra.forms._
 import org.scalatra.Ok
 
@@ -26,13 +26,13 @@ trait IndexControllerBase extends ControllerBase {
     "password" -> trim(label("Password", text(required)))
   )(SignInForm.apply)
 
-  val searchForm = mapping(
+//  val searchForm = mapping(
-    "query"      -> trim(text(required)),
+//    "query"      -> trim(text(required)),
-    "owner"      -> trim(text(required)),
+//    "owner"      -> trim(text(required)),
-    "repository" -> trim(text(required))
+//    "repository" -> trim(text(required))
-  )(SearchForm.apply)
+//  )(SearchForm.apply)
-
+//
-  case class SearchForm(query: String, owner: String, repository: String)
+//  case class SearchForm(query: String, owner: String, repository: String)
 
 
   get("/"){
@@ -49,13 +49,18 @@ trait IndexControllerBase extends ControllerBase {
     if(redirect.isDefined && redirect.get.startsWith("/")){
       flash += Keys.Flash.Redirect -> redirect.get
     }
-    gitbucket.core.html.signin()
+    gitbucket.core.html.signin(flash.get("userName"), flash.get("password"), flash.get("error"))
   }
 
   post("/signin", signinForm){ form =>
     authenticate(context.settings, form.userName, form.password) match {
       case Some(account) => signin(account)
-      case None          => redirect("/signin")
+      case None          => {
+        flash += "userName" -> form.userName
+        flash += "password" -> form.password
+        flash += "error" -> "Sorry, your Username and/or Password is incorrect. Please try again."
+        redirect("/signin")
+      }
     }
   }
 
@@ -158,7 +163,7 @@ trait IndexControllerBase extends ControllerBase {
 
   get("/search"){
     val query = params.getOrElse("query", "").trim.toLowerCase
-    val visibleRepositories = getVisibleRepositories(context.loginAccount, None)
+    val visibleRepositories = getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
     val repositories = visibleRepositories.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }

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

@@ -2,15 +2,14 @@ package gitbucket.core.controller
 
 import gitbucket.core.issues.html
 import gitbucket.core.service.IssuesService._
-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import gitbucket.core.view
 import gitbucket.core.view.Markdown
 import io.github.gitbucket.scalatra.forms._
-import org.scalatra.Ok
+import org.scalatra.{BadRequest, Ok}
 
 
 class IssuesController extends IssuesControllerBase
@@ -21,12 +20,14 @@ class IssuesController extends IssuesControllerBase
   with MilestonesService
   with ActivityService
   with HandleCommentService
+  with IssueCreationService
   with ReadableUsersAuthenticator
   with ReferrerAuthenticator
   with WritableUsersAuthenticator
   with PullRequestService
   with WebHookIssueCommentService
   with CommitsService
+  with PrioritiesService
 
 trait IssuesControllerBase extends ControllerBase {
   self: IssuesService
@@ -36,14 +37,16 @@ trait IssuesControllerBase extends ControllerBase {
     with MilestonesService
     with ActivityService
     with HandleCommentService
+    with IssueCreationService
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
     with PullRequestService
-    with WebHookIssueCommentService =>
+    with WebHookIssueCommentService
+    with PrioritiesService =>
 
   case class IssueCreateForm(title: String, content: Option[String],
-    assignedUserName: Option[String], milestoneId: Option[Int], labelNames: Option[String])
+    assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Option[String])
   case class CommentForm(issueId: Int, content: String)
   case class IssueStateForm(issueId: Int, content: Option[String])
 
@@ -52,6 +55,7 @@ trait IssuesControllerBase extends ControllerBase {
       "content"          -> trim(optional(text())),
       "assignedUserName" -> trim(optional(text())),
       "milestoneId"      -> trim(optional(number())),
+      "priorityId"       -> trim(optional(number())),
       "labelNames"       -> trim(optional(text()))
     )(IssueCreateForm.apply)
 
@@ -75,7 +79,7 @@ trait IssuesControllerBase extends ControllerBase {
   get("/:owner/:repository/issues")(referrersOnly { repository =>
     val q = request.getParameter("q")
     if(Option(q).exists(_.contains("is:pr"))){
-      redirect(s"/${repository.owner}/${repository.name}/pulls?q=" + StringUtil.urlEncode(q))
+      redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
     } else {
       searchIssues(repository)
     }
@@ -83,75 +87,55 @@ trait IssuesControllerBase extends ControllerBase {
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
     defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
-      getIssue(owner, name, issueId) map {
+      getIssue(owner, name, issueId) map { issue =>
+        if(issue.isPullRequest){
+          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        } else {
           html.issue(
-          _,
+            issue,
             getComments(owner, name, issueId.toInt),
             getIssueLabels(owner, name, issueId.toInt),
             getAssignableUserNames(owner, name),
             getMilestonesWithIssueCount(owner, name),
+            getPriorities(owner, name),
             getLabels(owner, name),
-          isEditable(repository),
+            isIssueEditable(repository),
-          isManageable(repository),
+            isIssueManageable(repository),
             repository)
+        }
       } getOrElse NotFound()
     }
   })
 
   get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    if(isEditable(repository)){ // TODO Should this check is provided by authenticator?
+    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
       defining(repository.owner, repository.name){ case (owner, name) =>
         html.create(
           getAssignableUserNames(owner, name),
           getMilestones(owner, name),
+          getPriorities(owner, name),
+          getDefaultPriority(owner, name),
           getLabels(owner, name),
-          isManageable(repository),
+          isIssueManageable(repository),
+          getContentTemplate(repository, "ISSUE_TEMPLATE"),
           repository)
       }
     } else Unauthorized()
   })
 
   post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){ // TODO Should this check is provided by authenticator?
+    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
-      defining(repository.owner, repository.name){ case (owner, name) =>
+      val issue = createIssue(
-        val manageable = isManageable(repository)
+        repository,
-        val userName = context.loginAccount.get.userName
+        form.title,
+        form.content,
+        form.assignedUserName,
+        form.milestoneId,
+        form.priorityId,
+        form.labelNames.toArray.flatMap(_.split(",")),
+        context.loginAccount.get)
 
-        // insert issue
+      redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
-        val issueId = createIssue(owner, name, userName, form.title, form.content,
-          if (manageable) form.assignedUserName else None,
-          if (manageable) form.milestoneId else None)
-
-        // insert labels
-        if (manageable) {
-          form.labelNames.map { value =>
-            val labels = getLabels(owner, name)
-            value.split(",").foreach { labelName =>
-              labels.find(_.labelName == labelName).map { label =>
-                registerIssueLabel(owner, name, issueId, label.labelId)
-              }
-            }
-          }
-        }
-
-        // record activity
-        recordCreateIssueActivity(owner, name, userName, issueId, form.title)
-
-        getIssue(owner, name, issueId.toString).foreach { issue =>
-          // extract references and create refer comment
-          createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)
-
-          // call web hooks
-          callIssuesWebHook("opened", repository, issue, context.baseUrl, context.loginAccount.get)
-
-          // notifications
-          Notifier().toNotify(repository, issue, form.content.getOrElse("")) {
-            Notifier.msgIssue(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
-          }
-        }
-
-        redirect(s"/${owner}/${name}/issues/${issueId}")
-      }
     } else Unauthorized()
   })
 
@@ -209,7 +193,7 @@ trait IssuesControllerBase extends ControllerBase {
     defining(repository.owner, repository.name){ case (owner, name) =>
       getComment(owner, name, params("id")).map { comment =>
         if(isEditableContent(owner, name, comment.commentedUserName)){
-          updateComment(comment.commentId, form.content)
+          updateComment(comment.issueId, comment.commentId, form.content)
           redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
         } else Unauthorized()
       } getOrElse NotFound()
@@ -220,7 +204,7 @@ trait IssuesControllerBase extends ControllerBase {
     defining(repository.owner, repository.name){ case (owner, name) =>
       getComment(owner, name, params("id")).map { comment =>
         if(isEditableContent(owner, name, comment.commentedUserName)){
-          Ok(deleteComment(comment.commentId))
+          Ok(deleteComment(comment.issueId, comment.commentId))
         } else Unauthorized()
       } getOrElse NotFound()
     }
@@ -314,6 +298,11 @@ trait IssuesControllerBase extends ControllerBase {
     } getOrElse Ok()
   })
 
+  ajaxPost("/:owner/:repository/issues/:id/priority")(writableUsersOnly { repository =>
+    updatePriorityId(repository.owner, repository.name, params("id").toInt, priorityId("priorityId"))
+    Ok("updated")
+  })
+
   post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
     defining(params.get("value")){ action =>
       action match {
@@ -327,7 +316,7 @@ trait IssuesControllerBase extends ControllerBase {
             handleComment(issue, None, repository, Some("close"))
           }
         }
-        case _ => // TODO BadRequest
+        case _ => BadRequest()
       }
     }
   })
@@ -358,6 +347,14 @@ trait IssuesControllerBase extends ControllerBase {
     }
   })
 
+  post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
+    defining(priorityId("value")){ value =>
+      executeBatch(repository) {
+        updatePriorityId(repository.owner, repository.name, _, value)
+      }
+    }
+  })
+
   get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
     (Directory.getAttachedDir(repository.owner, repository.name) match {
       case dir if(dir.exists && dir.isDirectory) =>
@@ -371,6 +368,7 @@ trait IssuesControllerBase extends ControllerBase {
 
   val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
   val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+  val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
   private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
     params("checked").split(',') map(_.toInt) foreach execute
@@ -393,32 +391,14 @@ trait IssuesControllerBase extends ControllerBase {
           page,
           getAssignableUserNames(owner, repoName),
           getMilestones(owner, repoName),
+          getPriorities(owner, repoName),
           getLabels(owner, repoName),
           countIssue(condition.copy(state = "open"  ), false, owner -> repoName),
           countIssue(condition.copy(state = "closed"), false, owner -> repoName),
           condition,
           repository,
-          isEditable(repository),
+          isIssueEditable(repository),
-          isManageable(repository))
+          isIssueManageable(repository))
-    }
-  }
-
-  /**
-   * Tests whether an logged-in user can manage issues.
-   */
-  private def isManageable(repository: RepositoryInfo)(implicit context: Context): Boolean = {
-    hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-  }
-
-  /**
-   * Tests whether an logged-in user can post issues.
-   */
-  private def isEditable(repository: RepositoryInfo)(implicit context: Context): Boolean = {
-    repository.repository.options.issuesOption match {
-      case "ALL"     => !repository.repository.isPrivate && context.loginAccount.isDefined
-      case "PUBLIC"  => hasGuestRole(repository.owner, repository.name, context.loginAccount)
-      case "PRIVATE" => hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-      case "DISABLE" => false
     }
   }
 
@@ -428,5 +408,4 @@ trait IssuesControllerBase extends ControllerBase {
   private def isEditableContent(owner: String, repository: String, author: String)(implicit context: Context): Boolean = {
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
   }
-
 }

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

@@ -0,0 +1,40 @@
+package gitbucket.core.controller
+
+import org.scalatra.MovedPermanently
+
+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
+   */
+  get("/*/*/info/refs") {
+    val query = Option(request.getQueryString).map("?" + _).getOrElse("")
+    halt(MovedPermanently(baseUrl + "/git" + request.getRequestURI + query))
+  }
+
+  /**
+   * Filter requests from anonymous users.
+   *
+   * If anonymous access is allowed, pass all requests.
+   * But if it's not allowed, demands authentication except some paths.
+   */
+  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
+    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
+      !context.currentPath.startsWith("/register")) {
+      Unauthorized()
+    } else {
+      pass()
+    }
+  }
+
+
+}

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

@@ -0,0 +1,111 @@
+package gitbucket.core.controller
+
+import gitbucket.core.issues.priorities.html
+import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, PrioritiesService}
+import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.util.Implicits._
+import io.github.gitbucket.scalatra.forms._
+import org.scalatra.i18n.Messages
+import org.scalatra.Ok
+
+class PrioritiesController extends PrioritiesControllerBase
+  with PrioritiesService with IssuesService with RepositoryService with AccountService
+with ReferrerAuthenticator with WritableUsersAuthenticator
+
+trait PrioritiesControllerBase extends ControllerBase {
+  self: PrioritiesService with IssuesService with RepositoryService
+    with ReferrerAuthenticator with WritableUsersAuthenticator =>
+
+  case class PriorityForm(priorityName: String, description: Option[String], color: String)
+
+  val priorityForm = mapping(
+    "priorityName"  -> trim(label("Priority name", text(required, priorityName, uniquePriorityName, maxlength(100)))),
+    "description"   -> trim(label("Description", optional(text(maxlength(255))))),
+    "priorityColor" -> trim(label("Color", text(required, color)))
+  )(PriorityForm.apply)
+
+
+  get("/:owner/:repository/issues/priorities")(referrersOnly { repository =>
+    html.list(
+      getPriorities(repository.owner, repository.name),
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      repository,
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+  })
+
+  ajaxGet("/:owner/:repository/issues/priorities/new")(writableUsersOnly { repository =>
+    html.edit(None, repository)
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/new", priorityForm)(writableUsersOnly { (form, repository) =>
+    val priorityId = createPriority(repository.owner, repository.name, form.priorityName, form.description, form.color.substring(1))
+    html.priority(
+      getPriority(repository.owner, repository.name, priorityId).get,
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      repository,
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+  })
+
+  ajaxGet("/:owner/:repository/issues/priorities/:priorityId/edit")(writableUsersOnly { repository =>
+    getPriority(repository.owner, repository.name, params("priorityId").toInt).map { priority =>
+      html.edit(Some(priority), repository)
+    } getOrElse NotFound()
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/:priorityId/edit", priorityForm)(writableUsersOnly { (form, repository) =>
+    updatePriority(repository.owner, repository.name, params("priorityId").toInt, form.priorityName, form.description, form.color.substring(1))
+    html.priority(
+      getPriority(repository.owner, repository.name, params("priorityId").toInt).get,
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      repository,
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/reorder")(writableUsersOnly { (repository) =>
+    reorderPriorities(repository.owner, repository.name, params("order")
+      .split(",")
+      .map(id => id.toInt)
+      .zipWithIndex
+      .toMap)
+
+    Ok()
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/default")(writableUsersOnly { (repository) =>
+    setDefaultPriority(repository.owner, repository.name, priorityId("priorityId"))
+    Ok()
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/:priorityId/delete")(writableUsersOnly { repository =>
+    deletePriority(repository.owner, repository.name, params("priorityId").toInt)
+    Ok()
+  })
+
+  val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+
+  /**
+   * Constraint for the identifier such as user name, repository name or page name.
+   */
+  private def priorityName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(value.contains(',')){
+        Some(s"${name} contains invalid character.")
+      } else if(value.startsWith("_") || value.startsWith("-")){
+        Some(s"${name} starts with invalid character.")
+      } else {
+        None
+      }
+  }
+
+  private def uniquePriorityName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+      val owner = params("owner")
+      val repository = params("repository")
+      params.get("priorityId").map { priorityId =>
+        getPriority(owner, repository, value).filter(_.priorityId != priorityId.toInt).map(_ => "Name has already been taken.")
+      }.getOrElse {
+        getPriority(owner, repository, value).map(_ => "Name has already been taken.")
+      }
+    }
+  }
+}

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

@@ -1,6 +1,7 @@
 package gitbucket.core.controller
 
 import gitbucket.core.model.WebHook
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.MergeService
@@ -8,7 +9,7 @@ import gitbucket.core.service.IssuesService._
 import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
@@ -23,14 +24,14 @@ class PullRequestsController extends PullRequestsControllerBase
   with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
   with CommitsService with ActivityService with WebHookPullRequestService
   with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
-  with CommitStatusService with MergeService with ProtectedBranchService
+  with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService
 
 
 trait PullRequestsControllerBase extends ControllerBase {
   self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
     with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService
     with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
-    with CommitStatusService with MergeService with ProtectedBranchService =>
+    with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService =>
 
   val pullRequestForm = mapping(
     "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
@@ -44,6 +45,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     "commitIdTo"            -> trim(text(required, maxlength(40))),
     "assignedUserName"      -> trim(optional(text())),
     "milestoneId"           -> trim(optional(number())),
+    "priorityId"            -> trim(optional(number())),
     "labelNames"            -> trim(optional(text()))
   )(PullRequestForm.apply)
 
@@ -63,6 +65,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     commitIdTo: String,
     assignedUserName: Option[String],
     milestoneId: Option[Int],
+    priorityId: Option[Int],
     labelNames: Option[String]
   )
 
@@ -92,12 +95,15 @@ trait PullRequestsControllerBase extends ControllerBase {
             getIssueLabels(owner, name, issueId),
             getAssignableUserNames(owner, name),
             getMilestonesWithIssueCount(owner, name),
+            getPriorities(owner, name),
             getLabels(owner, name),
             commits,
             diffs,
             isEditable(repository),
             isManageable(repository),
+            hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
             repository,
+            getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
             flash.toMap.map(f => f._1 -> f._2.toString))
         }
       }
@@ -138,22 +144,36 @@ trait PullRequestsControllerBase extends ControllerBase {
     } getOrElse NotFound()
   })
 
-  get("/:owner/:repository/pull/:id/delete/*")(writableUsersOnly { repository =>
+  get("/:owner/:repository/pull/:id/delete_branch")(readableUsersOnly { baseRepository =>
-    params("id").toIntOpt.map { issueId =>
+    (for {
-      val branchName = multiParams("splat").head
+      issueId <- params("id").toIntOpt
+      loginAccount <- context.loginAccount
+      (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
+      owner = pullreq.requestUserName
+      name  = pullreq.requestRepositoryName
+      if hasDeveloperRole(owner, name, context.loginAccount)
+    } yield {
+      val repository = getRepository(owner, name).get
+      val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
+      if(branchProtection.enabled){
+        flash += "error" -> s"branch ${pullreq.requestBranch} is protected."
+      } else {
+        if(repository.repository.defaultBranch != pullreq.requestBranch){
           val userName = context.loginAccount.get.userName
-      if(repository.repository.defaultBranch != branchName){
           using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-          git.branchDelete().setForce(true).setBranchNames(branchName).call()
+            git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call()
-          recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+            recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch)
+          }
+          createComment(baseRepository.owner, baseRepository.name, userName, issueId, pullreq.requestBranch, "delete_branch")
+        } else {
+          flash += "error" -> s"""Can't delete the default branch "${pullreq.requestBranch}"."""
         }
       }
-      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
+      redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+    }) getOrElse NotFound()
-    } getOrElse NotFound()
   })
 
-  post("/:owner/:repository/pull/:id/update_branch")(writableUsersOnly { baseRepository =>
+  post("/:owner/:repository/pull/:id/update_branch")(readableUsersOnly { baseRepository =>
     (for {
       issueId <- params("id").toIntOpt
       loginAccount <- context.loginAccount
@@ -217,7 +237,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           }
         }
       }
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+      redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
 
     }) getOrElse NotFound()
   })
@@ -231,7 +251,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           using(Git.open(getRepositoryDir(owner, name))) { git =>
             // mark issue as merged and close.
             val loginAccount = context.loginAccount.get
-            createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
+            val commentId = createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
             createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
             updateClosed(owner, name, issueId, true)
 
@@ -261,9 +281,10 @@ trait PullRequestsControllerBase extends ControllerBase {
             // call web hook
             callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
 
-            // notifications
+            // call hooks
-            Notifier().toNotify(repository, issue, "merge"){
+            PluginRegistry().getPullRequestHooks.foreach{ h =>
-              Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
+              h.addedComment(commentId, form.message, issue, repository)
+              h.merged(issue, repository)
             }
 
             redirect(s"/${owner}/${name}/pull/${issueId}")
@@ -359,21 +380,23 @@ trait PullRequestsControllerBase extends ControllerBase {
               title,
               commits,
               diffs,
-              (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+              ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
                 case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
                 case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-              },
+              }).filter { case (owner, name) => hasGuestRole(owner, name, context.loginAccount) },
               commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList,
               originId,
               forkedId,
               oldId.getName,
               newId.getName,
+              getContentTemplate(originRepository, "PULL_REQUEST_TEMPLATE"),
               forkedRepository,
               originRepository,
               forkedRepository,
               hasDeveloperRole(originRepository.owner, originRepository.name, context.loginAccount),
               getAssignableUserNames(originRepository.owner, originRepository.name),
               getMilestones(originRepository.owner, originRepository.name),
+              getPriorities(originRepository.owner, originRepository.name),
               getLabels(originRepository.owner, originRepository.name)
             )
           }
@@ -419,12 +442,9 @@ trait PullRequestsControllerBase extends ControllerBase {
   post("/:owner/:repository/pulls/new", pullRequestForm)(readableUsersOnly { (form, repository) =>
     defining(repository.owner, repository.name){ case (owner, name) =>
       val manageable = isManageable(repository)
-      val editable = isEditable(repository)
-
-      if(editable) {
       val loginUserName = context.loginAccount.get.userName
 
-        val issueId = createIssue(
+      val issueId = insertIssue(
         owner = repository.owner,
         repository = repository.name,
         loginUser = loginUserName,
@@ -432,6 +452,7 @@ trait PullRequestsControllerBase extends ControllerBase {
         content = form.content,
         assignedUserName = if (manageable) form.assignedUserName else None,
         milestoneId = if (manageable) form.milestoneId else None,
+        priorityId = if (manageable) form.priorityId else None,
         isPullRequest = true)
 
       createPullRequest(
@@ -470,14 +491,11 @@ trait PullRequestsControllerBase extends ControllerBase {
         // extract references and create refer comment
         createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)
 
-          // notifications
+        // call hooks
-          Notifier().toNotify(repository, issue, form.content.getOrElse("")) {
+        PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
-            Notifier.msgPullRequest(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
-          }
       }
 
       redirect(s"/${owner}/${name}/pull/${issueId}")
-      } else Unauthorized()
     }
   })
 
@@ -508,6 +526,7 @@ trait PullRequestsControllerBase extends ControllerBase {
         page,
         getAssignableUserNames(owner, repoName),
         getMilestones(owner, repoName),
+        getPriorities(owner, repoName),
         getLabels(owner, repoName),
         countIssue(condition.copy(state = "open"  ), true, owner -> repoName),
         countIssue(condition.copy(state = "closed"), true, owner -> repoName),

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

@@ -1,12 +1,12 @@
 package gitbucket.core.controller
 
 import gitbucket.core.settings.html
-import gitbucket.core.model.WebHook
+import gitbucket.core.model.{WebHook, RepositoryWebHook}
-import gitbucket.core.service.{RepositoryService, AccountService, WebHookService, ProtectedBranchService, CommitStatusService}
+import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.util._
 import gitbucket.core.util.JGitUtil._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
 import io.github.gitbucket.scalatra.forms._
@@ -16,14 +16,15 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.Constants
 import org.eclipse.jgit.lib.ObjectId
 import gitbucket.core.model.WebHookContentType
+import gitbucket.core.plugin.PluginRegistry
 
 
 class RepositorySettingsController extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService
+  with RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
   with OwnerAuthenticator with UsersAuthenticator
 
 trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService
+  self: RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
     with OwnerAuthenticator with UsersAuthenticator =>
 
   // for repository options
@@ -39,7 +40,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   )
 
   val optionsForm = mapping(
-    "repositoryName"    -> trim(label("Repository Name"    , text(required, maxlength(100), identifier, renameRepositoryName))),
+    "repositoryName"    -> trim(label("Repository Name"    , text(required, maxlength(100), repository, renameRepositoryName))),
     "description"       -> trim(label("Description"        , optional(text()))),
     "isPrivate"         -> trim(label("Repository Type"    , boolean())),
     "issuesOption"      -> trim(label("Issues Option"      , text(required, featureOption))),
@@ -56,12 +57,15 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100))))
   )(DefaultBranchForm.apply)
 
-//  // for collaborator addition
+
-//  case class CollaboratorForm(userName: String)
+  // for deploy key
-//
+  case class DeployKeyForm(title: String, publicKey: String, allowWrite: Boolean)
-//  val collaboratorForm = mapping(
+
-//    "userName" -> trim(label("Username", text(required, collaborator)))
+  val deployKeyForm = mapping(
-//  )(CollaboratorForm.apply)
+    "title"      -> trim(label("Title", text(required, maxlength(100)))),
+    "publicKey"  -> trim2(label("Key" , text(required))), // TODO duplication check in the repository?
+    "allowWrite" -> trim(label("Key"  , boolean()))
+  )(DeployKeyForm.apply)
 
   // for web hook url addition
   case class WebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
@@ -119,13 +123,25 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
       // Move git repository
       defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        if(dir.isDirectory){
           FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
         }
+      }
       // Move wiki repository
       defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        if(dir.isDirectory) {
           FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
         }
       }
+      // Move files directory
+      defining(getRepositoryFilesDir(repository.owner, repository.name)){ dir =>
+        if(dir.isDirectory) {
+          FileUtils.moveDirectory(dir, getRepositoryFilesDir(repository.owner, form.repositoryName))
+        }
+      }
+      // Call hooks
+      PluginRegistry().getRepositoryHooks.foreach(_.renamed(repository.owner, repository.name, form.repositoryName))
+    }
     flash += "info" -> "Repository settings has been updated."
     redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
   })
@@ -134,11 +150,11 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   get("/:owner/:repository/settings/branches")(ownerOnly { repository =>
     val protecteions = getProtectedBranchList(repository.owner, repository.name)
     html.branches(repository, protecteions, flash.get("info"))
-  });
+  })
 
   /** Update default branch */
   post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) =>
-    if(repository.branchList.find(_ == form.defaultBranch).isEmpty){
+    if(!repository.branchList.contains(form.defaultBranch)){
       redirect(s"/${repository.owner}/${repository.name}/settings/options")
     } else {
       saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch)
@@ -155,7 +171,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository =>
     import gitbucket.core.api._
     val branch = params("branch")
-    if(repository.branchList.find(_ == branch).isEmpty){
+    if(!repository.branchList.contains(branch)){
       redirect(s"/${repository.owner}/${repository.name}/settings/branches")
     } else {
       val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch))
@@ -196,8 +212,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Display the web hook edit page.
    */
   get("/:owner/:repository/settings/hooks/new")(ownerOnly { repository =>
-    val webhook = WebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
+    val webhook = RepositoryWebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
-    html.edithooks(webhook, Set(WebHook.Push), repository, flash.get("info"), true)
+    html.edithook(webhook, Set(WebHook.Push), repository, true)
   })
 
   /**
@@ -235,7 +251,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       val url = params("url")
       val token = Some(params("token"))
       val ctype = WebHookContentType.valueOf(params("ctype"))
-      val dummyWebHookInfo = WebHook(repository.owner, repository.name, url, ctype, token)
+      val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
       val dummyPayload = {
         val ownerAccount = getAccountByUserName(repository.owner).get
         val commits = if(JGitUtil.isEmpty(git)) List.empty else git.log
@@ -272,7 +288,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
           "headers" -> _headers(req.getAllHeaders),
           "payload" -> json
         )).recover(toErrorMap), 20 seconds),
-        "responce" -> Await.result(resFuture.map(res => Map(
+        "response" -> Await.result(resFuture.map(res => Map(
           "status"  -> res.getStatusLine(),
           "body"    -> EntityUtils.toString(res.getEntity()),
           "headers" -> _headers(res.getAllHeaders())
@@ -286,7 +302,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
     getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
-      html.edithooks(webhook, events, repository, flash.get("info"), false)
+      html.edithook(webhook, events, repository, false)
     } getOrElse NotFound()
   })
 
@@ -317,13 +333,34 @@ trait RepositorySettingsControllerBase extends ControllerBase {
         renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
         // Move git repository
         defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+          if(dir.isDirectory){
             FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
           }
+        }
         // Move wiki repository
         defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+          if(dir.isDirectory) {
             FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
           }
         }
+        // Move lfs directory
+        defining(getLfsDir(repository.owner, repository.name)){ dir =>
+          if(dir.isDirectory()) {
+            FileUtils.moveDirectory(dir, getLfsDir(form.newOwner, repository.name))
+          }
+        }
+        // Move attached directory
+        defining(getAttachedDir(repository.owner, repository.name)){ dir =>
+          if(dir.isDirectory) {
+            FileUtils.moveDirectory(dir, getAttachedDir(form.newOwner, repository.name))
+          }
+        }
+        // Delete parent directory
+        FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
+
+        // Call hooks
+        PluginRegistry().getRepositoryHooks.foreach(_.transferred(repository.owner, form.newOwner, repository.name))
+      }
     }
     redirect(s"/${form.newOwner}/${repository.name}")
   })
@@ -333,12 +370,20 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
     LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      // Delete the repository and related files
       deleteRepository(repository.owner, repository.name)
 
       FileUtils.deleteDirectory(getRepositoryDir(repository.owner, repository.name))
       FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
       FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
+      val lfsDir = getLfsDir(repository.owner, repository.name)
+      FileUtils.deleteDirectory(lfsDir)
+      FileUtil.deleteDirectoryIfEmpty(lfsDir.getParentFile())
+
+      // Call hooks
+      PluginRegistry().getRepositoryHooks.foreach(_.deleted(repository.owner, repository.name))
     }
+
     redirect(s"/${repository.owner}")
   })
 
@@ -348,13 +393,31 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   post("/:owner/:repository/settings/gc")(ownerOnly { repository =>
     LockUtil.lock(s"${repository.owner}/${repository.name}") {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        git.gc();
+        git.gc()
       }
     }
     flash += "info" -> "Garbage collection has been executed."
     redirect(s"/${repository.owner}/${repository.name}/settings/danger")
   })
 
+  /** List deploy keys */
+  get("/:owner/:repository/settings/deploykey")(ownerOnly { repository =>
+    html.deploykey(repository, getDeployKeys(repository.owner, repository.name))
+  })
+
+  /** Register a deploy key */
+  post("/:owner/:repository/settings/deploykey", deployKeyForm)(ownerOnly { (form, repository) =>
+    addDeployKey(repository.owner, repository.name, form.title, form.publicKey, form.allowWrite)
+    redirect(s"/${repository.owner}/${repository.name}/settings/deploykey")
+  })
+
+  /** Delete a deploy key */
+  get("/:owner/:repository/settings/deploykey/delete/:id")(ownerOnly { repository =>
+    val deployKeyId = params("id").toInt
+    deleteDeployKey(repository.owner, repository.name, deployKeyId)
+    redirect(s"/${repository.owner}/${repository.name}/settings/deploykey")
+  })
+
   /**
    * Provides duplication check for web hook url.
    */

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

@@ -1,6 +1,7 @@
 package gitbucket.core.controller
 
-import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import java.io.File
+import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.repo.html
@@ -9,24 +10,22 @@ import gitbucket.core.service._
 import gitbucket.core.util._
 import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.StringUtil._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import gitbucket.core.model.{Account, WebHook}
+import gitbucket.core.model.{Account, CommitState, CommitStatus, WebHook}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers
-
 import io.github.gitbucket.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.{ArchiveCommand, Git}
 import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
-import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib._
-import org.eclipse.jgit.revwalk.RevCommit
-import org.eclipse.jgit.treewalk._
 import org.scalatra._
+import org.scalatra.i18n.Messages
 
 
 class RepositoryViewerController extends RepositoryViewerControllerBase
@@ -45,6 +44,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ArchiveCommand.registerFormat("zip", new ZipFormat)
   ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
 
+  case class UploadForm(
+    branch: String,
+    path: String,
+    uploadFiles: String,
+    message: Option[String]
+  )
+
   case class EditorForm(
     branch: String,
     path: String,
@@ -53,14 +59,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     charset: String,
     lineSeparator: String,
     newFileName: String,
-    oldFileName: Option[String]
+    oldFileName: Option[String],
+    commit: String
   )
 
   case class DeleteForm(
     branch: String,
     path: String,
     message: Option[String],
-    fileName: String
+    fileName: String,
+    commit: String
   )
 
   case class CommentForm(
@@ -71,6 +79,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     issueId: Option[Int]
   )
 
+  val uploadForm = mapping(
+    "branch"        -> trim(label("Branch", text(required))),
+    "path"          -> trim(label("Path", text())),
+    "uploadFiles"   -> trim(label("Upload files", text(required))),
+    "message"       -> trim(label("Message", optional(text()))),
+  )(UploadForm.apply)
+
   val editorForm = mapping(
     "branch"        -> trim(label("Branch", text(required))),
     "path"          -> trim(label("Path", text())),
@@ -79,14 +94,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "charset"       -> trim(label("Charset", text(required))),
     "lineSeparator" -> trim(label("Line Separator", text(required))),
     "newFileName"   -> trim(label("Filename", text(required))),
-    "oldFileName"   -> trim(label("Old filename", optional(text())))
+    "oldFileName"   -> trim(label("Old filename", optional(text()))),
+    "commit"        -> trim(label("Commit", text(required, conflict)))
   )(EditorForm.apply)
 
   val deleteForm = mapping(
     "branch"   -> trim(label("Branch", text(required))),
     "path"     -> trim(label("Path", text())),
     "message"  -> trim(label("Message", optional(text()))),
-    "fileName" -> trim(label("Filename", text(required)))
+    "fileName" -> trim(label("Filename", text(required))),
+    "commit"   -> trim(label("Commit", text(required, conflict)))
   )(DeleteForm.apply)
 
   val commentForm = mapping(
@@ -102,7 +119,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/_preview")(referrersOnly { repository =>
     contentType = "text/html"
-    helpers.markdown(
+    val filename = params.get("filename")
+    filename match {
+      case Some(f) => helpers.renderMarkup(
+          filePath = List(f),
+          fileContent = params("content"),
+          branch = "master",
+          repository = repository,
+          enableWikiLink = params("enableWikiLink").toBoolean,
+          enableRefsLink = params("enableRefsLink").toBoolean,
+          enableAnchor = false
+        )
+      case None => helpers.markdown(
           markdown = params("content"),
           repository = repository,
           enableWikiLink = params("enableWikiLink").toBoolean,
@@ -112,6 +140,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           enableAnchor = false,
           hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
         )
+    }
   })
 
   /**
@@ -145,13 +174,24 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val (branchName, path) = repository.splitPath(multiParams("splat").head)
     val page = params.get("page").flatMap(_.toIntOpt).getOrElse(1)
 
+    def getStatuses(sha: String): List[CommitStatus] = {
+      getCommitStatues(repository.owner, repository.name, sha)
+    }
+
+    def getSummary(statuses: List[CommitStatus]): (CommitState, String) = {
+      val stateMap = statuses.groupBy(_.state)
+      val state = CommitState.combine(stateMap.keySet)
+      val summary = stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ")
+      state -> summary
+    }
+
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
         case Right((logs, hasNext)) =>
           html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
             logs.splitWith{ (commit1, commit2) =>
               view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
-            }, page, hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+            }, page, hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), getStatuses, getSummary)
         case Left(_) => NotFound()
       }
     }
@@ -160,11 +200,50 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository/new/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
     val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
-    html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
+
-      None, JGitUtil.ContentInfo("text", None, Some("UTF-8")),
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      protectedBranch)
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      html.editor(
+        branch          = branch,
+        repository      = repository,
+        pathList        = if (path.length == 0) Nil else path.split("/").toList,
+        fileName        = None,
+        content         = JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
+        protectedBranch = protectedBranch,
+        commit          = revCommit.getName
+      )
+    }
   })
 
+  get("/:owner/:repository/upload/*")(writableUsersOnly { repository =>
+    val (branch, path) = repository.splitPath(multiParams("splat").head)
+    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
+    html.upload(branch, repository, if(path.length == 0) Nil else path.split("/").toList, protectedBranch)
+  })
+
+  post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
+    val files = form.uploadFiles.split("\n").map { line =>
+      val i = line.indexOf(':')
+      CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
+    }
+
+    commitFiles(
+      repository = repository,
+      branch     = form.branch,
+      path       = form.path,
+      files      = files,
+      message    = form.message.getOrElse("Add files via upload")
+    )
+
+    if(form.path.length == 0){
+      redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
+    } else {
+      redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
+    }
+  })
+
+
   get("/:owner/:repository/edit/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
     val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
@@ -174,9 +253,15 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
       getPathObjectId(git, path, revCommit).map { objectId =>
         val paths = path.split("/")
-        html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
+        html.editor(
-          JGitUtil.getContentInfo(git, path, objectId),
+          branch          = branch,
-          protectedBranch)
+          repository      = repository,
+          pathList        = paths.take(paths.size - 1).toList,
+          fileName        = Some(paths.last),
+          content         = JGitUtil.getContentInfo(git, path, objectId),
+          protectedBranch = protectedBranch,
+          commit          = revCommit.getName
+        )
       } getOrElse NotFound()
     }
   })
@@ -188,8 +273,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
       getPathObjectId(git, path, revCommit).map { objectId =>
         val paths = path.split("/")
-        html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
+        html.delete(
-          JGitUtil.getContentInfo(git, path, objectId))
+          branch     = branch,
+          repository = repository,
+          pathList   = paths.take(paths.size - 1).toList,
+          fileName   = paths.last,
+          content    = JGitUtil.getContentInfo(git, path, objectId),
+          commit     = revCommit.getName
+        )
       } getOrElse NotFound()
     }
   })
@@ -203,7 +294,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       oldFileName = None,
       content     = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
       charset     = form.charset,
-      message     = form.message.getOrElse(s"Create ${form.newFileName}")
+      message     = form.message.getOrElse(s"Create ${form.newFileName}"),
+      commit      = form.commit
     )
 
     redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
@@ -220,21 +312,31 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       oldFileName = form.oldFileName,
       content     = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
       charset     = form.charset,
-      message     = if(form.oldFileName.exists(_ == form.newFileName)){
+      message     = if (form.oldFileName.contains(form.newFileName)) {
         form.message.getOrElse(s"Update ${form.newFileName}")
       } else {
         form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
-      }
+      },
+      commit      = form.commit
     )
 
     redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
-      if(form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
+      if (form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
     }")
   })
 
   post("/:owner/:repository/remove", deleteForm)(writableUsersOnly { (form, repository) =>
-    commitFile(repository, form.branch, form.path, None, Some(form.fileName), "", "",
+    commitFile(
-      form.message.getOrElse(s"Delete ${form.fileName}"))
+      repository  = repository,
+      branch      = form.branch,
+      path        = form.path,
+      newFileName = None,
+      oldFileName = Some(form.fileName),
+      content     = "",
+      charset     = "",
+      message     = form.message.getOrElse(s"Delete ${form.fileName}"),
+      commit      = form.commit
+    )
 
     redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}${if(form.path.length == 0) "" else form.path}")
   })
@@ -243,13 +345,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val (id, path) = repository.splitPath(multiParams("splat").head)
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-      getPathObjectId(git, path, revCommit).flatMap { objectId =>
+
-        JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+      getPathObjectId(git, path, revCommit).map { objectId =>
-          contentType = FileUtil.getMimeType(path)
+        responseRawFile(git, objectId, path, repository)
-          response.setContentLength(loader.getSize.toInt)
-          loader.copyTo(response.outputStream)
-          ()
-        }
       } getOrElse NotFound()
     }
   })
@@ -265,23 +363,33 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       getPathObjectId(git, path, revCommit).map { objectId =>
         if(raw){
           // Download (This route is left for backword compatibility)
-          JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+          responseRawFile(git, objectId, path, repository)
-            contentType = FileUtil.getMimeType(path)
-            response.setContentLength(loader.getSize.toInt)
-            loader.copyTo(response.outputStream)
-            ()
-          } getOrElse NotFound()
         } else {
-          html.blob(id, repository, path.split("/").toList,
+          html.blob(
-            JGitUtil.getContentInfo(git, path, objectId),
+            branch             = id,
-            new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
+            repository         = repository,
-            hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+            pathList           = path.split("/").toList,
-            request.paths(2) == "blame")
+            content            = JGitUtil.getContentInfo(git, path, objectId),
+            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)
+          )
         }
       } getOrElse NotFound()
     }
   })
 
+  private def isLfsFile(git: Git, objectId: ObjectId): Boolean = {
+    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+      if(loader.isLarge){
+        false
+      } else {
+        new String(loader.getCachedBytes, "UTF-8").startsWith("version https://git-lfs.github.com/spec/v1")
+      }
+    }.getOrElse(false)
+  }
+
   get("/:owner/:repository/blame/*"){
     blobRoute.action()
   }
@@ -533,6 +641,116 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   })
 
+  case class UploadFiles(branch: String, path: String, fileIds: Map[String,String], message: String) {
+    lazy val isValid: Boolean = fileIds.nonEmpty
+  }
+
+  case class CommitFile(id: String, name: String)
+
+  private def commitFiles(repository: RepositoryService.RepositoryInfo,
+                          files: Seq[CommitFile],
+                          branch: String, path: String, message: String) = {
+    // prepend path to the filename
+    val newFiles = files.map { file =>
+      file.copy(name = if(path.length == 0) file.name else s"${path}/${file.name}")
+    }
+
+    _commitFile(repository, branch, message) { case (git, headTip, builder, inserter) =>
+      JGitUtil.processTree(git, headTip) { (path, tree) =>
+        if(!newFiles.exists(_.name.contains(path))) {
+          builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+        }
+      }
+
+      newFiles.foreach { file =>
+        val bytes = FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), file.id))
+        builder.add(JGitUtil.createDirCacheEntry(file.name,
+          FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
+        builder.finish()
+      }
+    }
+  }
+
+  private def commitFile(repository: RepositoryService.RepositoryInfo,
+    branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
+    content: String, charset: String, message: String, commit: String) = {
+
+    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
+    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
+
+    _commitFile(repository, branch, message){ case (git, headTip, builder, inserter) =>
+      if(headTip.getName == commit){
+        val permission = JGitUtil.processTree(git, headTip) { (path, tree) =>
+          // Add all entries except the editing file
+          if (!newPath.contains(path) && !oldPath.contains(path)) {
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          }
+          // Retrieve permission if file exists to keep it
+          oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
+        }.flatten.headOption
+
+        newPath.foreach { newPath =>
+          builder.add(JGitUtil.createDirCacheEntry(newPath,
+            permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
+            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
+        }
+        builder.finish()
+      }
+    }
+  }
+
+  private def _commitFile(repository: RepositoryService.RepositoryInfo,
+    branch: String, message: String)(f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit) = {
+
+    LockUtil.lock(s"${repository.owner}/${repository.name}") {
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        val loginAccount = context.loginAccount.get
+        val builder = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headName = s"refs/heads/${branch}"
+        val headTip = git.getRepository.resolve(headName)
+
+        f(git, headTip, builder, inserter)
+
+        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+          headName, loginAccount.userName, loginAccount.mailAddress, message)
+
+        inserter.flush()
+        inserter.close()
+
+        // update refs
+        val refUpdate = git.getRepository.updateRef(headName)
+        refUpdate.setNewObjectId(commitId)
+        refUpdate.setForceUpdate(false)
+        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        refUpdate.update()
+
+        // update pull request
+        updatePullRequests(repository.owner, repository.name, branch)
+
+        // record activity
+        val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
+
+        // create issue comment by commit message
+        createIssueComment(repository.owner, repository.name, commitInfo)
+
+        // close issue by commit message
+        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+
+        //call web hook
+        callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
+        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        callWebHookOf(repository.owner, repository.name, WebHook.Push) {
+          getAccountByUserName(repository.owner).map{ ownerAccount =>
+            WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
+              oldId = headTip, newId = commitId)
+          }
+        }
+      }
+    }
+  }
+
   private val readmeFiles = PluginRegistry().renderableExtensions.map { extension =>
     s"readme.${extension}"
   } ++ Seq("readme.txt", "readme")
@@ -569,7 +787,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             html.files(revision, repository,
               if(path == ".") Nil else path.split("/").toList, // current path
               new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
-              JGitUtil.getCommitCount(repository.owner, repository.name, revision),
+              JGitUtil.getCommitCount(repository.owner, repository.name, lastModifiedCommit.getName),
               files,
               readme,
               hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
@@ -583,105 +801,15 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
 
-  private def commitFile(repository: RepositoryService.RepositoryInfo,
-                         branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
-                         content: String, charset: String, message: String) = {
-
-    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
-    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
-
-    LockUtil.lock(s"${repository.owner}/${repository.name}"){
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        val loginAccount = context.loginAccount.get
-        val builder  = DirCache.newInCore.builder()
-        val inserter = git.getRepository.newObjectInserter()
-        val headName = s"refs/heads/${branch}"
-        val headTip  = git.getRepository.resolve(headName)
-
-        val permission = JGitUtil.processTree(git, headTip){ (path, tree) =>
-          // Add all entries except the editing file
-          if(!newPath.exists(_ == path) && !oldPath.exists(_ == path)){
-            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-          }
-          // Retrieve permission if file exists to keep it
-          oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
-        }.flatten.headOption
-
-        newPath.foreach { newPath =>
-          builder.add(JGitUtil.createDirCacheEntry(newPath,
-            permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
-            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
-        }
-        builder.finish()
-
-        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
-          headName, loginAccount.fullName, loginAccount.mailAddress, message)
-
-        inserter.flush()
-        inserter.close()
-
-        // update refs
-        val refUpdate = git.getRepository.updateRef(headName)
-        refUpdate.setNewObjectId(commitId)
-        refUpdate.setForceUpdate(false)
-        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
-        //refUpdate.setRefLogMessage("merged", true)
-        refUpdate.update()
-
-        // update pull request
-        updatePullRequests(repository.owner, repository.name, branch)
-
-        // record activity
-        val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
-
-        // create issue comment by commit message
-        createIssueComment(repository.owner, repository.name, commitInfo)
-
-        // close issue by commit message
-        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
-
-        // call web hook
-        callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
-        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-        callWebHookOf(repository.owner, repository.name, WebHook.Push) {
-          getAccountByUserName(repository.owner).map{ ownerAccount =>
-            WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
-                               oldId = headTip, newId = commitId)
-          }
-        }
-      }
-    }
-  }
-
-  private def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
-    @scala.annotation.tailrec
-    def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
-      case true  => _getPathObjectId(path, walk)
-      case false => None
-    }
-
-    using(new TreeWalk(git.getRepository)){ treeWalk =>
-      treeWalk.addTree(revCommit.getTree)
-      treeWalk.setRecursive(true)
-      _getPathObjectId(path, treeWalk)
-    }
-  }
-
   private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = {
     val revision = name.stripSuffix(suffix)
-    val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
-    if(workDir.exists) {
-      FileUtils.deleteDirectory(workDir)
-    }
-    workDir.mkdirs
-
-    val filename = repository.name + "-" +
-      (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + suffix
 
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+      val oid = git.getRepository.resolve(revision)
+      val revCommit = JGitUtil.getRevCommitFromId(git, oid)
+      val sha1 = oid.getName()
+      val repositorySuffix = (if(sha1.startsWith(revision)) sha1 else revision).replace('/','-')
+      val filename = repository.name + "-" + repositorySuffix + suffix
 
       contentType = "application/octet-stream"
       response.setHeader("Content-Disposition", s"attachment; filename=${filename}")
@@ -689,7 +817,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
       git.archive
          .setFormat(suffix.tail)
-         .setTree(revCommit.getTree)
+         .setPrefix(repository.name + "-" + repositorySuffix + "/")
+         .setTree(revCommit)
          .setOutputStream(response.getOutputStream)
          .call()
     }
@@ -698,6 +827,26 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 
+  private def conflict: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      val owner      = params("owner")
+      val repository = params("repository")
+      val branch     = params("branch")
+
+      LockUtil.lock(s"${owner}/${repository}") {
+        using(Git.open(getRepositoryDir(owner, repository))) { git =>
+          val headName = s"refs/heads/${branch}"
+          val headTip = git.getRepository.resolve(headName)
+          if(headTip.getName != value){
+            Some("Someone pushed new commits before you. Please reload this page and re-apply your changes.")
+          } else {
+            None
+          }
+        }
+      }
+    }
+  }
+
   override protected def renderUncaughtException(e: Throwable)(implicit request: HttpServletRequest, response: HttpServletResponse): Unit = {
     e.printStackTrace()
   }

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

@@ -6,15 +6,19 @@ import gitbucket.core.admin.html
 import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
 import gitbucket.core.util.{AdminAuthenticator, Mailer}
 import gitbucket.core.ssh.SshServer
-import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.plugin.{PluginInfoBase, PluginRegistry, PluginRepository}
 import SystemSettingsService._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.StringUtil._
 import io.github.gitbucket.scalatra.forms._
 import org.apache.commons.io.{FileUtils, IOUtils}
 import org.scalatra.i18n.Messages
+import com.github.zafarkhaja.semver.{Version => Semver}
+import gitbucket.core.GitBucketCoreModule
+import scala.collection.JavaConverters._
+
 
 class SystemSettingsController extends SystemSettingsControllerBase
   with AccountService with RepositoryService with AdminAuthenticator
@@ -41,6 +45,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         "user"                     -> trim(label("SMTP User", optional(text()))),
         "password"                 -> trim(label("SMTP Password", optional(text()))),
         "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
+        "starttls"                 -> trim(label("Enable STARTTLS", optional(boolean()))),
         "fromAddress"              -> trim(label("FROM Address", optional(text()))),
         "fromName"                 -> trim(label("FROM Name", optional(text())))
     )(Smtp.apply)),
@@ -58,7 +63,8 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
         "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
         "keystore"                 -> trim(label("Keystore", optional(text())))
-    )(Ldap.apply))
+    )(Ldap.apply)),
+    "skinName" -> trim(label("AdminLTE skin name", text(required)))
   )(SystemSettings.apply).verifying { settings =>
     Vector(
       if(settings.ssh && settings.baseUrl.isEmpty){
@@ -77,6 +83,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       "user"        -> trim(label("SMTP User", optional(text()))),
       "password"    -> trim(label("SMTP Password", optional(text()))),
       "ssl"         -> trim(label("Enable SSL", optional(boolean()))),
+      "starttls"    -> trim(label("Enable STARTTLS", optional(boolean()))),
       "fromAddress" -> trim(label("FROM Address", optional(text()))),
       "fromName"    -> trim(label("FROM Name", optional(text())))
     )(Smtp.apply),
@@ -89,35 +96,37 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   case class NewUserForm(userName: String, password: String, fullName: String,
                          mailAddress: String, isAdmin: Boolean,
-                         url: Option[String], fileId: Option[String])
+                         description: Option[String], url: Option[String], fileId: Option[String])
 
   case class EditUserForm(userName: String, password: Option[String], fullName: String,
-                          mailAddress: String, isAdmin: Boolean, url: Option[String],
+                          mailAddress: String, isAdmin: Boolean, description: Option[String], url: Option[String],
                           fileId: Option[String], clearImage: Boolean, isRemoved: Boolean)
 
-  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
+  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
                           members: String)
 
-  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
+  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
                            members: String, clearImage: Boolean, isRemoved: Boolean)
 
 
   val newUserForm = mapping(
     "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     ,text(required, maxlength(20)))),
+    "password"    -> trim(label("Password"     ,text(required, maxlength(20), password))),
     "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
     "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "description" -> trim(label("bio"          ,optional(text()))),
     "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      ,optional(text())))
   )(NewUserForm.apply)
 
   val editUserForm = mapping(
     "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier))),
-    "password"    -> trim(label("Password"     ,optional(text(maxlength(20))))),
+    "password"    -> trim(label("Password"     ,optional(text(maxlength(20), password)))),
     "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
     "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "description" -> trim(label("bio"          ,optional(text()))),
     "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      ,optional(text()))),
     "clearImage"  -> trim(label("Clear image"  ,boolean())),
@@ -126,6 +135,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   val newGroupForm = mapping(
     "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "description" -> trim(label("Group description", optional(text()))),
     "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
     "fileId"    -> trim(label("File ID"    ,optional(text()))),
     "members"   -> trim(label("Members"    ,text(required, members)))
@@ -133,6 +143,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   val editGroupForm = mapping(
     "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "description" -> trim(label("Group description", optional(text()))),
     "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
     "fileId"     -> trim(label("File ID"     ,optional(text()))),
     "members"    -> trim(label("Members"     ,text(required, members))),
@@ -164,7 +175,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
     try {
       new Mailer(form.smtp).send(form.testAddress,
-        "Test message from GitBucket", "This is a test message from GitBucket.")
+        "Test message from GitBucket", context.loginAccount.get,
+        "This is a test message from GitBucket.", None
+        )
 
       "Test mail has been sent to: " + form.testAddress
 
@@ -174,7 +187,71 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   })
 
   get("/admin/plugins")(adminOnly {
-    html.plugins(PluginRegistry().getPlugins())
+    // Installed plugins
+    val enabledPlugins = PluginRegistry().getPlugins()
+
+    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))
+        }
+      }.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
+        )
+      }
+
+    // Merge
+    val plugins = enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false))
+
+    html.plugins(plugins, flash.get("info"))
+  })
+
+  post("/admin/plugins/_reload")(adminOnly {
+    PluginRegistry.reload(request.getServletContext(), loadSystemSettings(), request2Session(request).conn)
+    flash += "info" -> "All plugins were reloaded."
+    redirect("/admin/plugins")
+  })
+
+  post("/admin/plugins/:pluginId/:version/_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."
+      }
+    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."
+        }
+      }
+    redirect("/admin/plugins")
   })
 
 
@@ -193,7 +270,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   })
 
   post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
-    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.url)
+    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.description, form.url)
     updateImage(form.userName, form.fileId, false)
     redirect("/admin/users")
   })
@@ -218,7 +295,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
           //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
           //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
           //        }
-          // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+          // Remove from GROUP_MEMBER and COLLABORATOR
           removeUserRelatedData(userName)
         }
 
@@ -227,10 +304,15 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
           fullName     = form.fullName,
           mailAddress  = form.mailAddress,
           isAdmin      = form.isAdmin,
+          description  = form.description,
           url          = form.url,
           isRemoved    = form.isRemoved))
 
         updateImage(userName, form.fileId, form.clearImage)
+
+        // call hooks
+        if(form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
         redirect("/admin/users")
       }
     } getOrElse NotFound()
@@ -241,7 +323,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   })
 
   post("/admin/users/_newgroup", newGroupForm)(adminOnly { form =>
-    createGroup(form.groupName, form.url)
+    createGroup(form.groupName, form.description, form.url)
     updateGroupMembers(form.groupName, form.members.split(",").map {
       _.split(":") match {
         case Array(userName, isManager) => (userName, isManager.toBoolean)
@@ -264,18 +346,18 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       }
     }.toList){ case (groupName, members) =>
       getAccountByUserName(groupName, true).map { account =>
-        updateGroup(groupName, form.url, form.isRemoved)
+        updateGroup(groupName, form.description, form.url, form.isRemoved)
 
         if(form.isRemoved){
           // Remove from GROUP_MEMBER
           updateGroupMembers(form.groupName, Nil)
-          // Remove repositories
+//          // Remove repositories
-          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+//          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-            deleteRepository(groupName, repositoryName)
+//            deleteRepository(groupName, repositoryName)
-            FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+//            FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
-            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+//            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
-            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+//            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
-          }
+//          }
         } else {
           // Update GROUP_MEMBER
           updateGroupMembers(form.groupName, members)

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

@@ -1,11 +1,13 @@
 package gitbucket.core.controller
 
+import gitbucket.core.model.WebHook
 import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.service.WebHookService.WebHookGollumPayload
 import gitbucket.core.wiki.html
-import gitbucket.core.service.{AccountService, ActivityService, RepositoryService, WikiService}
+import gitbucket.core.service._
 import gitbucket.core.util._
 import gitbucket.core.util.StringUtil._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
 import io.github.gitbucket.scalatra.forms._
@@ -13,11 +15,12 @@ import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
 
 class WikiController extends WikiControllerBase
-  with WikiService with RepositoryService with AccountService with ActivityService
+  with WikiService with RepositoryService with AccountService with ActivityService with WebHookService
   with ReadableUsersAuthenticator with ReferrerAuthenticator
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with ActivityService with ReadableUsersAuthenticator with ReferrerAuthenticator =>
+  self: WikiService with RepositoryService with AccountService with ActivityService with WebHookService
+    with ReadableUsersAuthenticator with ReferrerAuthenticator =>
 
   case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
 
@@ -136,6 +139,11 @@ trait WikiControllerBase extends ControllerBase {
         ).map { commitId =>
           updateLastActivityDate(repository.owner, repository.name)
           recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+            getAccountByUserName(repository.owner).map { repositoryUser =>
+              WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
+            }
+          }
         }
         if(notReservedPageName(form.pageName)) {
           redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
@@ -155,11 +163,24 @@ trait WikiControllerBase extends ControllerBase {
   post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
     if(isEditable(repository)){
       defining(context.loginAccount.get){ loginAccount =>
-        saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
+        saveWikiPage(
-          form.content, loginAccount, form.message.getOrElse(""), None)
+          repository.owner,
-
+          repository.name,
+          form.currentPageName,
+          form.pageName,
+          form.content,
+          loginAccount,
+          form.message.getOrElse(""),
+          None
+        ).map { commitId =>
           updateLastActivityDate(repository.owner, repository.name)
           recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+            getAccountByUserName(repository.owner).map { repositoryUser =>
+              WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
+            }
+          }
+        }
 
         if(notReservedPageName(form.pageName)) {
           redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")

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

@@ -2,7 +2,8 @@ package gitbucket.core.model
 
 
 trait AccessTokenComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
+
   lazy val AccessTokens = TableQuery[AccessTokens]
 
   class AccessTokens(tag: Tag) extends Table[AccessToken](tag, "ACCESS_TOKEN") {

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait AccountComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val Accounts = TableQuery[Accounts]
@@ -19,7 +19,8 @@ trait AccountComponent { self: Profile =>
     val image = column[String]("IMAGE")
     val groupAccount = column[Boolean]("GROUP_ACCOUNT")
     val removed = column[Boolean]("REMOVED")
-    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
+    val description = column[String]("DESCRIPTION")
+    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed, description.?) <> (Account.tupled, Account.unapply)
   }
 }
 
@@ -35,5 +36,6 @@ case class Account(
   lastLoginDate: Option[java.util.Date],
   image: Option[String],
   isGroupAccount: Boolean,
-  isRemoved: Boolean
+  isRemoved: Boolean,
+  description: Option[String]
 )

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

@@ -0,0 +1,25 @@
+package gitbucket.core.model
+
+trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  private implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+
+  lazy val AccountWebHooks = TableQuery[AccountWebHooks]
+
+  class AccountWebHooks(tag: Tag) extends Table[AccountWebHook](tag, "ACCOUNT_WEB_HOOK") with BasicTemplate {
+    val url = column[String]("URL")
+    val token = column[Option[String]]("TOKEN")
+    val ctype = column[WebHookContentType]("CTYPE")
+    def * = (userName, url, ctype, token) <> ((AccountWebHook.apply _).tupled, AccountWebHook.unapply)
+
+    def byPrimaryKey(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
+  }
+}
+
+case class AccountWebHook(
+  userName: String,
+  url: String,
+  ctype: WebHookContentType,
+  token: Option[String]
+) extends WebHook

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

@@ -0,0 +1,34 @@
+package gitbucket.core.model
+
+trait AccountWebHookEventComponent extends TemplateComponent {
+  self: Profile =>
+
+  import profile.api._
+  import gitbucket.core.model.Profile.AccountWebHooks
+
+  lazy val AccountWebHookEvents = TableQuery[AccountWebHookEvents]
+
+  class AccountWebHookEvents(tag: Tag) extends Table[AccountWebHookEvent](tag, "ACCOUNT_WEB_HOOK_EVENT") with BasicTemplate {
+    val url = column[String]("URL")
+    val event = column[WebHook.Event]("EVENT")
+
+    def * = (userName, url, event)  <> ((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)
+
+    def byAccountWebHook(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
+
+    def byAccountWebHook(owner: Rep[String], url: Rep[String]) =
+      (this.userName === userName) && (this.url === url)
+
+    def byAccountWebHook(webhook: AccountWebHooks) =
+      (this.userName === webhook.userName) && (this.url === webhook.url)
+
+    def byPrimaryKey(userName: String, url: String, event: WebHook.Event) =
+      (this.userName === userName.bind) && (this.url === url.bind) && (this.event === event.bind)
+  }
+}
+
+case class AccountWebHookEvent(
+                         userName: String,
+                         url: String,
+                         event: WebHook.Event
+                       )

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait ActivityComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val Activities = TableQuery[Activities]

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

@@ -1,16 +1,20 @@
 package gitbucket.core.model
 
 protected[model] trait TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
 
   trait BasicTemplate { self: Table[_] =>
     val userName = column[String]("USER_NAME")
     val repositoryName = column[String]("REPOSITORY_NAME")
 
+    def byAccount(userName: String) = (this.userName === userName.bind)
+
+    def byAccount(userName: Rep[String]) = (this.userName === userName)
+
     def byRepository(owner: String, repository: String) =
       (userName === owner.bind) && (repositoryName === repository.bind)
 
-    def byRepository(userName: Column[String], repositoryName: Column[String]) =
+    def byRepository(userName: Rep[String], repositoryName: Rep[String]) =
       (this.userName === userName) && (this.repositoryName === repositoryName)
   }
 
@@ -20,7 +24,7 @@ protected[model] trait TemplateComponent { self: Profile =>
     def byIssue(owner: String, repository: String, issueId: Int) =
       byRepository(owner, repository) && (this.issueId === issueId.bind)
 
-    def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
+    def byIssue(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) =
       byRepository(userName, repositoryName) && (this.issueId === issueId)
   }
 
@@ -31,20 +35,34 @@ protected[model] trait TemplateComponent { self: Profile =>
     def byLabel(owner: String, repository: String, labelId: Int) =
       byRepository(owner, repository) && (this.labelId === labelId.bind)
 
-    def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
+    def byLabel(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) =
       byRepository(userName, repositoryName) && (this.labelId === labelId)
 
     def byLabel(owner: String, repository: String, labelName: String) =
       byRepository(owner, repository) && (this.labelName === labelName.bind)
   }
 
+  trait PriorityTemplate extends BasicTemplate { self: Table[_] =>
+    val priorityId = column[Int]("PRIORITY_ID")
+    val priorityName = column[String]("PRIORITY_NAME")
+
+    def byPriority(owner: String, repository: String, priorityId: Int) =
+      byRepository(owner, repository) && (this.priorityId === priorityId.bind)
+
+    def byPriority(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) =
+      byRepository(userName, repositoryName) && (this.priorityId === priorityId)
+
+    def byPriority(owner: String, repository: String, priorityName: String) =
+      byRepository(owner, repository) && (this.priorityName === priorityName.bind)
+  }
+
   trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
     val milestoneId = column[Int]("MILESTONE_ID")
 
     def byMilestone(owner: String, repository: String, milestoneId: Int) =
       byRepository(owner, repository) && (this.milestoneId === milestoneId.bind)
 
-    def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
+    def byMilestone(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) =
       byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
   }
 
@@ -54,13 +72,13 @@ protected[model] trait TemplateComponent { self: Profile =>
     def byCommit(owner: String, repository: String, commitId: String) =
       byRepository(owner, repository) && (this.commitId === commitId)
 
-    def byCommit(owner: Column[String], repository: Column[String], commitId: Column[String]) =
+    def byCommit(owner: Rep[String], repository: Rep[String], commitId: Rep[String]) =
       byRepository(userName, repositoryName) && (this.commitId === commitId)
   }
 
   trait BranchTemplate extends BasicTemplate{ self: Table[_] =>
     val branch = column[String]("BRANCH")
     def byBranch(owner: String, repository: String, branchName: String) = byRepository(owner, repository) && (branch === branchName.bind)
-    def byBranch(owner: Column[String], repository: Column[String], branchName: Column[String]) = byRepository(owner, repository) && (this.branch === branchName)
+    def byBranch(owner: Rep[String], repository: Rep[String], branchName: Rep[String]) = byRepository(owner, repository) && (this.branch === branchName)
   }
 }

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait CollaboratorComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
 
   lazy val Collaborators = TableQuery[Collaborators]
 

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

@@ -6,12 +6,10 @@ trait Comment {
 }
 
 trait IssueCommentComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
-  lazy val IssueComments = new TableQuery(tag => new IssueComments(tag)){
+  lazy val IssueComments = TableQuery[IssueComments]
-    def autoInc = this returning this.map(_.commentId)
-  }
 
   class IssueComments(tag: Tag) extends Table[IssueComment](tag, "ISSUE_COMMENT") with IssueTemplate {
     val commentId = column[Int]("COMMENT_ID", O AutoInc)
@@ -39,12 +37,10 @@ case class IssueComment (
 ) extends Comment
 
 trait CommitCommentComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
-  lazy val CommitComments = new TableQuery(tag => new CommitComments(tag)){
+  lazy val CommitComments = TableQuery[CommitComments]
-    def autoInc = this returning this.map(_.commentId)
-  }
 
   class CommitComments(tag: Tag) extends Table[CommitComment](tag, "COMMIT_COMMENT") with CommitTemplate {
     val commentId = column[Int]("COMMENT_ID", O AutoInc)

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

@@ -1,10 +1,7 @@
 package gitbucket.core.model
 
-import scala.slick.lifted.MappedTo
-import scala.slick.jdbc._
-
 trait CommitStatusComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name , i => CommitState(i))
@@ -90,7 +87,5 @@ object CommitState {
     }
   }
 
-  implicit val getResult: GetResult[CommitState] = GetResult(r => CommitState(r.<<))
-  implicit val getResultOpt: GetResult[Option[CommitState]] = GetResult(r => r.<<?[String].map(CommitState(_)))
 }
 

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

@@ -0,0 +1,27 @@
+package gitbucket.core.model
+
+trait DeployKeyComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  lazy val DeployKeys = TableQuery[DeployKeys]
+
+  class DeployKeys(tag: Tag) extends Table[DeployKey](tag, "DEPLOY_KEY") with BasicTemplate {
+    val deployKeyId = column[Int]("DEPLOY_KEY_ID", O AutoInc)
+    val title = column[String]("TITLE")
+    val publicKey = column[String]("PUBLIC_KEY")
+    val allowWrite = column[Boolean]("ALLOW_WRITE")
+    def * = (userName, repositoryName, deployKeyId, title, publicKey, allowWrite) <> (DeployKey.tupled, DeployKey.unapply)
+
+    def byPrimaryKey(userName: String, repositoryName: String, deployKeyId: Int) =
+      (this.userName === userName.bind) && (this.repositoryName === repositoryName.bind) && (this.deployKeyId === deployKeyId.bind)
+  }
+}
+
+case class DeployKey(
+  userName: String,
+  repositoryName: String,
+  deployKeyId: Int = 0,
+  title: String,
+  publicKey: String,
+  allowWrite: Boolean
+)

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait GroupMemberComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
 
   lazy val GroupMembers = TableQuery[GroupMembers]
 

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait IssueComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val IssueId = TableQuery[IssueId]
@@ -13,12 +13,13 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
   }
 
-  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
+  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
     val commentCount = column[Int]("COMMENT_COUNT")
-    def * = (userName, repositoryName, issueId, commentCount)
+    val priority = column[Int]("PRIORITY")
+    def * = (userName, repositoryName, issueId, commentCount, priority)
   }
 
-  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate {
+  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate with PriorityTemplate {
     val openedUserName = column[String]("OPENED_USER_NAME")
     val assignedUserName = column[String]("ASSIGNED_USER_NAME")
     val title = column[String]("TITLE")
@@ -27,7 +28,7 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     val pullRequest = column[Boolean]("PULL_REQUEST")
-    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
+    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, priorityId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
 
     def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
   }
@@ -39,6 +40,7 @@ case class Issue(
   issueId: Int,
   openedUserName: String,
   milestoneId: Option[Int],
+  priorityId: Option[Int],
   assignedUserName: Option[String],
   title: String,
   content: Option[String],

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait IssueLabelComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
 
   lazy val IssueLabels = TableQuery[IssueLabels]
 

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait LabelComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
 
   lazy val Labels = TableQuery[Labels]
 
@@ -12,7 +12,7 @@ trait LabelComponent extends TemplateComponent { self: Profile =>
     def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
 
     def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
-    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) = byLabel(userName, repositoryName, labelId)
   }
 }
 

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait MilestoneComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val Milestones = TableQuery[Milestones]
@@ -9,13 +9,13 @@ trait MilestoneComponent extends TemplateComponent { self: Profile =>
   class Milestones(tag: Tag) extends Table[Milestone](tag, "MILESTONE") with MilestoneTemplate {
     override val milestoneId = column[Int]("MILESTONE_ID", O AutoInc)
     val title = column[String]("TITLE")
-    val description = column[String]("DESCRIPTION")
+    val description = column[Option[String]]("DESCRIPTION")
-    val dueDate = column[java.util.Date]("DUE_DATE")
+    val dueDate = column[Option[java.util.Date]]("DUE_DATE")
-    val closedDate = column[java.util.Date]("CLOSED_DATE")
+    val closedDate = column[Option[java.util.Date]]("CLOSED_DATE")
-    def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply)
+    def * = (userName, repositoryName, milestoneId, title, description, dueDate, closedDate) <> (Milestone.tupled, Milestone.unapply)
 
     def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
-    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) = byMilestone(userName, repositoryName, milestoneId)
   }
 }
 

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

@@ -0,0 +1,43 @@
+package gitbucket.core.model
+
+trait PriorityComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  lazy val Priorities = TableQuery[Priorities]
+
+  class Priorities(tag: Tag) extends Table[Priority](tag, "PRIORITY") with PriorityTemplate {
+    override val priorityId = column[Int]("PRIORITY_ID", O AutoInc)
+    override val priorityName = column[String]("PRIORITY_NAME")
+    val description = column[String]("DESCRIPTION")
+    val ordering = column[Int]("ORDERING")
+    val isDefault = column[Boolean]("IS_DEFAULT")
+    val color = column[String]("COLOR")
+    def * = (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, priorityId: Int) = byPriority(owner, repository, priorityId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) = byPriority(userName, repositoryName, priorityId)
+  }
+}
+
+case class Priority (
+  userName: String,
+  repositoryName: String,
+  priorityId: Int = 0,
+  priorityName: String,
+  description: Option[String],
+  isDefault: Boolean,
+  ordering: Int = 0,
+  color: String){
+
+  val fontColor = {
+    val r = color.substring(0, 2)
+    val g = color.substring(2, 4)
+    val b = color.substring(4, 6)
+
+    if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
+      "000000"
+    } else {
+      "ffffff"
+    }
+  }
+}

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

@@ -1,10 +1,11 @@
 package gitbucket.core.model
 
 import gitbucket.core.util.DatabaseConfig
+import com.github.takezoe.slick.blocking.BlockingJdbcProfile
 
 trait Profile {
-  val profile: slick.driver.JdbcProfile
+  val profile: BlockingJdbcProfile
-  import profile.simple._
+  import profile.blockingApi._
 
   /**
    * java.util.Date Mapped Column Types
@@ -14,11 +15,16 @@ trait Profile {
     t => new java.util.Date(t.getTime)
   )
 
+  /**
+    * WebHookBase.Event Column Types
+    */
+  implicit val eventColumnType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
+
   /**
    * Extends Column to add conditional condition
    */
-  implicit class RichColumn(c1: Column[Boolean]){
+  implicit class RichColumn(c1: Rep[Boolean]){
-    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
+    def &&(c2: => Rep[Boolean], guard: => Boolean): Rep[Boolean] = if(guard) c1 && c2 else c1
   }
 
   /**
@@ -46,12 +52,16 @@ trait CoreProfile extends ProfileProvider with Profile
   with IssueCommentComponent
   with IssueLabelComponent
   with LabelComponent
+  with PriorityComponent
   with MilestoneComponent
   with PullRequestComponent
   with RepositoryComponent
   with SshKeyComponent
-  with WebHookComponent
+  with RepositoryWebHookComponent
-  with WebHookEventComponent
+  with RepositoryWebHookEventComponent
+  with AccountWebHookComponent
+  with AccountWebHookEventComponent
   with ProtectedBranchComponent
+  with DeployKeyComponent
 
 object Profile extends CoreProfile

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

@@ -1,10 +1,7 @@
 package gitbucket.core.model
 
-import scala.slick.lifted.MappedTo
-import scala.slick.jdbc._
-
 trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val ProtectedBranches = TableQuery[ProtectedBranches]
@@ -12,7 +9,7 @@ trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
     val statusCheckAdmin = column[Boolean]("STATUS_CHECK_ADMIN")
     def * = (userName, repositoryName, branch, statusCheckAdmin) <> (ProtectedBranch.tupled, ProtectedBranch.unapply)
     def byPrimaryKey(userName: String, repositoryName: String, branch: String) = byBranch(userName, repositoryName, branch)
-    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], branch: Column[String]) = byBranch(userName, repositoryName, branch)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], branch: Rep[String]) = byBranch(userName, repositoryName, branch)
   }
 
   lazy val ProtectedBranchContexts = TableQuery[ProtectedBranchContexts]

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait PullRequestComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
 
   lazy val PullRequests = TableQuery[PullRequests]
 
@@ -15,7 +15,7 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
     def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)
 
     def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
-    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) = byIssue(userName, repositoryName, issueId)
   }
 }
 

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait RepositoryComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val Repositories = TableQuery[Repositories]

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

@@ -0,0 +1,27 @@
+package gitbucket.core.model
+
+trait RepositoryWebHookComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+
+  lazy val RepositoryWebHooks = TableQuery[RepositoryWebHooks]
+
+  class RepositoryWebHooks(tag: Tag) extends Table[RepositoryWebHook](tag, "WEB_HOOK") with BasicTemplate {
+    val url = column[String]("URL")
+    val token = column[Option[String]]("TOKEN")
+    val ctype = column[WebHookContentType]("CTYPE")
+    def * = (userName, repositoryName, url, ctype, token) <> ((RepositoryWebHook.apply _).tupled, RepositoryWebHook.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+  }
+}
+
+
+case class RepositoryWebHook(
+  userName: String,
+  repositoryName: String,
+  url: String,
+  ctype: WebHookContentType,
+  token: Option[String]
+) extends WebHook

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

@@ -0,0 +1,28 @@
+package gitbucket.core.model
+
+trait RepositoryWebHookEventComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+  import gitbucket.core.model.Profile.RepositoryWebHooks
+
+  lazy val RepositoryWebHookEvents = TableQuery[RepositoryWebHookEvents]
+
+  class RepositoryWebHookEvents(tag: Tag) extends Table[RepositoryWebHookEvent](tag, "WEB_HOOK_EVENT") with BasicTemplate {
+    val url = column[String]("URL")
+    val event = column[WebHook.Event]("EVENT")
+    def * = (userName, repositoryName, url, event) <> ((RepositoryWebHookEvent.apply _).tupled, RepositoryWebHookEvent.unapply)
+
+    def byRepositoryWebHook(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+    def byRepositoryWebHook(owner: Rep[String], repository: Rep[String], url: Rep[String]) =
+      byRepository(userName, repositoryName) && (this.url === url)
+    def byRepositoryWebHook(webhook: RepositoryWebHooks) =
+      byRepository(webhook.userName, webhook.repositoryName) && (this.url === webhook.url)
+    def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) = byRepositoryWebHook(owner, repository, url) && (this.event === event.bind)
+  }
+}
+
+case class RepositoryWebHookEvent(
+  userName: String,
+  repositoryName: String,
+  url: String,
+  event: WebHook.Event
+)

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
 trait SshKeyComponent { self: Profile =>
-  import profile.simple._
+  import profile.api._
 
   lazy val SshKeys = TableQuery[SshKeys]
 

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

@@ -1,27 +1,9 @@
 package gitbucket.core.model
 
-trait WebHookComponent extends TemplateComponent { self: Profile =>
+abstract sealed case class WebHookContentType(code: String, ctype: String)
-  import profile.simple._
-
-  implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
-  
-  lazy val WebHooks = TableQuery[WebHooks]
-
-  class WebHooks(tag: Tag) extends Table[WebHook](tag, "WEB_HOOK") with BasicTemplate {
-    val url = column[String]("URL")
-    val token = column[Option[String]]("TOKEN", O.Nullable)
-    val ctype = column[WebHookContentType]("CTYPE", O.NotNull)
-    def * = (userName, repositoryName, url, ctype, token) <> ((WebHook.apply _).tupled, WebHook.unapply)
-
-    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
-  }
-}
-
-case class WebHookContentType(val code: String, val ctype: String)
 
 object WebHookContentType {
   object JSON extends WebHookContentType("json", "application/json")
-
   object FORM extends WebHookContentType("form", "application/x-www-form-urlencoded")
 
   val values: Vector[WebHookContentType] = Vector(JSON, FORM)
@@ -34,16 +16,15 @@ object WebHookContentType {
   def valueOpt(code: String): Option[WebHookContentType] = map.get(code)
 }
 
-case class WebHook(
+trait WebHook{
-  userName: String,
+  val url: String
-  repositoryName: String,
+  val ctype: WebHookContentType
-  url: String,
+  val token: Option[String]
-  ctype: WebHookContentType,
+}
-  token: Option[String]
-)
 
 object WebHook {
-  sealed class Event(var name: String)
+  abstract sealed class Event(val name: String)
+
   case object CommitComment extends Event("commit_comment")
   case object Create extends Event("create")
   case object Delete extends Event("delete")
@@ -63,9 +44,31 @@ object WebHook {
   case object Status extends Event("status")
   case object TeamAdd extends Event("team_add")
   case object Watch extends Event("watch")
+
   object Event{
-    val values = List(CommitComment,Create,Delete,Deployment,DeploymentStatus,Fork,Gollum,IssueComment,Issues,Member,PageBuild,Public,PullRequest,PullRequestReviewComment,Push,Release,Status,TeamAdd,Watch)
+    val values = List(
-    private val map:Map[String,Event] = values.map(e => e.name -> e).toMap
+      CommitComment,
+      Create,
+      Delete,
+      Deployment,
+      DeploymentStatus,
+      Fork,
+      Gollum,
+      IssueComment,
+      Issues,
+      Member,
+      PageBuild,
+      Public,
+      PullRequest,
+      PullRequestReviewComment,
+      Push,
+      Release,
+      Status,
+      TeamAdd,
+      Watch
+    )
+
+    private val map: Map[String,Event] = values.map(e => e.name -> e).toMap
     def valueOf(name: String): Event = map(name)
     def valueOpt(name: String): Option[Event] = map.get(name)
   }

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

@@ -1,30 +0,0 @@
-package gitbucket.core.model
-
-trait WebHookEventComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
-  import gitbucket.core.model.Profile.WebHooks
-
-  lazy val WebHookEvents = TableQuery[WebHookEvents]
-
-  implicit val typedType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
-
-  class WebHookEvents(tag: Tag) extends Table[WebHookEvent](tag, "WEB_HOOK_EVENT") with BasicTemplate {
-    val url = column[String]("URL")
-    val event = column[WebHook.Event]("EVENT")
-    def * = (userName, repositoryName, url, event) <> ((WebHookEvent.apply _).tupled, WebHookEvent.unapply)
-
-    def byWebHook(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
-    def byWebHook(owner: Column[String], repository: Column[String], url: Column[String]) =
-      byRepository(userName, repositoryName) && (this.url === url)
-    def byWebHook(webhook: WebHooks) =
-      byRepository(webhook.userName, webhook.repositoryName) && (this.url === webhook.url)
-    def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) = byWebHook(owner, repository, url) && (this.event === event.bind)
-  }
-}
-
-case class WebHookEvent(
-  userName: String,
-  repositoryName: String,
-  url: String,
-  event: WebHook.Event
-)

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

@@ -0,0 +1,10 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.model.Profile._
+import profile.api._
+
+trait AccountHook {
+
+  def deleted(userName: String)(implicit session: Session): Unit = ()
+
+}

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

@@ -0,0 +1,20 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.controller.Context
+import gitbucket.core.model.Issue
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+
+trait IssueHook {
+
+  def created(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def addedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def closed(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def reopened(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+
+}
+
+trait PullRequestHook extends IssueHook {
+
+  def merged(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+
+}

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

@@ -1,12 +1,14 @@
 package gitbucket.core.plugin
 
 import javax.servlet.ServletContext
+
 import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import io.github.gitbucket.solidbase.model.Version
+import play.twirl.api.Html
 
 /**
  * Trait for define plugin interface.
@@ -69,6 +71,16 @@ abstract class Plugin {
    */
   def repositoryRoutings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[GitRepositoryRouting] = Nil
 
+  /**
+   * Override to add account hooks.
+   */
+  val accountHooks: Seq[AccountHook] = Nil
+
+  /**
+   * Override to add account hooks.
+   */
+  def accountHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[AccountHook] = Nil
+
   /**
    * Override to add receive hooks.
    */
@@ -79,6 +91,46 @@ abstract class Plugin {
    */
   def receiveHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[ReceiveHook] = Nil
 
+  /**
+   * Override to add repository hooks.
+   */
+  val repositoryHooks: Seq[RepositoryHook] = Nil
+
+  /**
+   * Override to add repository hooks.
+   */
+  def repositoryHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[RepositoryHook] = Nil
+
+  /**
+   * Override to add issue hooks.
+   */
+  val issueHooks: Seq[IssueHook] = Nil
+
+  /**
+   * Override to add issue hooks.
+   */
+  def issueHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[IssueHook] = Nil
+
+  /**
+   * Override to add pull request hooks.
+   */
+  val pullRequestHooks: Seq[PullRequestHook] = Nil
+
+  /**
+   * Override to add pull request hooks.
+   */
+  def pullRequestHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[PullRequestHook] = Nil
+
+  /**
+   * Override to add repository headers.
+   */
+  val repositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = Nil
+
+  /**
+   * Override to add repository headers.
+   */
+  def repositoryHeaders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Html]] = Nil
+
   /**
    * Override to add global menus.
    */
@@ -149,6 +201,16 @@ abstract class Plugin {
    */
   def dashboardTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
 
+  /**
+   * Override to add issue sidebars.
+   */
+  val issueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
+
+  /**
+   * Override to add issue sidebars.
+   */
+  def issueSidebars(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
+
   /**
    * Override to add assets mappings.
    */
@@ -199,9 +261,24 @@ abstract class Plugin {
     (repositoryRoutings ++ repositoryRoutings(registry, context, settings)).foreach { routing =>
       registry.addRepositoryRouting(routing)
     }
+    (accountHooks ++ accountHooks(registry, context, settings)).foreach { accountHook =>
+      registry.addAccountHook(accountHook)
+    }
     (receiveHooks ++ receiveHooks(registry, context, settings)).foreach { receiveHook =>
       registry.addReceiveHook(receiveHook)
     }
+    (repositoryHooks ++ repositoryHooks(registry, context, settings)).foreach { repositoryHook =>
+      registry.addRepositoryHook(repositoryHook)
+    }
+    (issueHooks ++ issueHooks(registry, context, settings)).foreach { issueHook =>
+      registry.addIssueHook(issueHook)
+    }
+    (pullRequestHooks ++ pullRequestHooks(registry, context, settings)).foreach { pullRequestHook =>
+      registry.addPullRequestHook(pullRequestHook)
+    }
+    (repositoryHeaders ++ repositoryHeaders(registry, context, settings)).foreach { repositoryHeader =>
+      registry.addRepositoryHeader(repositoryHeader)
+    }
     (globalMenus ++ globalMenus(registry, context, settings)).foreach { globalMenu =>
       registry.addGlobalMenu(globalMenu)
     }
@@ -223,6 +300,9 @@ abstract class Plugin {
     (dashboardTabs ++ dashboardTabs(registry, context, settings)).foreach { dashboardTab =>
       registry.addDashboardTab(dashboardTab)
     }
+    (issueSidebars ++ issueSidebars(registry, context, settings)).foreach { issueSidebarComponent =>
+      registry.addIssueSidebar(issueSidebarComponent)
+    }
     (assetsMappings ++ assetsMappings(registry, context, settings)).foreach { assetMapping =>
       registry.addAssetsMapping((assetMapping._1, assetMapping._2, getClass.getClassLoader))
     }
@@ -235,11 +315,17 @@ abstract class Plugin {
   }
 
   /**
-   * This method is invoked in shutdown of plugin system.
+   * This method is invoked when the plugin system is shutting down.
    * If the plugin has any resources, release them in this method.
    */
   def shutdown(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {}
 
+//  /**
+//   * This method is invoked when this plugin is uninstalled.
+//   * Cleanup database or any other resources in this method if necessary.
+//   */
+//  def uninstall(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {}
+
   /**
    * Helper method to get a resource from classpath.
    */

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

@@ -2,59 +2,72 @@ package gitbucket.core.plugin
 
 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 gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
 import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.service.SystemSettingsService.SystemSettings
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.DatabaseConfig
 import gitbucket.core.util.Directory._
 import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
-import org.apache.commons.codec.binary.{Base64, StringUtils}
+import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
+import play.twirl.api.Html
 
-import scala.collection.mutable
+import scala.collection.JavaConverters._
-import scala.collection.mutable.ListBuffer
 
 class PluginRegistry {
 
-  private val plugins = new ListBuffer[PluginInfo]
+  private val plugins = new ConcurrentLinkedQueue[PluginInfo]
-  private val javaScripts = new ListBuffer[(String, String)]
+  private val javaScripts = new ConcurrentLinkedQueue[(String, String)]
-  private val controllers = new ListBuffer[(ControllerBase, String)]
+  private val controllers = new ConcurrentLinkedQueue[(ControllerBase, String)]
-  private val images = mutable.Map[String, String]()
+  private val images = new ConcurrentHashMap[String, String]
-  private val renderers = mutable.Map[String, Renderer]()
+  private val renderers = new ConcurrentHashMap[String, Renderer]
-  renderers ++= Seq(
+  renderers.put("md", MarkdownRenderer)
-    "md" -> MarkdownRenderer, "markdown" -> MarkdownRenderer
+  renderers.put("markdown", MarkdownRenderer)
-  )
+  private val repositoryRoutings = new ConcurrentLinkedQueue[GitRepositoryRouting]
-  private val repositoryRoutings = new ListBuffer[GitRepositoryRouting]
+  private val accountHooks = new ConcurrentLinkedQueue[AccountHook]
-  private val receiveHooks = new ListBuffer[ReceiveHook]
+  private val receiveHooks = new ConcurrentLinkedQueue[ReceiveHook]
-  receiveHooks += new ProtectedBranchReceiveHook()
+  receiveHooks.add(new ProtectedBranchReceiveHook())
 
-  private val globalMenus = new ListBuffer[(Context) => Option[Link]]
+  private val repositoryHooks = new ConcurrentLinkedQueue[RepositoryHook]
-  private val repositoryMenus = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
+  private val issueHooks = new ConcurrentLinkedQueue[IssueHook]
-  private val repositorySettingTabs = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
-  private val profileTabs = new ListBuffer[(Account, Context) => Option[Link]]
-  private val systemSettingMenus = new ListBuffer[(Context) => Option[Link]]
-  private val accountSettingMenus = new ListBuffer[(Context) => Option[Link]]
-  private val dashboardTabs = new ListBuffer[(Context) => Option[Link]]
-  private val assetsMappings = new ListBuffer[(String, String, ClassLoader)]
-  private val textDecorators = new ListBuffer[TextDecorator]
 
-  private val suggestionProviders = new ListBuffer[SuggestionProvider]
+  private val pullRequestHooks = new ConcurrentLinkedQueue[PullRequestHook]
-  suggestionProviders += new UserNameSuggestionProvider()
 
-  def addPlugin(pluginInfo: PluginInfo): Unit = plugins += pluginInfo
+  private val repositoryHeaders = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Html]]
+  private val globalMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val repositoryMenus = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Link]]
+  private val repositorySettingTabs = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Link]]
+  private val profileTabs = new ConcurrentLinkedQueue[(Account, Context) => Option[Link]]
+  private val systemSettingMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val accountSettingMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val dashboardTabs = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val issueSidebars = new ConcurrentLinkedQueue[(Issue, RepositoryInfo, Context) => Option[Html]]
+  private val assetsMappings = new ConcurrentLinkedQueue[(String, String, ClassLoader)]
+  private val textDecorators = new ConcurrentLinkedQueue[TextDecorator]
 
-  def getPlugins(): List[PluginInfo] = plugins.toList
+  private val suggestionProviders = new ConcurrentLinkedQueue[SuggestionProvider]
+  suggestionProviders.add(new UserNameSuggestionProvider())
+
+  def addPlugin(pluginInfo: PluginInfo): Unit = plugins.add(pluginInfo)
+
+  def getPlugins(): List[PluginInfo] = plugins.asScala.toList
 
   def addImage(id: String, bytes: Array[Byte]): Unit = {
-    val encoded = StringUtils.newStringUtf8(Base64.encodeBase64(bytes, false))
+    val encoded = Base64.getEncoder.encodeToString(bytes)
-    images += ((id, encoded))
+    images.put(id, encoded)
   }
 
   @deprecated("Use addImage(id: String, bytes: Array[Byte]) instead", "3.4.0")
@@ -67,28 +80,28 @@ class PluginRegistry {
     addImage(id, bytes)
   }
 
-  def getImage(id: String): String = images(id)
+  def getImage(id: String): String = images.get(id)
 
-  def addController(path: String, controller: ControllerBase): Unit = controllers += ((controller, path))
+  def addController(path: String, controller: ControllerBase): Unit = controllers.add((controller, path))
 
   @deprecated("Use addController(path: String, controller: ControllerBase) instead", "3.4.0")
   def addController(controller: ControllerBase, path: String): Unit = addController(path, controller)
 
-  def getControllers(): Seq[(ControllerBase, String)] = controllers.toSeq
+  def getControllers(): Seq[(ControllerBase, String)] = controllers.asScala.toSeq
 
-  def addJavaScript(path: String, script: String): Unit = javaScripts += ((path, script))
+  def addJavaScript(path: String, script: String): Unit = javaScripts.add((path, script)) //javaScripts += ((path, script))
 
-  def getJavaScript(currentPath: String): List[String] = javaScripts.filter(x => currentPath.matches(x._1)).toList.map(_._2)
+  def getJavaScript(currentPath: String): List[String] = javaScripts.asScala.filter(x => currentPath.matches(x._1)).toList.map(_._2)
 
-  def addRenderer(extension: String, renderer: Renderer): Unit = renderers += ((extension, renderer))
+  def addRenderer(extension: String, renderer: Renderer): Unit = renderers.put(extension, renderer)
 
-  def getRenderer(extension: String): Renderer = renderers.get(extension).getOrElse(DefaultRenderer)
+  def getRenderer(extension: String): Renderer = renderers.asScala.getOrElse(extension, DefaultRenderer)
 
-  def renderableExtensions: Seq[String] = renderers.keys.toSeq
+  def renderableExtensions: Seq[String] = renderers.keys.asScala.toSeq
 
-  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = repositoryRoutings += routing
+  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = repositoryRoutings.add(routing)
 
-  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = repositoryRoutings.toSeq
+  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = repositoryRoutings.asScala.toSeq
 
   def getRepositoryRouting(repositoryPath: String): Option[GitRepositoryRouting] = {
     PluginRegistry().getRepositoryRoutings().find {
@@ -98,49 +111,73 @@ class PluginRegistry {
     }
   }
 
-  def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks += commitHook
+  def addAccountHook(accountHook: AccountHook): Unit = accountHooks.add(accountHook)
 
-  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq
+  def getAccountHooks: Seq[AccountHook] = accountHooks.asScala.toSeq
 
-  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus += globalMenu
+  def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks.add(commitHook)
 
-  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq
+  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.asScala.toSeq
 
-  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus += repositoryMenu
+  def addRepositoryHook(repositoryHook: RepositoryHook): Unit = repositoryHooks.add(repositoryHook)
 
-  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.toSeq
+  def getRepositoryHooks: Seq[RepositoryHook] = repositoryHooks.asScala.toSeq
 
-  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs += repositorySettingTab
+  def addIssueHook(issueHook: IssueHook): Unit = issueHooks.add(issueHook)
 
-  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.toSeq
+  def getIssueHooks: Seq[IssueHook] = issueHooks.asScala.toSeq
 
-  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = profileTabs += profileTab
+  def addPullRequestHook(pullRequestHook: PullRequestHook): Unit = pullRequestHooks.add(pullRequestHook)
 
-  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.toSeq
+  def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.asScala.toSeq
 
-  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus += systemSettingMenu
+  def addRepositoryHeader(repositoryHeader: (RepositoryInfo, Context) => Option[Html]): Unit = repositoryHeaders.add(repositoryHeader)
 
-  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.toSeq
+  def getRepositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = repositoryHeaders.asScala.toSeq
 
-  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus += accountSettingMenu
+  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus.add(globalMenu)
 
-  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.toSeq
+  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.asScala.toSeq
 
-  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = dashboardTabs += dashboardTab
+  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus.add(repositoryMenu)
 
-  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.toSeq
+  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.asScala.toSeq
 
-  def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings += assetsMapping
+  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs.add(repositorySettingTab)
 
-  def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.toSeq
+  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.asScala.toSeq
 
-  def addTextDecorator(textDecorator: TextDecorator): Unit = textDecorators += textDecorator
+  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = profileTabs.add(profileTab)
 
-  def getTextDecorators: Seq[TextDecorator] = textDecorators.toSeq
+  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.asScala.toSeq
 
-  def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders += suggestionProvider
+  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus.add(systemSettingMenu)
 
-  def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.toSeq
+  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.asScala.toSeq
+
+  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus.add(accountSettingMenu)
+
+  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.asScala.toSeq
+
+  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = dashboardTabs.add(dashboardTab)
+
+  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.asScala.toSeq
+
+  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars.add(issueSidebar)
+
+  def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.asScala.toSeq
+
+  def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings.add(assetsMapping)
+
+  def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.asScala.toSeq
+
+  def addTextDecorator(textDecorator: TextDecorator): Unit = textDecorators.add(textDecorator)
+
+  def getTextDecorators: Seq[TextDecorator] = textDecorators.asScala.toSeq
+
+  def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders.add(suggestionProvider)
+
+  def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.asScala.toSeq
 }
 
 /**
@@ -150,36 +187,105 @@ object PluginRegistry {
 
   private val logger = LoggerFactory.getLogger(classOf[PluginRegistry])
 
-  private val instance = new PluginRegistry()
+  private var instance = new PluginRegistry()
+
+  private var watcher: PluginWatchThread = null
+  private var extraWatcher: PluginWatchThread = null
+  private val initializing = new AtomicBoolean(false)
 
   /**
    * Returns the PluginRegistry singleton instance.
    */
   def apply(): PluginRegistry = instance
 
+  /**
+   * Reload all plugins.
+   */
+  def reload(context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
+    shutdown(context, settings)
+    instance = new PluginRegistry()
+    initialize(context, settings, conn)
+  }
+
+  /**
+   * Uninstall a specified plugin.
+   */
+  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)
+      }
+  }
+
+  /**
+   * Install a plugin from a specified jar file.
+   */
+  def install(file: File, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
+    shutdown(context, settings)
+    FileUtils.copyFile(file, new File(PluginHome, file.getName))
+    instance = new PluginRegistry()
+    initialize(context, settings, conn)
+  }
+
+  private def listPluginJars(dir: File): Seq[File] = {
+    dir.listFiles(new FilenameFilter {
+      override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
+    }).toSeq.sortBy(_.getName).reverse
+  }
+
+  lazy val extraPluginDir: Option[String] = Option(System.getProperty("gitbucket.pluginDir"))
+
   /**
    * Initializes all installed plugins.
    */
-  def initialize(context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = {
+  def initialize(context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
     val pluginDir = new File(PluginHome)
     val manager = new JDBCVersionManager(conn)
 
-    if(pluginDir.exists && pluginDir.isDirectory){
+    // Clean installed directory
-      pluginDir.listFiles(new FilenameFilter {
+    val installedDir = new File(PluginHome, ".installed")
-        override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
+    if(installedDir.exists){
-      }).foreach { pluginJar =>
+      FileUtils.deleteDirectory(installedDir)
-        val classLoader = new URLClassLoader(Array(pluginJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
+    }
-        try {
+    installedDir.mkdir()
-          val plugin = classLoader.loadClass("Plugin").newInstance().asInstanceOf[Plugin]
 
+    val pluginJars = listPluginJars(pluginDir)
+    val extraJars = extraPluginDir.map { extraDir => listPluginJars(new File(extraDir)) }.getOrElse(Nil)
+
+    (extraJars ++ pluginJars).foreach { pluginJar =>
+      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)
+      try {
+        val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin]
+        val pluginId = plugin.pluginId
+
+        // Check duplication
+        instance.getPlugins().find(_.pluginId == pluginId) match {
+          case Some(x) => {
+            logger.warn(s"Plugin ${pluginId} is duplicated. ${x.pluginJar.getName} is available.")
+          }
+          case None => {
             // Migration
             val solidbase = new Solidbase()
             solidbase.migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
 
-          // Check version
+            // Check database version
             val databaseVersion = manager.getCurrentVersion(plugin.pluginId)
             val pluginVersion = plugin.versions.last.getVersion
-          if(databaseVersion != pluginVersion){
+            if (databaseVersion != pluginVersion) {
               throw new IllegalStateException(s"Plugin version is ${pluginVersion}, but database version is ${databaseVersion}")
             }
 
@@ -190,39 +296,124 @@ object PluginRegistry {
               pluginName    = plugin.pluginName,
               pluginVersion = plugin.versions.last.getVersion,
               description   = plugin.description,
-            pluginClass   = plugin
+              pluginClass   = plugin,
+              pluginJar     = pluginJar,
+              classLoader   = classLoader
             ))
-
+          }
+        }
       } catch {
-          case e: Throwable => {
+        case e: Throwable => logger.error(s"Error during plugin initialization: ${pluginJar.getName}", e)
-            logger.error(s"Error during plugin initialization: ${pluginJar.getAbsolutePath}", e)
       }
     }
+
+    if(watcher == null){
+      watcher = new PluginWatchThread(context, PluginHome)
+      watcher.start()
+    }
+
+    extraPluginDir.foreach { extraDir =>
+      if(extraWatcher == null){
+        extraWatcher = new PluginWatchThread(context, extraDir)
+        extraWatcher.start()
       }
     }
   }
 
-  def shutdown(context: ServletContext, settings: SystemSettings): Unit = {
+  def shutdown(context: ServletContext, settings: SystemSettings): Unit = synchronized {
-    instance.getPlugins().foreach { pluginInfo =>
+    instance.getPlugins().foreach { plugin =>
       try {
-        pluginInfo.pluginClass.shutdown(instance, context, settings)
+        plugin.pluginClass.shutdown(instance, context, settings)
+        if(watcher != null){
+          watcher.interrupt()
+          watcher = null
+        }
+        if(extraWatcher != null){
+          extraWatcher.interrupt()
+          extraWatcher = null
+        }
       } catch {
         case e: Exception => {
-          logger.error(s"Error during plugin shutdown", e)
+          logger.error(s"Error during plugin shutdown: ${plugin.pluginJar.getName}", e)
+        }
+      } finally {
+        plugin.classLoader.close()
       }
     }
   }
-  }
-
 
 }
 
-case class Link(id: String, label: String, path: String, icon: Option[String] = None)
+case class Link(
+  id: String,
+  label: String,
+  path: String,
+  icon: Option[String] = None
+)
+
+class PluginInfoBase(
+  val pluginId: String,
+  val pluginName: String,
+  val pluginVersion: String,
+  val description: String
+)
 
 case class PluginInfo(
-  pluginId: String,
+  override val pluginId: String,
-  pluginName: String,
+  override val pluginName: String,
-  pluginVersion: String,
+  override val pluginVersion: String,
-  description: String,
+  override val description: String,
-  pluginClass: Plugin
+  pluginClass: Plugin,
-)
+  pluginJar: File,
+  classLoader: URLClassLoader
+) extends PluginInfoBase(pluginId, pluginName, pluginVersion, description)
+
+class PluginWatchThread(context: ServletContext, dir: String) extends Thread with SystemSettingsService {
+  import gitbucket.core.model.Profile.profile.blockingApi._
+  import scala.collection.JavaConverters._
+
+  private val logger = LoggerFactory.getLogger(classOf[PluginWatchThread])
+
+  override def run(): Unit = {
+    val path = Paths.get(dir)
+    if(!Files.exists(path)){
+      Files.createDirectories(path)
+    }
+    val fs = path.getFileSystem
+    val watcher = fs.newWatchService
+
+    val watchKey = path.register(watcher,
+      StandardWatchEventKinds.ENTRY_CREATE,
+      StandardWatchEventKinds.ENTRY_MODIFY,
+      StandardWatchEventKinds.ENTRY_DELETE,
+      StandardWatchEventKinds.OVERFLOW)
+
+    logger.info("Start PluginWatchThread: " + path)
+
+    try {
+      while (watchKey.isValid()) {
+        val detectedWatchKey = watcher.take()
+        val events = detectedWatchKey.pollEvents.asScala.filter { e =>
+          e.context.toString != ".installed" && !e.context.toString.endsWith(".bak")
+        }
+        if(events.nonEmpty){
+          events.foreach { event =>
+            logger.info(event.kind + ": " + event.context)
+          }
+
+          gitbucket.core.servlet.Database() withTransaction { session =>
+            logger.info("Reloading plugins...")
+            PluginRegistry.reload(context, loadSystemSettings(), session.conn)
+            logger.info("Reloading finished.")
+          }
+        }
+        detectedWatchKey.reset()
+      }
+    } catch {
+      case _: InterruptedException => watchKey.cancel()
+    }
+
+    logger.info("Shutdown PluginWatchThread")
+  }
+
+}

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

@@ -0,0 +1,41 @@
+package gitbucket.core.plugin
+
+import org.json4s._
+import gitbucket.core.util.Directory._
+import org.apache.commons.io.FileUtils
+
+object PluginRepository {
+  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(): Seq[PluginMetadata] = {
+    if(LocalRepositoryIndexFile.exists){
+      parsePluginJson(FileUtils.readFileToString(LocalRepositoryIndexFile, "UTF-8"))
+    } else Nil
+  }
+
+}
+
+// Mapped from plugins.json
+case class PluginMetadata(
+  id: String,
+  name: String,
+  description: String,
+  versions: Seq[VersionDef],
+  default: Boolean = false
+){
+  lazy val latestVersion: VersionDef = versions.last
+}
+
+case class VersionDef(
+  version: String,
+  file: String,
+  range: String
+)
+

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

@@ -2,7 +2,7 @@ package gitbucket.core.plugin
 
 import gitbucket.core.model.Profile._
 import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}
-import profile.simple._
+import profile.api._
 
 trait ReceiveHook {
 

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

@@ -0,0 +1,14 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.model.Profile._
+import profile.api._
+
+trait RepositoryHook {
+
+  def created(owner: String, repository: String)(implicit session: Session): Unit = ()
+  def deleted(owner: String, repository: String)(implicit session: Session): Unit = ()
+  def renamed(owner: String, repository: String, newRepository: String)(implicit session: Session): Unit = ()
+  def transferred(owner: String, newOwner: String, repository: String)(implicit session: Session): Unit = ()
+  def forked(owner: String, newOwner: String, repository: String)(implicit session: Session): Unit = ()
+
+}

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

@@ -1,6 +1,6 @@
 package gitbucket.core.plugin
 
-import scala.slick.jdbc.JdbcBackend.Session
+import slick.jdbc.JdbcBackend.Session
 
 /**
  * Provides Slick Session to Plug-ins.

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

@@ -1,8 +1,7 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.Profile._
-import profile.simple._
+import gitbucket.core.model.Profile.profile.blockingApi._
-
 import gitbucket.core.model.{Account, AccessToken}
 import gitbucket.core.util.StringUtil
 
@@ -20,28 +19,30 @@ trait AccessTokenService {
   def tokenToHash(token: String): String = StringUtil.sha1(token)
 
   /**
-   * @retuen (TokenId, Token)
+   * @return (TokenId, Token)
    */
   def generateAccessToken(userName: String, note: String)(implicit s: Session): (Int, String) = {
     var token: String = null
     var hash: String = null
-    do{
+
+    do {
       token = makeAccessTokenString
       hash  = tokenToHash(token)
-    }while(AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
+    } while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
+
     val newToken = AccessToken(
         userName = userName,
         note = note,
         tokenHash = hash)
-    val tokenId = (AccessTokens returning AccessTokens.map(_.accessTokenId)) += newToken
+    val tokenId = (AccessTokens returning AccessTokens.map(_.accessTokenId)) insert newToken
     (tokenId, token)
   }
 
   def getAccountByAccessToken(token: String)(implicit s: Session): Option[Account] =
     Accounts
-      .innerJoin(AccessTokens)
+      .join(AccessTokens)
-      .filter{ case (ac, t) => (ac.userName === t.userName) && (t.tokenHash === tokenToHash(token).bind) && (ac.removed === false.bind) }
+      .filter { case (ac, t) => (ac.userName === t.userName) && (t.tokenHash === tokenToHash(token).bind) && (ac.removed === false.bind) }
-      .map{ case (ac, t) => ac }
+      .map    { case (ac, t) => ac }
       .firstOption
 
   def getAccessTokens(userName: String)(implicit s: Session): List[AccessToken] =

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

@@ -1,26 +1,32 @@
 package gitbucket.core.service
 
+import org.slf4j.LoggerFactory
 import gitbucket.core.model.{GroupMember, Account}
 import gitbucket.core.model.Profile._
-import gitbucket.core.util.{StringUtil, LDAPUtil}
+import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.service.SystemSettingsService.SystemSettings
-import profile.simple._
-import StringUtil._
-import org.slf4j.LoggerFactory
-// TODO Why is direct import required?
 import gitbucket.core.model.Profile.dateColumnType
+import gitbucket.core.util.{StringUtil, LDAPUtil}
+import StringUtil._
+import gitbucket.core.service.SystemSettingsService.SystemSettings
 
 trait AccountService {
 
   private val logger = LoggerFactory.getLogger(classOf[AccountService])
 
-  def authenticate(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] =
+  def authenticate(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] = {
-    if(settings.ldapAuthentication){
+    val account = if (settings.ldapAuthentication) {
       ldapAuthentication(settings, userName, password)
     } else {
       defaultAuthentication(userName, password)
     }
 
+    if(account.isEmpty){
+      logger.info(s"Failed to authenticate: $userName")
+    }
+
+    account
+  }
+
   /**
    * Authenticate by internal database.
    */
@@ -61,14 +67,14 @@ trait AccountService {
               defaultAuthentication(userName, password)
             }
             case None => {
-              createAccount(ldapUserInfo.userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
+              createAccount(ldapUserInfo.userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None, None)
               getAccountByUserName(ldapUserInfo.userName)
             }
           }
         }
       }
       case Left(errorMessage) => {
-        logger.info(s"LDAP Authentication Failed: ${errorMessage}")
+        logger.info(s"LDAP error: ${errorMessage}")
         defaultAuthentication(userName, password)
       }
     }
@@ -103,7 +109,7 @@ trait AccountService {
     } else false
   }
 
-  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String])
+  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, description: Option[String], url: Option[String])
                    (implicit s: Session): Unit =
     Accounts insert Account(
       userName       = userName,
@@ -117,12 +123,13 @@ trait AccountService {
       lastLoginDate  = None,
       image          = None,
       isGroupAccount = false,
-      isRemoved      = false)
+      isRemoved      = false,
+      description    = description)
 
   def updateAccount(account: Account)(implicit s: Session): Unit =
     Accounts
       .filter { a =>  a.userName === account.userName.bind }
-      .map    { a => (a.password, a.fullName, a.mailAddress, a.isAdmin, a.url.?, a.registeredDate, a.updatedDate, a.lastLoginDate.?, a.removed) }
+      .map    { a => (a.password, a.fullName, a.mailAddress, a.isAdmin, a.url.?, a.registeredDate, a.updatedDate, a.lastLoginDate.?, a.removed, a.description.?) }
       .update (
         account.password,
         account.fullName,
@@ -132,7 +139,8 @@ trait AccountService {
         account.registeredDate,
         currentDate,
         account.lastLoginDate,
-        account.isRemoved)
+        account.isRemoved,
+        account.description)
 
   def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit =
     Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image)
@@ -140,7 +148,7 @@ trait AccountService {
   def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
     Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)
 
-  def createGroup(groupName: String, url: Option[String])(implicit s: Session): Unit =
+  def createGroup(groupName: String, description: Option[String], url: Option[String])(implicit s: Session): Unit =
     Accounts insert Account(
       userName       = groupName,
       password       = "",
@@ -153,10 +161,13 @@ trait AccountService {
       lastLoginDate  = None,
       image          = None,
       isGroupAccount = true,
-      isRemoved      = false)
+      isRemoved      = false,
+      description    = description)
 
-  def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit =
+  def updateGroup(groupName: String, description: Option[String], url: Option[String], removed: Boolean)(implicit s: Session): Unit =
-    Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed)
+    Accounts.filter(_.userName === groupName.bind)
+      .map(t => (t.url.?, t.description.?, t.updatedDate, t.removed))
+      .update(url, description, currentDate, removed)
 
   def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = {
     GroupMembers.filter(_.groupName === groupName.bind).delete

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

@@ -1,9 +1,9 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.Activity
-import gitbucket.core.model.Profile._
 import gitbucket.core.util.JGitUtil
-import profile.simple._
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 
 trait ActivityService {
 
@@ -15,7 +15,7 @@ trait ActivityService {
 
   def getActivitiesByUser(activityUserName: String, isPublic: Boolean)(implicit s: Session): List[Activity] =
     Activities
-      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .join(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) =>
         if(isPublic){
           (t1.activityUserName === activityUserName.bind) && (t2.isPrivate === false.bind)
@@ -30,7 +30,7 @@ trait ActivityService {
 
   def getRecentActivities()(implicit s: Session): List[Activity] =
     Activities
-      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .join(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) =>  t2.isPrivate === false.bind }
       .sortBy { case (t1, t2) => t1.activityId desc }
       .map    { case (t1, t2) => t1 }
@@ -39,7 +39,7 @@ trait ActivityService {
 
   def getRecentActivitiesByOwners(owners : Set[String])(implicit s: Session): List[Activity] =
     Activities
-      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .join(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) => (t2.isPrivate === false.bind) || (t2.userName inSetBind owners) }
       .sortBy { case (t1, t2) => t1.activityId desc }
       .map    { case (t1, t2) => t1 }
@@ -132,7 +132,7 @@ trait ActivityService {
     Activities insert Activity(userName, repositoryName, activityUserName,
       "push",
       s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
-      Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
+      Some(commits.take(5).map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
       currentDate)
 
   def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String,

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

@@ -1,14 +1,9 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.Profile._
-import profile.simple._
+import gitbucket.core.model.Profile.profile.blockingApi._
-
-import gitbucket.core.model.{CommitState, CommitStatus, Account}
-import gitbucket.core.util.Implicits._
-import gitbucket.core.util.StringUtil._
-import gitbucket.core.service.RepositoryService.RepositoryInfo
-import org.joda.time.LocalDateTime
 import gitbucket.core.model.Profile.dateColumnType
+import gitbucket.core.model.{CommitState, CommitStatus, Account}
 
 trait CommitStatusService {
   /** insert or update */
@@ -23,7 +18,7 @@ trait CommitStatusService {
           }.update((state, targetUrl, now, creator.userName, description))
           id
         }
-        case None => (CommitStatuses returning CommitStatuses.map(_.commitStatusId)) += CommitStatus(
+        case None => (CommitStatuses returning CommitStatuses.map(_.commitStatusId)) insert CommitStatus(
             userName       = userName,
             repositoryName = repositoryName,
             commitId       = sha,
@@ -49,7 +44,7 @@ trait CommitStatusService {
     CommitStatuses.filter(t => t.byRepository(userName, repositoryName)).filter(t => t.updatedDate > time.bind).groupBy(_.context).map(_._1).list
 
   def getCommitStatuesWithCreator(userName: String, repositoryName: String, sha: String)(implicit s: Session) :List[(CommitStatus, Account)] =
-    byCommitStatues(userName, repositoryName, sha).innerJoin(Accounts).filter { case (t, a) => t.creator === a.userName }.list
+    byCommitStatues(userName, repositoryName, sha).join(Accounts).filter { case (t, a) => t.creator === a.userName }.list
 
   protected def byCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session) = 
     CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha)).sortBy(_.updatedDate desc)

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

@@ -1,15 +1,9 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.CommitComment
-import gitbucket.core.util.{StringUtil, Implicits}
-
-import scala.slick.jdbc.{StaticQuery => Q}
-import Q.interpolation
 import gitbucket.core.model.Profile._
-import profile.simple._
+import gitbucket.core.model.Profile.profile.blockingApi._
-import Implicits._
+import gitbucket.core.model.Profile.dateColumnType
-import StringUtil._
-
 
 trait CommitsService {
 
@@ -29,7 +23,7 @@ trait CommitsService {
   def createCommitComment(owner: String, repository: String, commitId: String, loginUser: String,
                           content: String, fileName: Option[String], oldLine: Option[Int], newLine: Option[Int],
                           issueId: Option[Int])(implicit s: Session): Int =
-    CommitComments.autoInc insert CommitComment(
+    CommitComments returning CommitComments.map(_.commentId) insert CommitComment(
       userName          = owner,
       repositoryName    = repository,
       commitId          = commitId,
@@ -48,12 +42,12 @@ trait CommitsService {
         (t.commitId, t.oldLine, t.newLine)
       }.update(commitId, oldLine, newLine)
 
-  def updateCommitComment(commentId: Int, content: String)(implicit s: Session) =
+  def updateCommitComment(commentId: Int, content: String)(implicit s: Session) = {
     CommitComments
       .filter (_.byPrimaryKey(commentId))
-      .map { t =>
+      .map { t => (t.content, t.updatedDate) }
-        t.content -> t.updatedDate
+      .update (content, currentDate)
-      }.update (content, currentDate)
+  }
 
   def deleteCommitComment(commentId: Int)(implicit s: Session) =
     CommitComments filter (_.byPrimaryKey(commentId)) delete

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

@@ -0,0 +1,31 @@
+package gitbucket.core.service
+
+import gitbucket.core.model.DeployKey
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
+
+trait DeployKeyService {
+
+  def addDeployKey(userName: String, repositoryName: String, title: String, publicKey: String, allowWrite: Boolean)
+                  (implicit s: Session): Unit =
+    DeployKeys.insert(DeployKey(
+      userName       = userName,
+      repositoryName = repositoryName,
+      title          = title,
+      publicKey      = publicKey,
+      allowWrite     = allowWrite
+    ))
+
+  def getDeployKeys(userName: String, repositoryName: String)(implicit s: Session): List[DeployKey] =
+    DeployKeys
+      .filter(x => (x.userName === userName.bind) && (x.repositoryName === repositoryName.bind))
+      .sortBy(_.deployKeyId).list
+
+  def getAllDeployKeys()(implicit s: Session): List[DeployKey] =
+    DeployKeys.filter(_.publicKey.trim =!= "").list
+
+  def deleteDeployKey(userName: String, repositoryName: String, deployKeyId: Int)(implicit s: Session): Unit =
+    DeployKeys.filter(_.byPrimaryKey(userName, repositoryName, deployKeyId)).delete
+
+
+}

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

@@ -2,11 +2,10 @@ package gitbucket.core.service
 
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Issue
-import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.util.ControlUtil._
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.Notifier
-import profile.simple._
 
 trait HandleCommentService {
   self: RepositoryService with IssuesService with ActivityService
@@ -17,11 +16,11 @@ trait HandleCommentService {
    */
   def handleComment(issue: Issue, content: Option[String], repository: RepositoryService.RepositoryInfo, actionOpt: Option[String])
                    (implicit context: Context, s: Session) = {
-
+    context.loginAccount.flatMap { loginAccount =>
       defining(repository.owner, repository.name){ case (owner, name) =>
-      val userName = context.loginAccount.get.userName
+        val userName = loginAccount.userName
 
-      val (action, recordActivity) = actionOpt
+        val (action, actionActivity) = actionOpt
           .collect {
             case "close" if(!issue.closed) => true  ->
               (Some("close")  -> Some(if(issue.isPullRequest) recordClosePullRequestActivity _ else recordCloseIssueActivity _))
@@ -36,58 +35,60 @@ trait HandleCommentService {
 
         val commentId = (content, action) match {
           case (None, None) => None
-        case (None, Some(action)) => Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
+          case (None, Some(action)) =>
-        case (Some(content), _) => Some(createComment(owner, name, userName, issue.issueId, content, action.map(_+ "_comment").getOrElse("comment")))
+            Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
-      }
+          case (Some(content), _) =>
+            val id = Some(createComment(owner, name, userName, issue.issueId, content, action.map(_+ "_comment").getOrElse("comment")))
 
-      // record comment activity if comment is entered
+            // record comment activity
-      content foreach {
+            if(issue.isPullRequest) recordCommentPullRequestActivity(owner, name, userName, issue.issueId, content)
-        (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
+            else recordCommentIssueActivity(owner, name, userName, issue.issueId, content)
-        (owner, name, userName, issue.issueId, _)
-      }
-      recordActivity foreach ( _ (owner, name, userName, issue.issueId, issue.title) )
 
             // extract references and create refer comment
-      content.map { content =>
+            createReferComment(owner, name, issue, content, loginAccount)
-        createReferComment(owner, name, issue, content, context.loginAccount.get)
+
+            id
         }
 
+        actionActivity.foreach { f => f(owner, name, userName, issue.issueId, issue.title) }
+
         // call web hooks
         action match {
-        case None => commentId.map { commentIdSome => callIssueCommentWebHook(repository, issue, commentIdSome, context.loginAccount.get) }
+          case None => commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount))
-        case Some(act) => {
+          case Some(act) =>
             val webHookAction = act match {
-            case "open"   => "opened"
-            case "reopen" => "reopened"
               case "close"  => "closed"
-            case _ => act
+              case "reopen" => "reopened"
-          }
-          if (issue.isPullRequest) {
-            callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, context.loginAccount.get)
-          } else {
-            callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, context.loginAccount.get)
-          }
             }
+            if(issue.isPullRequest)
+              callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, loginAccount)
+            else
+              callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, loginAccount)
         }
 
-      // notifications
+        // call hooks
-      Notifier() match {
+        content foreach { x =>
-        case f =>
+          if(issue.isPullRequest)
-          content foreach {
+            PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
-            f.toNotify(repository, issue, _){
+          else
-              Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${
+            PluginRegistry().getIssueHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
-                if(issue.isPullRequest) "pull" else "issues"}/${issue.issueId}#comment-${commentId.get}")
-            }
         }
         action foreach {
-            f.toNotify(repository, issue, _){
+          case "close" =>
-              Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/issues/${issue.issueId}")
+            if(issue.isPullRequest)
-            }
+              PluginRegistry().getPullRequestHooks.foreach(_.closed(issue, repository))
-          }
+            else
+              PluginRegistry().getIssueHooks.foreach(_.closed(issue, repository))
+          case "reopen" =>
+            if(issue.isPullRequest)
+              PluginRegistry().getPullRequestHooks.foreach(_.reopened(issue, repository))
+            else
+              PluginRegistry().getIssueHooks.foreach(_.reopened(issue, repository))
         }
 
         commentId.map( issue -> _ )
       }
     }
+  }
 
 }

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

@@ -0,0 +1,73 @@
+package gitbucket.core.service
+
+import gitbucket.core.controller.Context
+import gitbucket.core.model.{Account, Issue}
+import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.util.Implicits._
+
+trait IssueCreationService {
+
+  self: RepositoryService with WebHookIssueCommentService with LabelsService with IssuesService with ActivityService =>
+
+  def createIssue(repository: RepositoryInfo, title:String, body:Option[String],
+                  assignee: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Seq[String],
+                  loginAccount: Account)(implicit context: Context, s: Session) : Issue = {
+
+    val owner = repository.owner
+    val name  = repository.name
+    val userName   = loginAccount.userName
+    val manageable = isIssueManageable(repository)
+
+    // insert issue
+    val issueId = insertIssue(owner, name, userName, title, body,
+      if (manageable) assignee else None,
+      if (manageable) milestoneId else None,
+      if (manageable) priorityId else None)
+    val issue: Issue = getIssue(owner, name, issueId.toString).get
+
+    // insert labels
+    if (manageable) {
+      val labels = getLabels(owner, name)
+      labelNames.map { labelName =>
+        labels.find(_.labelName == labelName).map { label =>
+          registerIssueLabel(owner, name, issueId, label.labelId)
+        }
+      }
+    }
+
+    // record activity
+    recordCreateIssueActivity(owner, name, userName, issueId, title)
+
+    // extract references and create refer comment
+    createReferComment(owner, name, issue, title + " " + body.getOrElse(""), loginAccount)
+
+    // call web hooks
+    callIssuesWebHook("opened", repository, issue, context.baseUrl, loginAccount)
+
+    // call hooks
+    PluginRegistry().getIssueHooks.foreach(_.created(issue, repository))
+
+    issue
+  }
+
+  /**
+   * Tests whether an logged-in user can manage issues.
+   */
+  protected def isIssueManageable(repository: RepositoryInfo)(implicit context: Context, s: Session): Boolean = {
+    hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+  }
+
+  /**
+   * Tests whether an logged-in user can post issues.
+   */
+  protected def isIssueEditable(repository: RepositoryInfo)(implicit context: Context, s: Session): Boolean = {
+    repository.repository.options.issuesOption match {
+      case "ALL"     => !repository.repository.isPrivate && context.loginAccount.isDefined
+      case "PUBLIC"  => hasGuestRole(repository.owner, repository.name, context.loginAccount)
+      case "PRIVATE" => hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+      case "DISABLE" => false
+    }
+  }
+}

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

@@ -1,18 +1,14 @@
 package gitbucket.core.service
 
-import gitbucket.core.model.Profile._
 import gitbucket.core.util.JGitUtil.CommitInfo
-import gitbucket.core.util.StringUtil
-import profile.simple._
-
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.model._
+import gitbucket.core.util.SyntaxSugars._
-
+import gitbucket.core.model.{Issue, PullRequest, IssueComment, IssueLabel, Label, Account, Repository, CommitState, Role}
-import scala.slick.jdbc.{StaticQuery => Q}
+import gitbucket.core.model.Profile._
-import Q.interpolation
+import gitbucket.core.model.Profile.profile._
-
+import gitbucket.core.model.Profile.profile.blockingApi._
-
+import gitbucket.core.model.Profile.dateColumnType
 
 trait IssuesService {
   self: AccountService with RepositoryService =>
@@ -24,39 +20,46 @@ trait IssuesService {
     else None
 
   def getComments(owner: String, repository: String, issueId: Int)(implicit s: Session) =
-    IssueComments filter (_.byIssue(owner, repository, issueId)) list
+    IssueComments filter (_.byIssue(owner, repository, issueId)) sortBy(_.commentId asc) list
 
   /** @return IssueComment and commentedUser and Issue */
   def getCommentsForApi(owner: String, repository: String, issueId: Int)(implicit s: Session): List[(IssueComment, Account, Issue)] =
     IssueComments.filter(_.byIssue(owner, repository, issueId))
     .filter(_.action inSetBind Set("comment" , "close_comment", "reopen_comment"))
-    .innerJoin(Accounts).on( (t1, t2) => t1.commentedUserName === t2.userName )
+    .join(Accounts).on { case  t1 ~ t2 => t1.commentedUserName === t2.userName }
-    .innerJoin(Issues).on{ case ((t1, t2), t3) => t3.byIssue(t1.userName, t1.repositoryName, t1.issueId) }
+    .join(Issues).on { case t1 ~ t2 ~ t3 => t3.byIssue(t1.userName, t1.repositoryName, t1.issueId) }
-    .map{ case ((t1, t2), t3) => (t1, t2, t3) }
+    .map { case t1 ~ t2 ~ t3 => (t1, t2, t3) }
     .list
 
   def getMergedComment(owner: String, repository: String, issueId: Int)(implicit s: Session): Option[(IssueComment, Account)] = {
-    getCommentsForApi(owner, repository, issueId).collectFirst { case (comment, account, _) if comment.action == "merged" => (comment, account) }
+    IssueComments.filter(_.byIssue(owner, repository, issueId))
+      .filter(_.action === "merge".bind)
+      .join(Accounts).on { case  t1 ~ t2 => t1.commentedUserName === t2.userName }
+      .map { case t1 ~ t2 => (t1, t2)}
+      .firstOption
   }
 
-  def getComment(owner: String, repository: String, commentId: String)(implicit s: Session) =
+  def getComment(owner: String, repository: String, commentId: String)(implicit s: Session): Option[IssueComment] = {
     if (commentId forall (_.isDigit))
       IssueComments filter { t =>
         t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
       } firstOption
     else None
+  }
 
-  def getIssueLabels(owner: String, repository: String, issueId: Int)(implicit s: Session) =
+  def getIssueLabels(owner: String, repository: String, issueId: Int)(implicit s: Session): List[Label] = {
     IssueLabels
-      .innerJoin(Labels).on { (t1, t2) =>
+      .join(Labels).on { case t1 ~ t2 =>
         t1.byLabel(t2.userName, t2.repositoryName, t2.labelId)
       }
-      .filter ( _._1.byIssue(owner, repository, issueId) )
+      .filter { case t1 ~ t2 => t1.byIssue(owner, repository, issueId) }
-      .map    ( _._2 )
+      .map { case t1 ~ t2 => t2 }
       .list
+  }
 
-  def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+  def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session): Option[IssueLabel] = {
     IssueLabels filter (_.byPrimaryKey(owner, repository, issueId, labelId)) firstOption
+  }
 
   /**
    * Returns the count of the search result against  issues.
@@ -66,9 +69,9 @@ trait IssuesService {
    * @param repos Tuple of the repository owner and the repository name
    * @return the count of the search result
    */
-  def countIssue(condition: IssueSearchCondition, onlyPullRequest: Boolean,
+  def countIssue(condition: IssueSearchCondition, onlyPullRequest: Boolean, repos: (String, String)*)(implicit s: Session): Int = {
-                 repos: (String, String)*)(implicit s: Session): Int =
     Query(searchIssueQuery(repos, condition, onlyPullRequest).length).first
+  }
 
   /**
    * Returns the Map which contains issue count for each labels.
@@ -82,75 +85,67 @@ trait IssuesService {
                               filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = {
 
     searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false)
-      .innerJoin(IssueLabels).on { (t1, t2) =>
+      .join(IssueLabels).on { case t1 ~ t2 =>
         t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
       }
-      .innerJoin(Labels).on { case ((t1, t2), t3) =>
+      .join(Labels).on { case t1 ~ t2 ~ t3 =>
         t2.byLabel(t3.userName, t3.repositoryName, t3.labelId)
       }
-      .groupBy { case ((t1, t2), t3) =>
+      .groupBy { case t1 ~ t2 ~ t3 =>
         t3.labelName
       }
-      .map { case (labelName, t) =>
+      .map { case labelName ~ t =>
         labelName -> t.length
       }
-      .toMap
+      .list.toMap
   }
 
-  def getCommitStatues(issueList:Seq[(String, String, Int)])(implicit s: Session) :Map[(String, String, Int), CommitStatusInfo] ={
+  /**
-    if(issueList.isEmpty){
+    * Returns the Map which contains issue count for each priority.
-      Map.empty
+    *
+    * @param owner the repository owner
+    * @param repository the repository name
+    * @param condition the search condition
+    * @return the Map which contains issue count for each priority (key is priority name, value is issue count)
+    */
+  def countIssueGroupByPriorities(owner: String, repository: String, condition: IssueSearchCondition,
+                              filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = {
+
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false)
+      .join(Priorities).on { case t1 ~ t2 =>
+        t1.byPriority(t2.userName, t2.repositoryName, t2.priorityId)
+      }
+      .groupBy { case t1 ~ t2 =>
+        t2.priorityName
+      }
+      .map { case priorityName ~ t =>
+        priorityName -> t.length
+      }
+      .list.toMap
+  }
+
+  def getCommitStatues(userName: String, repositoryName: String, issueId: Int)(implicit s: Session): Option[CommitStatusInfo] = {
+    val status = PullRequests
+      .filter { pr =>
+        pr.userName === userName.bind && pr.repositoryName === repositoryName.bind && pr.issueId === issueId.bind
+      }
+      .join(CommitStatuses).on { case pr ~ cs =>
+         pr.userName === cs.userName && pr.repositoryName === cs.repositoryName && pr.commitIdTo === cs.commitId
+      }
+      .list
+
+    if(status.nonEmpty){
+      val (_, cs) = status.head
+      Some(CommitStatusInfo(
+        count        = status.length,
+        successCount = status.count(_._2.state == CommitState.SUCCESS),
+        context      = (if(status.length == 1) Some(cs.context) else None),
+        state        = (if(status.length == 1) Some(cs.state)   else None),
+        targetUrl    = (if(status.length == 1) cs.targetUrl     else None),
+        description  = (if(status.length == 1) cs.description   else None)
+      ))
     } else {
-      import scala.slick.jdbc._
+      None
-      val issueIdQuery = issueList.map(i => "(PR.USER_NAME=? AND PR.REPOSITORY_NAME=? AND PR.ISSUE_ID=?)").mkString(" OR ")
-      implicit val qset = SetParameter[Seq[(String, String, Int)]] {
-        case (seq, pp) =>
-          for (a <- seq) {
-            pp.setString(a._1)
-            pp.setString(a._2)
-            pp.setInt(a._3)
-          }
-      }
-      import gitbucket.core.model.Profile.commitStateColumnType
-      val query = Q.query[Seq[(String, String, Int)], (String, String, Int, Int, Int, Option[String], Option[CommitState], Option[String], Option[String])](s"""
-        SELECT
-          SUMM.USER_NAME,
-          SUMM.REPOSITORY_NAME,
-          SUMM.ISSUE_ID,
-          CS_ALL,
-          CS_SUCCESS,
-          CSD.CONTEXT,
-          CSD.STATE,
-          CSD.TARGET_URL,
-          CSD.DESCRIPTION
-        FROM (
-          SELECT
-            PR.USER_NAME,
-            PR.REPOSITORY_NAME,
-            PR.ISSUE_ID,
-            COUNT(CS.STATE) AS CS_ALL,
-            CSS.CS_SUCCESS  AS CS_SUCCESS,
-            PR.COMMIT_ID_TO AS COMMIT_ID
-          FROM PULL_REQUEST PR
-          JOIN COMMIT_STATUS CS
-            ON PR.USER_NAME = CS.USER_NAME AND PR.REPOSITORY_NAME = CS.REPOSITORY_NAME AND PR.COMMIT_ID_TO = CS.COMMIT_ID
-          JOIN (
-            SELECT
-              COUNT(*) AS CS_SUCCESS,
-              USER_NAME,
-              REPOSITORY_NAME,
-              COMMIT_ID
-            FROM COMMIT_STATUS WHERE STATE = 'success' GROUP BY USER_NAME, REPOSITORY_NAME, COMMIT_ID
-          ) CSS ON PR.USER_NAME = CSS.USER_NAME AND PR.REPOSITORY_NAME = CSS.REPOSITORY_NAME AND PR.COMMIT_ID_TO = CSS.COMMIT_ID
-          WHERE $issueIdQuery
-          GROUP BY PR.USER_NAME, PR.REPOSITORY_NAME, PR.ISSUE_ID, CSS.CS_SUCCESS
-        ) as SUMM
-        LEFT OUTER JOIN COMMIT_STATUS CSD
-          ON SUMM.CS_ALL = 1 AND SUMM.COMMIT_ID = CSD.COMMIT_ID""");
-      query(issueList).list.map {
-        case(userName, repositoryName, issueId, count, successCount, context, state, targetUrl, description) =>
-          (userName, repositoryName, issueId) -> CommitStatusInfo(count, successCount, context, state, targetUrl, description)
-        }.toMap
     }
   }
 
@@ -168,28 +163,41 @@ trait IssuesService {
                  (implicit s: Session): List[IssueInfo] = {
     // get issues and comment count and labels
     val result = searchIssueQueryBase(condition, pullRequest, offset, limit, repos)
-      .leftJoin (IssueLabels) .on { case (((t1, t2), i), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+        .joinLeft (IssueLabels) .on { case t1 ~ t2 ~ i ~ t3                => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
-      .leftJoin (Labels)      .on { case ((((t1, t2), i), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
+        .joinLeft (Labels)      .on { case t1 ~ t2 ~ i ~ t3 ~ t4           => t3.map(_.byLabel(t4.userName, t4.repositoryName, t4.labelId)) }
-      .leftJoin (Milestones)  .on { case (((((t1, t2), i), t3), t4), t5) => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
+        .joinLeft (Milestones)  .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5      => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
-      .sortBy { case (((((t1, t2), i), t3), t4), t5) => i asc }
+        .joinLeft (Priorities)  .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t1.byPriority(t6.userName, t6.repositoryName, t6.priorityId) }
-      .map { case (((((t1, t2), i), t3), t4), t5) => (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?, t5.title.?) }
+        .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
+        .map { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 =>
+          (t1, t2.commentCount, t4.map(_.labelId), t4.map(_.labelName), t4.map(_.color), t5.map(_.title), t6.map(_.priorityName))
+        }
         .list
         .splitWith { (c1, c2) => c1._1.userName == c2._1.userName && c1._1.repositoryName == c2._1.repositoryName && c1._1.issueId == c2._1.issueId }
 
-    val status = getCommitStatues(result.map(_.head._1).map(is => (is.userName, is.repositoryName, is.issueId)))
-
     result.map { issues => issues.head match {
-      case (issue, commentCount, _, _, _, milestone) =>
+      case (issue, commentCount, _, _, _, milestone, priority) =>
         IssueInfo(issue,
-          issues.flatMap { t => t._3.map (
+         issues.flatMap { t => t._3.map (Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get))} toList,
-            Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
-          )} toList,
          milestone,
+         priority,
          commentCount,
-          status.get(issue.userName, issue.repositoryName, issue.issueId))
+         getCommitStatues(issue.userName, issue.repositoryName, issue.issueId))
     }} toList
   }
 
+  /** for api
+   * @return (issue, issueUser, commentCount)
+   */
+  def searchIssueByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*)
+                            (implicit s: Session): List[(Issue, Account)] = {
+    // get issues and comment count and labels
+    searchIssueQueryBase(condition, false, offset, limit, repos)
+      .join(Accounts).on { case t1 ~ t2 ~ i ~ t3 => t3.userName === t1.openedUserName }
+      .sortBy { case t1 ~ t2 ~ i ~ t3 => i asc }
+      .map    { case t1 ~ t2 ~ i ~ t3 => (t1, t3) }
+      .list
+  }
+
   /** for api
    * @return (issue, issueUser, commentCount, pullRequest, headRepo, headOwner)
    */
@@ -197,29 +205,37 @@ trait IssuesService {
                             (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = {
     // get issues and comment count and labels
     searchIssueQueryBase(condition, true, offset, limit, repos)
-      .innerJoin(PullRequests).on { case (((t1, t2), i), t3) => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
+      .join(PullRequests).on { case t1 ~ t2 ~ i ~ t3                => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
-      .innerJoin(Repositories).on { case ((((t1, t2), i), t3), t4) => t4.byRepository(t1.userName, t1.repositoryName) }
+      .join(Repositories).on { case t1 ~ t2 ~ i ~ t3 ~ t4           => t4.byRepository(t1.userName, t1.repositoryName) }
-      .innerJoin(Accounts).on { case (((((t1, t2), i), t3), t4), t5) => t5.userName === t1.openedUserName }
+      .join(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5      => t5.userName === t1.openedUserName }
-      .innerJoin(Accounts).on { case ((((((t1, t2), i), t3), t4), t5), t6) => t6.userName === t4.userName }
+      .join(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t6.userName === t4.userName }
-      .sortBy { case ((((((t1, t2), i), t3), t4), t5), t6) => i asc }
+      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
-      .map { case ((((((t1, t2), i), t3), t4), t5), t6) => (t1, t5, t2.commentCount, t3, t4, t6) }
+      .map    { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => (t1, t5, t2.commentCount, t3, t4, t6) }
       .list
   }
 
   private def searchIssueQueryBase(condition: IssueSearchCondition, pullRequest: Boolean, offset: Int, limit: Int, repos: Seq[(String, String)])
                                   (implicit s: Session) =
     searchIssueQuery(repos, condition, pullRequest)
-      .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
+      .join(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
       .sortBy { case (t1, t2) => t1.issueId desc }
       .sortBy { case (t1, t2) =>
-        (condition.sort match {
+        condition.sort match {
-          case "created"  => t1.registeredDate
+          case "created" => condition.direction match {
-          case "comments" => t2.commentCount
+            case "asc"  => t1.registeredDate asc
-          case "updated"  => t1.updatedDate
+            case "desc" => t1.registeredDate desc
-        }) match {
+          }
-          case sort => condition.direction match {
+          case "comments" => condition.direction match {
-            case "asc"  => sort asc
+            case "asc"  => t2.commentCount asc
-            case "desc" => sort desc
+            case "desc" => t2.commentCount desc
+          }
+          case "updated" => condition.direction match {
+            case "asc"  => t1.updatedDate asc
+            case "desc" => t1.updatedDate desc
+          }
+          case "priority" => condition.direction match {
+            case "asc"  => t2.priority asc
+            case "desc" => t2.priority desc
           }
         }
       }
@@ -233,9 +249,10 @@ trait IssuesService {
     Issues filter { t1 =>
       repos
         .map { case (owner, repository) => t1.byRepository(owner, repository) }
-        .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
+        .foldLeft[Rep[Boolean]](false) ( _ || _ ) &&
       (t1.closed           === (condition.state == "closed").bind) &&
       (t1.milestoneId.?      isEmpty, condition.milestone == Some(None)) &&
+      (t1.priorityId.?       isEmpty, condition.priority == Some(None)) &&
       (t1.assignedUserName.? isEmpty, condition.assigned  == Some(None)) &&
       (t1.openedUserName   === condition.author.get.bind, condition.author.isDefined) &&
       (t1.pullRequest      === pullRequest.bind) &&
@@ -244,6 +261,11 @@ trait IssuesService {
         (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) &&
         (t2.title === condition.milestone.get.get.bind)
       } exists, condition.milestone.flatten.isDefined) &&
+      // Priority filter
+      (Priorities filter { t2 =>
+        (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.priorityId)) &&
+          (t2.priorityName === condition.priority.get.get.bind)
+      } exists, condition.priority.flatten.isDefined) &&
       // Assignee filter
       (t1.assignedUserName === condition.assigned.get.get.bind, condition.assigned.flatten.isDefined) &&
       // Label filter
@@ -269,9 +291,9 @@ trait IssuesService {
         } exists), condition.mentioned.isDefined)
     }
 
-  def createIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
+  def insertIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
-                  assignedUserName: Option[String], milestoneId: Option[Int],
+                  assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int],
-                  isPullRequest: Boolean = false)(implicit s: Session) =
+                  isPullRequest: Boolean = false)(implicit s: Session): Int = {
     // next id number
     sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
       .firstOption.filter { id =>
@@ -281,6 +303,7 @@ trait IssuesService {
         id,
         loginUser,
         milestoneId,
+        priorityId,
         assignedUserName,
         title,
         content,
@@ -291,20 +314,24 @@ trait IssuesService {
 
       // increment issue id
       IssueId
-        .filter (_.byPrimaryKey(owner, repository))
+        .filter(_.byPrimaryKey(owner, repository))
-        .map (_.issueId)
+        .map(_.issueId)
-        .update (id) > 0
+        .update(id) > 0
     } get
+  }
 
-  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session): Int = {
     IssueLabels insert IssueLabel(owner, repository, issueId, labelId)
+  }
 
-  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session): Int = {
     IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
+  }
 
   def createComment(owner: String, repository: String, loginUser: String,
-      issueId: Int, content: String, action: String)(implicit s: Session): Int =
+      issueId: Int, content: String, action: String)(implicit s: Session): Int = {
-    IssueComments.autoInc insert IssueComment(
+    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
+    IssueComments returning IssueComments.map(_.commentId) insert IssueComment(
       userName          = owner,
       repositoryName    = repository,
       issueId           = issueId,
@@ -313,42 +340,40 @@ trait IssuesService {
       content           = content,
       registeredDate    = currentDate,
       updatedDate       = currentDate)
+  }
 
-  def updateIssue(owner: String, repository: String, issueId: Int,
+  def updateIssue(owner: String, repository: String, issueId: Int, title: String, content: Option[String])(implicit s: Session): Int = {
-      title: String, content: Option[String])(implicit s: Session) =
     Issues
       .filter (_.byPrimaryKey(owner, repository, issueId))
-      .map { t =>
+      .map { t => (t.title, t.content.?, t.updatedDate) }
-        (t.title, t.content.?, t.updatedDate)
+      .update(title, content, currentDate)
   }
-      .update (title, content, currentDate)
 
-  def updateAssignedUserName(owner: String, repository: String, issueId: Int,
+  def updateAssignedUserName(owner: String, repository: String, issueId: Int, assignedUserName: Option[String])(implicit s: Session): Int = {
-                             assignedUserName: Option[String])(implicit s: Session) =
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.assignedUserName?, t.updatedDate)).update(assignedUserName, currentDate)
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
-
-  def updateMilestoneId(owner: String, repository: String, issueId: Int,
-                        milestoneId: Option[Int])(implicit s: Session) =
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
-
-  def updateComment(commentId: Int, content: String)(implicit s: Session) =
-    IssueComments
-      .filter (_.byPrimaryKey(commentId))
-      .map { t =>
-        t.content -> t.updatedDate
   }
-      .update (content, currentDate)
 
-  def deleteComment(commentId: Int)(implicit s: Session) =
+  def updateMilestoneId(owner: String, repository: String, issueId: Int, milestoneId: Option[Int])(implicit s: Session): Int = {
-    IssueComments filter (_.byPrimaryKey(commentId)) delete
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.milestoneId?, t.updatedDate)).update(milestoneId, currentDate)
-
+  }
-  def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean)(implicit s: Session) =
+
-    Issues
+  def updatePriorityId(owner: String, repository: String, issueId: Int, priorityId: Option[Int])(implicit s: Session): Int = {
-      .filter (_.byPrimaryKey(owner, repository, issueId))
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.priorityId?, t.updatedDate)).update(priorityId, currentDate)
-      .map { t =>
+  }
-        t.closed -> t.updatedDate
+
+  def updateComment(issueId: Int, commentId: Int, content: String)(implicit s: Session): Int = {
+    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
+    IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
+  }
+
+  def deleteComment(issueId: Int, commentId: Int)(implicit s: Session): Int = {
+    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
+    IssueComments.filter(_.byPrimaryKey(commentId)).delete
+  }
+
+  def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean)(implicit s: Session): Int = {
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.closed, t.updatedDate)).update(closed, currentDate)
   }
-      .update (closed, currentDate)
 
   /**
    * Search issues by keyword.
@@ -358,15 +383,14 @@ 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)(implicit s: Session): List[(Issue, Int, String)] = {
-                           (implicit s: Session): List[(Issue, Int, String)] = {
+    //import slick.driver.JdbcDriver.likeEncode
-    import slick.driver.JdbcDriver.likeEncode
     val keywords = splitWords(query.toLowerCase)
 
     // Search Issue
     val issues = Issues
       .filter(_.byRepository(owner, repository))
-      .innerJoin(IssueOutline).on { case (t1, t2) =>
+      .join(IssueOutline).on { case (t1, t2) =>
         t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
       }
       .filter { case (t1, t2) =>
@@ -382,10 +406,10 @@ trait IssuesService {
     // Search IssueComment
     val comments = IssueComments
       .filter(_.byRepository(owner, repository))
-      .innerJoin(Issues).on { case (t1, t2) =>
+      .join(Issues).on { case (t1, t2) =>
         t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
       }
-      .innerJoin(IssueOutline).on { case ((t1, t2), t3) =>
+      .join(IssueOutline).on { case ((t1, t2), t3) =>
         t2.byIssue(t3.userName, t3.repositoryName, t3.issueId)
       }
       .filter { case ((t1, t2), t3) =>
@@ -407,7 +431,7 @@ trait IssuesService {
     }.toList
   }
 
-  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)(implicit s: Session) = {
+  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)(implicit s: Session): Unit = {
     extractCloseId(message).foreach { issueId =>
       for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
         createComment(owner, repository, userName, issue.issueId, "Close", "close")
@@ -416,8 +440,8 @@ trait IssuesService {
     }
   }
 
-  def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String, loginAccount: Account)(implicit s: Session) = {
+  def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String, loginAccount: Account)(implicit s: Session): Unit = {
-    StringUtil.extractIssueId(message).foreach { issueId =>
+    extractIssueId(message).foreach { issueId =>
       val content = fromIssue.issueId + ":" + fromIssue.title
       if(getIssue(owner, repository, issueId).isDefined){
         // Not add if refer comment already exist.
@@ -428,8 +452,8 @@ trait IssuesService {
     }
   }
 
-  def createIssueComment(owner: String, repository: String, commit: CommitInfo)(implicit s: Session) = {
+  def createIssueComment(owner: String, repository: String, commit: CommitInfo)(implicit s: Session): Unit = {
-    StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
+    extractIssueId(commit.fullMessage).foreach { issueId =>
       if(getIssue(owner, repository, issueId).isDefined){
         getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
           createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
@@ -453,6 +477,7 @@ object IssuesService {
   case class IssueSearchCondition(
       labels: Set[String] = Set.empty,
       milestone: Option[Option[String]] = None,
+      priority: Option[Option[String]] = None,
       author: Option[String] = None,
       assigned: Option[Option[String]] = None,
       mentioned: Option[String] = None,
@@ -478,10 +503,14 @@ object IssuesService {
       ).flatten ++
       labels.map(label => s"label:${label}") ++
       List(
-        milestone.map { _ match {
+        milestone.map {
           case Some(x) => s"milestone:${x}"
           case None    => "no:milestone"
-        }},
+        },
+        priority.map {
+          case Some(x) => s"priority:${x}"
+          case None    => "no:priority"
+        },
         (sort, direction) match {
           case ("created" , "desc") => None
           case ("created" , "asc" ) => Some("sort:created-asc")
@@ -489,6 +518,9 @@ object IssuesService {
           case ("comments", "asc" ) => Some("sort:comments-asc")
           case ("updated" , "desc") => Some("sort:updated-desc")
           case ("updated" , "asc" ) => Some("sort:updated-asc")
+          case ("priority", "desc") => Some("sort:priority-desc")
+          case ("priority", "asc" ) => Some("sort:priority-asc")
+          case x                    => throw new MatchError(x)
         },
         visibility.map(visibility => s"visibility:${visibility}")
       ).flatten ++
@@ -502,6 +534,10 @@ object IssuesService {
           case Some(x) => "milestone=" + urlEncode(x)
           case None    => "milestone=none"
         },
+        priority.map {
+          case Some(x) => "priority=" + urlEncode(x)
+          case None    => "priority=none"
+        },
         author   .map(x => "author="    + urlEncode(x)),
         assigned.map {
           case Some(x) => "assigned="  + urlEncode(x)
@@ -534,6 +570,10 @@ object IssuesService {
           case "none" => None
           case x      => Some(x)
         },
+        param(request, "priority").map {
+          case "none" => None
+          case x      => Some(x)
+        },
         param(request, "author"),
         param(request, "assigned").map {
           case "none" => None
@@ -541,7 +581,7 @@ object IssuesService {
         },
         param(request, "mentioned"),
         param(request, "state",     Seq("open", "closed")).getOrElse("open"),
-        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
+        param(request, "sort",      Seq("created", "comments", "updated", "priority")).getOrElse("created"),
         param(request, "direction", Seq("asc", "desc")).getOrElse("desc"),
         param(request, "visibility"),
         param(request, "groups").map(_.split(",").toSet).getOrElse(Set.empty)
@@ -557,6 +597,6 @@ object IssuesService {
 
   case class CommitStatusInfo(count: Int, successCount: Int, context: Option[String], state: Option[CommitState], targetUrl: Option[String], description: Option[String])
 
-  case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], commentCount: Int, status:Option[CommitStatusInfo])
+  case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], priority: Option[String], commentCount: Int, status:Option[CommitStatusInfo])
 
 }

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

@@ -2,7 +2,7 @@ package gitbucket.core.service
 
 import gitbucket.core.model.Label
 import gitbucket.core.model.Profile._
-import profile.simple._
+import gitbucket.core.model.Profile.profile.blockingApi._
 
 trait LabelsService {
 
@@ -15,13 +15,14 @@ trait LabelsService {
   def getLabel(owner: String, repository: String, labelName: String)(implicit s: Session): Option[Label] =
     Labels.filter(_.byLabel(owner, repository, labelName)).firstOption
 
-  def createLabel(owner: String, repository: String, labelName: String, color: String)(implicit s: Session): Int =
+  def createLabel(owner: String, repository: String, labelName: String, color: String)(implicit s: Session): Int = {
-    Labels returning Labels.map(_.labelId) += Label(
+    Labels returning Labels.map(_.labelId) insert Label(
       userName       = owner,
       repositoryName = repository,
       labelName      = labelName,
       color          = color
     )
+  }
 
   def updateLabel(owner: String, repository: String, labelId: Int, labelName: String, color: String)
                  (implicit s: Session): Unit =

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

@@ -1,10 +1,8 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.Account
-import gitbucket.core.util.LockUtil
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.ControlUtil._
 
 import org.eclipse.jgit.merge.MergeStrategy
 import org.eclipse.jgit.api.Git
@@ -165,7 +163,7 @@ object MergeService{
         case e: NoMergeBaseException => true
       }
       val mergeTipCommit = using(new RevWalk( repository ))(_.parseCommit( mergeTip ))
-      val committer = mergeTipCommit.getCommitterIdent;
+      val committer = mergeTipCommit.getCommitterIdent
       def updateBranch(treeId:ObjectId, message:String, branchName:String){
         // creates merge commit
         val mergeCommitId = createMergeCommit(treeId, committer, message)

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

@@ -2,8 +2,7 @@ package gitbucket.core.service
 
 import gitbucket.core.model.Milestone
 import gitbucket.core.model.Profile._
-import profile.simple._
+import gitbucket.core.model.Profile.profile.blockingApi._
-// TODO Why is direct import required?
 import gitbucket.core.model.Profile.dateColumnType
 
 trait MilestonesService {
@@ -22,7 +21,7 @@ trait MilestonesService {
   def updateMilestone(milestone: Milestone)(implicit s: Session): Unit =
     Milestones
       .filter (t =>  t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId))
-      .map    (t => (t.title, t.description.?, t.dueDate.?, t.closedDate.?))
+      .map    (t => (t.title, t.description, t.dueDate, t.closedDate))
       .update (milestone.title, milestone.description, milestone.dueDate, milestone.closedDate)
 
   def openMilestone(milestone: Milestone)(implicit s: Session): Unit =
@@ -44,6 +43,7 @@ trait MilestonesService {
       .filter  { t => t.byRepository(owner, repository) && (t.milestoneId.? isDefined) }
       .groupBy { t => t.milestoneId -> t.closed }
       .map     { case (t1, t2) => t1._1 -> t1._2 -> t2.length }
+      .list
       .toMap
 
     getMilestones(owner, repository).map { milestone =>

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

@@ -0,0 +1,84 @@
+package gitbucket.core.service
+
+import gitbucket.core.model.Priority
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.util.StringUtil
+
+trait PrioritiesService {
+
+  def getPriorities(owner: String, repository: String)(implicit s: Session): List[Priority] =
+    Priorities.filter(_.byRepository(owner, repository)).sortBy(_.ordering asc).list
+
+  def getPriority(owner: String, repository: String, priorityId: Int)(implicit s: Session): Option[Priority] =
+    Priorities.filter(_.byPrimaryKey(owner, repository, priorityId)).firstOption
+
+  def getPriority(owner: String, repository: String, priorityName: String)(implicit s: Session): Option[Priority] =
+    Priorities.filter(_.byPriority(owner, repository, priorityName)).firstOption
+
+  def createPriority(owner: String, repository: String, priorityName: String, description: Option[String], color: String)(implicit s: Session): Int = {
+    val ordering = Priorities.filter(_.byRepository(owner, repository))
+      .list
+      .map(p => p.ordering)
+      .reduceOption(_ max _)
+      .map(m => m + 1)
+      .getOrElse(0)
+
+    Priorities returning Priorities.map(_.priorityId) insert Priority(
+      userName       = owner,
+      repositoryName = repository,
+      priorityName   = priorityName,
+      description    = description,
+      isDefault      = false,
+      ordering       = ordering,
+      color          = color
+    )
+  }
+
+  def updatePriority(owner: String, repository: String, priorityId: Int, priorityName: String, description: Option[String], color: String)
+                 (implicit s: Session): Unit =
+    Priorities.filter(_.byPrimaryKey(owner, repository, priorityId))
+          .map(t => (t.priorityName, t.description.?, t.color))
+          .update(priorityName, description, color)
+
+  def reorderPriorities(owner: String, repository: String, order: Map[Int, Int])
+                    (implicit s: Session): Unit = {
+
+    Priorities.filter(_.byRepository(owner, repository))
+      .list
+      .foreach(p => Priorities
+        .filter(_.byPrimaryKey(owner, repository, p.priorityId))
+        .map(_.ordering)
+        .update(order.get(p.priorityId).get))
+  }
+
+  def deletePriority(owner: String, repository: String, priorityId: Int)(implicit s: Session): Unit = {
+    Issues.filter(_.byRepository(owner, repository))
+      .filter(_.priorityId === priorityId)
+      .map(_.priorityId?)
+      .update(None)
+
+    Priorities.filter(_.byPrimaryKey(owner, repository, priorityId)).delete
+  }
+
+  def getDefaultPriority(owner: String, repository: String)(implicit s: Session): Option[Priority] = {
+    Priorities
+      .filter(_.byRepository(owner, repository))
+      .filter(_.isDefault)
+      .list
+      .headOption
+  }
+
+  def setDefaultPriority(owner: String, repository: String, priorityId: Option[Int])(implicit s: Session): Unit = {
+    Priorities
+      .filter(_.byRepository(owner, repository))
+      .filter(_.isDefault)
+      .map(_.isDefault)
+      .update(false)
+
+    priorityId.foreach(id => Priorities
+      .filter(_.byPrimaryKey(owner, repository, id))
+      .map(_.isDefault)
+      .update(true))
+  }
+}