Update CHANGELOG for GitBucket 4.31.0 release

add parameter style token authentication

.travis.yml

@@ -1,8 +1,10 @@
 language: scala
 sudo: true
-jdk: 
+jdk:
   - oraclejdk8
   - oraclejdk11
+  - openjdk8
+  - openjdk11
 script:
   - sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
 before_script:
@@ -15,5 +17,3 @@ cache:
     - $HOME/.sbt/boot
     - $HOME/.sbt/launchers
     - $HOME/.coursier
-    - $HOME/.embedmysql
-    - $HOME/.embedpostgresql

CHANGELOG.md

@@ -1,24 +1,42 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-### 4.29.0 - 29 Sep 2018
+### 4.31.0 - 17 Mar 2019
+- Docker support in CI plugin
+- Verify GPG key signed commit
+- OAuth2 Token (sent as a parameter) authentication support and new APIs in Web API
+- OGP (Open Graph protocol) support
+- Username completion with avatars
+
+### 4.30.1 - 22 Dec 2018
+- Bug fix for several WebHooks and Web API
+
+## 4.30.0 - 15 Dec 2018
+- Automatic ChangeLog Summary generation for new Releases
+- A lot of GitBucket Web API updates to increase compatibility with the GitHub API.
+- Display of checkboxes in Markdown files in Git repositories
+- A new extension point for plugins: anonymousAccessiblePaths
+- Group support in the Gist Plugin
+- Allow redirection to the Release Page from the Activity Timeline Page
+
+## 4.29.0 - 29 Sep 2018
 - Official Docker image has been available
 - Enhance file edit and delete buttons of the repository viewer
 - Fix Patch button to generate patches for all files in the commit
 - Display confirmation dialog for Transfer Ownership and Garbage collection
 - Fix wrong url encoding in "Compare & pull request"
 
-### 4.28.0 - 1 Sep 2018
+## 4.28.0 - 1 Sep 2018
 - Proxy support for plugin installation
 - Fix some bugs around pull requests
 
-### 4.27.0 - 29 Jul 2018
+## 4.27.0 - 29 Jul 2018
 - Create new tag on the browser
 - EditorConfig support
 - Improve issues / pull requests search
 - Some improvements and bug fixes for plugin installation via internet and pull request commenting
 
-### 4.26.0 - 30 Jun 2018
+## 4.26.0 - 30 Jun 2018
 - Installing plugins from the central registry
 - Repositories tab in the dashboard
 - Fork dialog enhancement
@@ -26,7 +44,7 @@ All changes to the project will be documented in this file.
 - Keep showing incompleted task list
 - New notification hooks
 
-### 4.25.0 - 29 May 2018
+## 4.25.0 - 29 May 2018
 - Security improvements
 - Show mail address at the profile page
 - Task list on commit comments
@@ -34,10 +52,10 @@ All changes to the project will be documented in this file.
 - Expose user public keys
 - Download repository improvements
 
-### 4.24.1 - 1 May 2018
+## 4.24.1 - 1 May 2018
 - Fix bug in Web API authentication
 
-### 4.24.0 - 30 Apr 2018
+## 4.24.0 - 30 Apr 2018
 - Diff for each review comment on pull requests
 - Extra mail addresses support
 - Show tags at the commit list
@@ -45,12 +63,12 @@ All changes to the project will be documented in this file.
 - Renew layout of gitbucket-gist-plugin
 - Web API of gitbucket-ci-plugin
 
-### 4.23.1 - 10 Apr 2018
+## 4.23.1 - 10 Apr 2018
 - Fix bug that the contents API doesn't work for the repository root
 - Fix shutdown problem in Tomcat deployment
 - Render by plugins at the blob view even if it's a binary file
 
-### 4.23.0 - 31 Mar 2018
+## 4.23.0 - 31 Mar 2018
 - Allow tail slash in URL
 - Display commit message of tags at the releases page
 - Add labels property to issues and pull requests API response
@@ -58,26 +76,26 @@ All changes to the project will be documented in this file.
 - Git authentication with personal access token
 - Max parallel builds and max stored history in CI plugin became configurable
 
-### 4.22.0 - 3 Mar 2018
+## 4.22.0 - 3 Mar 2018
 - Pull request merge strategy settings
 - Create repository with an empty commit
 - Improve database viewer
 - Update maven-repository-plugin
 
-### 4.21.2 - 27 Jan 2018
+## 4.21.2 - 27 Jan 2018
 - Bugfix
 
-### 4.21.1 - 27 Jan 2018
+## 4.21.1 - 27 Jan 2018
 - Bugfix
 
-### 4.21.0 - 27 Jan 2018
+## 4.21.0 - 27 Jan 2018
 - Release page
 - OpenID Connect support
 - New database viewer
 - Submodule links to web page
 - Clarify close/reopen button
 
-## 4.20.0 - 23 Dec 2017
+# 4.20.0 - 23 Dec 2017
 - Squash and rebase merge strategy for pull requests
 - Quick pull request creation
 - Download patch from the diff view

README.md

@@ -1,4 +1,4 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://img.shields.io/maven-central/v/io.github.gitbucket/gitbucket_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
+GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
 =========
 
 GitBucket is a Git web platform powered by Scala offering:
@@ -68,13 +68,13 @@ Support
 - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
 
-What's New in 4.29.x
+What's New in 4.31.x
 -------------
-### 4.29.0 - 29 Sep 2018
-- Official Docker image has been available
-- Enhance file edit and delete buttons of the repository viewer
-- Fix Patch button to generate patches for all files in the commit
-- Display confirmation dialog for Transfer Ownership and Garbage collection
-- Fix wrong url encoding in "Compare & pull request"
+### 4.31.0 - 17 Mar 2019
+- Docker support in CI plugin
+- Verify GPG key signed commit
+- OAuth2 Token (sent as a parameter) authentication support and new APIs in Web API
+- OGP (Open Graph protocol) support
+- Username completion with avatars
 
 See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -3,10 +3,10 @@ import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.29.0"
+val GitBucketVersion = "4.31.0"
 val ScalatraVersion = "2.6.3"
-val JettyVersion = "9.4.11.v20180605"
-val JgitVersion = "5.1.1.201809181055-r"
+val JettyVersion = "9.4.14.v20181114"
+val JgitVersion = "5.2.0.201812061821-r"
 
 lazy val root = (project in file("."))
   .enablePlugins(SbtTwirl, ScalatraPlugin)
@@ -17,10 +17,12 @@ sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.7"
+scalaVersion := "2.12.8"
 
 scalafmtOnCompile := true
 
+coverageExcludedPackages := ".*\\.html\\..*"
+
 // dependency settings
 resolvers ++= Seq(
   Classpaths.typesafeReleases,
@@ -36,41 +38,42 @@ libraryDependencies ++= Seq(
   "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"              % "3.5.3",
+  "org.json4s"                      %% "json4s-jackson"              % "3.5.2",
   "commons-io"                      % "commons-io"                   % "2.6",
-  "io.github.gitbucket"             % "solidbase"                    % "1.0.2",
+  "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
   "io.github.gitbucket"             % "markedj"                      % "1.0.15",
-  "org.apache.commons"              % "commons-compress"             % "1.15",
+  "org.apache.commons"              % "commons-compress"             % "1.18",
   "org.apache.commons"              % "commons-email"                % "1.5",
-  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.4",
-  "org.apache.sshd"                 % "apache-sshd"                  % "1.6.0" exclude ("org.slf4j", "slf4j-jdk14"),
-  "org.apache.tika"                 % "tika-core"                    % "1.17",
-  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.10",
+  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.6",
+  "org.apache.sshd"                 % "apache-sshd"                  % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
+  "org.apache.tika"                 % "tika-core"                    % "1.19.1",
+  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.11",
   "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
-  "com.h2database"                  % "h2"                           % "1.4.196",
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.2.6",
-  "org.postgresql"                  % "postgresql"                   % "42.2.4",
+  "com.h2database"                  % "h2"                           % "1.4.197",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.3.0",
+  "org.postgresql"                  % "postgresql"                   % "42.2.5",
   "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      % "HikariCP"                     % "2.7.4",
-  "com.typesafe"                    % "config"                       % "1.3.2",
-  "com.typesafe.akka"               %% "akka-actor"                  % "2.5.8",
+  "com.zaxxer"                      % "HikariCP"                     % "3.2.0",
+  "com.typesafe"                    % "config"                       % "1.3.3",
+  "com.typesafe.akka"               %% "akka-actor"                  % "2.5.18",
   "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.1.Final",
-  "com.enragedginger"               %% "akka-quartz-scheduler"       % "1.6.1-akka-2.5.x" exclude ("c3p0", "c3p0"),
+  "org.cache2k"                     % "cache2k-all"                  % "1.2.0.Final",
+  "com.enragedginger"               %% "akka-quartz-scheduler"       % "1.7.0-akka-2.5.x" exclude ("c3p0", "c3p0") exclude ("com.zaxxer", "HikariCP-java6"),
   "net.coobird"                     % "thumbnailator"                % "0.4.8",
   "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
-  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "5.45",
+  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "5.64.4",
   "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",
-  "org.mockito"                     % "mockito-core"                 % "2.19.1" % "test",
-  "com.wix"                         % "wix-embedded-mysql"           % "3.0.0" % "test",
-  "ru.yandex.qatools.embed"         % "postgresql-embedded"          % "2.6" % "test",
-  "net.i2p.crypto"                  % "eddsa"                        % "0.2.0",
-  "is.tagomor.woothee"              % "woothee-java"                 % "1.7.0",
-  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.1"
+  "org.mockito"                     % "mockito-core"                 % "2.23.4" % "test",
+  "com.dimafeng"                    %% "testcontainers-scala"        % "0.22.0" % "test",
+  "org.testcontainers"              % "mysql"                        % "1.10.3" % "test",
+  "org.testcontainers"              % "postgresql"                   % "1.10.3" % "test",
+  "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
+  "is.tagomor.woothee"              % "woothee-java"                 % "1.8.0",
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.3"
 )
 
 // Compiler settings

doc/build.md

@@ -1,9 +1,9 @@
-How to run from the source tree
+How to build and run from the source tree
 ========
 
-Install [sbt](http://www.scala-sbt.org/index.html) at first.
+First of all, Install [sbt](http://www.scala-sbt.org/index.html).
 
-```
+```shell
 $ brew install sbt
 ```
 
@@ -12,7 +12,7 @@ Run for Development
 
 If you want to test GitBucket, type the following command in the root directory of the source tree.
 
-```
+```shell
 $ sbt ~jetty:start
 ```
 
@@ -25,7 +25,7 @@ Build war file
 
 To build war file, run the following command:
 
-```
+```shell
 $ sbt package
 ```
 
@@ -33,7 +33,7 @@ $ sbt package
 
 To build an executable war file, run
 
-```
+```shell
 $ sbt executable
 ```
 
@@ -41,8 +41,21 @@ at the top of the source tree. It generates executable `gitbucket.war` into `tar
 
 Run tests spec
 ---------
+Before running tests, you need to install docker.
+
+```shell
+$ brew cask install docker       # Install Docker
+$ open /Applications/Docker.app  # Start Docker
+```
+
 To run the full series of tests, run the following command:
 
-```
+```shell
 $ sbt test
 ```
+
+If you don't have docker, you can skip docker tests which require docker as follows:
+
+```shell
+$ sbt "testOnly * -- -l ExternalDBTest"
+```

doc/debug.md

@@ -0,0 +1,22 @@
+Debug GitBucket on IntelliJ
+========
+Add following configuration for allowing remote debugging to `buils.sbt`:
+
+```scala
+javaOptions in Jetty ++= Seq(
+  "-Xdebug",
+  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+)
+```
+
+Run GitBucket:
+
+```shell
+$ sbt ~jetty:start
+```
+
+In IntelliJ, create remote debug configuration as follows. Make sure port number is same as above configuration.
+
+![Remote debug configuration on IntelliJ](remote_debug.png)
+
+Then you can start debugging on IntelliJ!

doc/directory.md

@@ -9,16 +9,17 @@ This directory has following structure:
   * /repositories 
     * /USER_NAME
       * /REPO_NAME.git (substance of repository. GitServlet sees this directory)
+      * /REPO_NAME.wiki.git (wiki repository)
       * /REPO_NAME
         * /issues (files which are attached to issue)
-      * /REPO_NAME.wiki.git (wiki repository)
+        * /lfs (LFS managed files)
   * /data
     * /USER_NAME
       * /files
         * avatar.xxx (image file of user avatar)
   * /plugins
-    * /PLUGIN_NAME
-      * plugin.js
+    * plugin.jar
+    * /.installed (copied available plugins from the parent directory automatically)
   * /tmp
     * /_upload
       * /SESSION_ID (removed at session timeout)

doc/licenses.md

@@ -4,98 +4,128 @@ Category | License | Dependency | Notes
 --- | --- | --- | ---
 Apache | [         Apache License, Version 2.0       ](         http://opensource.org/licenses/apache2.0.php       ) | org.osgi # org.osgi.core # 4.3.1 | <notextile></notextile>
 Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.googlecode.javaewah # JavaEWAH # 1.1.6 | <notextile></notextile>
-Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-all # 1.0.0.CR1 | <notextile></notextile>
-Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.objenesis # objenesis # 2.5 | <notextile></notextile>
-Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # apache-sshd # 1.4.0 | <notextile></notextile>
-Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-core # 1.4.0 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.typesafe # config # 1.3.1 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.typesafe.akka # akka-actor_2.12 # 2.5.0 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | commons-io # commons-io # 2.5 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | fr.brouillard.oss.security.xhub # xhub4j-core # 1.0.0 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-compress # 1.13 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-email # 1.4 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-lang3 # 3.5 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpclient # 4.5.3 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpcore # 4.4.6 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpmime # 4.5.2 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.tika # tika-core # 1.14 | <notextile></notextile>
-Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.liquibase # liquibase-core # 3.4.1 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-http # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-io # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-security # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-server # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-servlet # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-util # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-webapp # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-xml # 9.2.19.v20160908 | <notextile></notextile>
-Apache | [Apache Software License, Version 1.1](http://www.apache.org/licenses/LICENSE-1.1) | org.bouncycastle # bcpg-jdk15on # 1.56 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-all # 1.2.0.Final | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-api # 1.2.0.Final | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-core # 1.2.0.Final | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.objenesis # objenesis # 2.6 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # apache-sshd # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-cli # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-common # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-core # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-putty # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-scp # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-sftp # 2.1.0 | <notextile></notextile>
+Apache | [Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.java.dev.jna # jna # 4.5.1 | <notextile></notextile>
+Apache | [Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.java.dev.jna # jna-platform # 4.5.1 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.github.stephenc.jcip # jcip-annotations # 1.0-1 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.kohlschutter.junixsocket # junixsocket-common # 2.0.4 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.kohlschutter.junixsocket # junixsocket-native-common # 2.0.4 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) | com.typesafe # config # 1.3.3 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.typesafe.akka # akka-actor_2.12 # 2.5.18 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | commons-io # commons-io # 2.6 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | is.tagomor.woothee # woothee-java # 1.8.0 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-compress # 1.18 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-email # 1.5 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-lang3 # 3.6 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpclient # 4.5.6 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpcore # 4.4.10 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpmime # 4.5.3 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.tika # tika-core # 1.19.1 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.ec4j.core # ec4j-core # 0.0.3 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.liquibase # liquibase-core # 3.6.2 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.yaml # snakeyaml # 1.18 | <notextile></notextile>
+Apache | [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html‎) | com.nimbusds # oauth2-oidc-sdk # 5.64.4 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-http # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-io # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-security # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-server # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-servlet # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-util # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-webapp # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-xml # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License, Version 1.1](http://www.apache.org/licenses/LICENSE-1.1) | org.bouncycastle # bcpg-jdk15on # 1.60 | <notextile></notextile>
 Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.github.bkromhout # java-diff-utils # 2.1.1 | <notextile></notextile>
-Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0.html) | com.typesafe.play # twirl-api_2.12 # 1.3.7 | <notextile></notextile>
-Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-ast_2.12 # 3.5.1 | <notextile></notextile>
-Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-core_2.12 # 3.5.1 | <notextile></notextile>
-Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-jackson_2.12 # 3.5.1 | <notextile></notextile>
-Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-scalap_2.12 # 3.5.1 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.enragedginger # akka-quartz-scheduler_2.12 # 1.6.0-akka-2.4.x | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0.html) | com.typesafe.play # twirl-api_2.12 # 1.3.15 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-ast_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-core_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-jackson_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-scalap_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0) | org.scala-lang # scala-library # 2.12.8 | <notextile></notextile>
+Apache | [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0) | org.scala-lang # scala-reflect # 2.12.8 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.enragedginger # akka-quartz-scheduler_2.12 # 1.7.0-akka-2.5.x | <notextile></notextile>
 Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-annotations # 2.8.0 | <notextile></notextile>
 Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-core # 2.8.4 | <notextile></notextile>
 Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-databind # 2.8.4 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.github.takezoe # blocking-slick-32_2.12 # 0.0.10 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.github.takezoe # blocking-slick-32_2.12 # 0.0.11 | <notextile></notextile>
 Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.google.code.findbugs # jsr305 # 3.0.0 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.zaxxer # HikariCP # 2.6.1 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | commons-codec # commons-codec # 1.9 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | commons-logging # commons-logging # 1.2 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | de.flapdoodle.embed # de.flapdoodle.embed.process # 2.0.1 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.nimbusds # lang-tag # 1.4.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.nimbusds # nimbus-jose-jwt # 5.5 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.zaxxer # HikariCP # 3.2.0 | <notextile></notextile>
 Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | eu.medsea.mimeutil # mime-util # 2.1.3 | <notextile></notextile>
 Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # markedj # 1.0.15 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # scalatra-forms_2.12 # 1.1.0 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # solidbase # 1.0.2 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy # 1.6.11 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy-agent # 1.6.11 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.quartz-scheduler # quartz # 2.2.3 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | ru.yandex.qatools.embed # postgresql-embedded # 2.0 | <notextile></notextile>
-Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | tomcat # tomcat-apr # 5.5.23 | <notextile></notextile>
-Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalactic # scalactic_2.12 # 3.0.0 | <notextile></notextile>
-Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalatest # scalatest_2.12 # 3.0.0 | <notextile></notextile>
-BSD | [BSD](LICENSE.txt) | com.thoughtworks.paranamer # paranamer # 2.8 | <notextile></notextile>
-BSD | [BSD](http://software.clapper.org/grizzled-slf4j/license.html) | org.clapper # grizzled-slf4j_2.12 # 1.3.0 | <notextile></notextile>
-BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-common_2.12 # 2.5.0 | <notextile></notextile>
-BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-json_2.12 # 2.5.0 | <notextile></notextile>
-BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-scalatest_2.12 # 2.5.0 | <notextile></notextile>
-BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-test_2.12 # 2.5.0 | <notextile></notextile>
-BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra_2.12 # 2.5.0 | <notextile></notextile>
-BSD | [BSD 3-Clause](http://www.scala-lang.org/license.html) | org.scala-lang # scala-library # 2.12.3 | <notextile></notextile>
-BSD | [BSD 3-Clause](http://www.scala-lang.org/license.html) | org.scala-lang # scala-reflect # 2.12.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # solidbase # 1.0.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy # 1.9.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy-agent # 1.9.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.minidev # accessors-smart # 1.2 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.minidev # json-smart # 2.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.jetbrains # annotations # 15.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.quartz-scheduler # quartz # 2.3.0 | <notextile></notextile>
+Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalactic # scalactic_2.12 # 3.0.3 | <notextile></notextile>
+Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalatest # scalatest_2.12 # 3.0.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-common_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-forms_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-json_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-scalatest_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-test_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra_2.12 # 2.6.3 | <notextile></notextile>
 BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-java8-compat_2.12 # 0.8.0 | <notextile></notextile>
-BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-parser-combinators_2.12 # 1.0.4 | <notextile></notextile>
+BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-parser-combinators_2.12 # 1.0.6 | <notextile></notextile>
 BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-xml_2.12 # 1.0.6 | <notextile></notextile>
-BSD | [BSD License](http://www.opensource.org/licenses/bsd-license.php) | com.wix # wix-embedded-mysql # 2.1.4 | <notextile></notextile>
-BSD | [BSD-2-Clause](https://jdbc.postgresql.org/about/license.html) | org.postgresql # postgresql # 42.0.0 | <notextile></notextile>
-BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit # 4.8.0.201706111038-r | <notextile></notextile>
-BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.archive # 4.8.0.201706111038-r | <notextile></notextile>
-BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.http.server # 4.8.0.201706111038-r | <notextile></notextile>
+BSD | [BSD-2-Clause](https://jdbc.postgresql.org/about/license.html) | org.postgresql # postgresql # 42.2.5 | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit # 5.2.0.201812061821-r | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.archive # 5.2.0.201812061821-r | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.http.server # 5.2.0.201812061821-r | <notextile></notextile>
 BSD | [New BSD License](http://www.opensource.org/licenses/bsd-license.php) | org.hamcrest # hamcrest-core # 1.3 | <notextile></notextile>
 BSD | [Revised BSD](http://www.jcraft.com/jsch/LICENSE.txt) | com.jcraft # jsch # 0.1.54 | <notextile></notextile>
+BSD | [Revised BSD](http://www.jcraft.com/jzlib/LICENSE.txt) | com.jcraft # jzlib # 1.1.1 | <notextile></notextile>
 BSD | [Two-clause BSD-style license](http://github.com/slick/slick/blob/master/LICENSE.txt) | com.typesafe.slick # slick_2.12 # 3.2.1 | <notextile></notextile>
 CC0 | [CC0](http://creativecommons.org/publicdomain/zero/1.0/) | org.reactivestreams # reactive-streams # 1.0.0 | <notextile></notextile>
-CDDL | [COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0](https://glassfish.dev.java.net/public/CDDLv1.0.html) | javax.activation # activation # 1.1.1 | <notextile></notextile>
-GPL | [CDDL/GPLv2+CE](https://glassfish.java.net/public/CDDL+GPL_1_1.html) | com.sun.mail # javax.mail # 1.5.2 | <notextile></notextile>
+CC0 | [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/) | net.i2p.crypto # eddsa # 0.3.0 | <notextile></notextile>
+CC0 | [CC0 1.0 Universal License](http://creativecommons.org/publicdomain/zero/1.0/) | org.scijava # native-lib-loader # 2.0.2 | <notextile></notextile>
+CDDL | [Common Development and Distribution License (CDDL) v1.0](https://glassfish.dev.java.net/public/CDDLv1.0.html) | javax.activation # activation # 1.1 | <notextile></notextile>
+GPL | [CDDL/GPLv2+CE](https://javaee.github.io/javamail/LICENSE) | com.sun.mail # javax.mail # 1.6.1 | <notextile></notextile>
+GPL | [GPL2 w/ CPE](https://oss.oracle.com/licenses/CDDL+GPL-1.1) | javax.xml.bind # jaxb-api # 2.3.0 | <notextile></notextile>
+GPL with Classpath Extension | [CDDL + GPLv2 with classpath exception](https://github.com/javaee/javax.annotation/blob/master/LICENSE) | javax.annotation # javax.annotation-api # 1.3.1 | <notextile></notextile>
 GPL with Classpath Extension | [CDDL + GPLv2 with classpath exception](https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html) | javax.servlet # javax.servlet-api # 3.1.0 | <notextile></notextile>
 LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-classic # 1.2.3 | <notextile></notextile>
 LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-core # 1.2.3 | <notextile></notextile>
-LGPL | [LGPL, version 2.1](http://www.gnu.org/licenses/licenses.html) | net.java.dev.jna # jna # 4.0.0 | <notextile></notextile>
-LGPL | [LGPL, version 2.1](http://www.gnu.org/licenses/licenses.html) | net.java.dev.jna # jna-platform # 4.0.0 | <notextile></notextile>
-LGPL | [LGPL-2.1](null) | org.mariadb.jdbc # mariadb-java-client # 2.0.3 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License, Version 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) | com.mchange # c3p0 # 0.9.5.2 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License, Version 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) | com.mchange # mchange-commons-java # 0.2.11 | <notextile></notextile>
+LGPL | [LGPL-2.1](null) | org.mariadb.jdbc # mariadb-java-client # 2.3.0 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.rnorth # tcp-unix-socket-proxy # 1.0.2 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.rnorth.duct-tape # duct-tape # 1.0.7 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.rnorth.visible-assertions # visible-assertions # 2.1.1 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # database-commons # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # jdbc # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # mysql # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # postgresql # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # testcontainers # 1.10.3 | <notextile></notextile>
 MIT | [MIT License](http://www.opensource.org/licenses/mit-license.php) | org.slf4j # slf4j-api # 1.7.25 | <notextile></notextile>
 MIT | [The MIT License](http://www.opensource.org/licenses/mit-license.php) | com.github.zafarkhaja # java-semver # 0.9.0 | <notextile></notextile>
 MIT | [The MIT License](https://jsoup.org/license) | org.jsoup # jsoup # 1.10.2 | <notextile></notextile>
-MIT | [The MIT License](http://github.com/mockito/mockito/blob/master/LICENSE) | org.mockito # mockito-all # 1.10.19 | <notextile></notextile>
-MIT | [The MIT License](http://github.com/mockito/mockito/blob/master/LICENSE) | org.mockito # mockito-core # 2.7.22 | <notextile></notextile>
+MIT | [The MIT License](https://github.com/mockito/mockito/blob/master/LICENSE) | org.mockito # mockito-core # 2.23.4 | <notextile></notextile>
+MIT | [The MIT License (MIT)](https://opensource.org/licenses/MIT) | com.dimafeng # testcontainers-scala_2.12 # 0.22.0 | <notextile></notextile>
 MIT | [The MIT License (MIT)](http://www.opensource.org/licenses/mit-license.html) | net.coobird # thumbnailator # 0.4.8 | <notextile></notextile>
-Mozilla | [MPL 2.0 or EPL 1.0](http://h2database.com/html/license.html) | com.h2database # h2 # 1.4.195 | <notextile></notextile>
+Mozilla | [MPL 2.0 or EPL 1.0](http://h2database.com/html/license.html) | com.h2database # h2 # 1.4.197 | <notextile></notextile>
 Mozilla | [Mozilla Public License 1.1 (MPL 1.1)](http://www.mozilla.org/MPL/MPL-1.1.html) | com.googlecode.juniversalchardet # juniversalchardet # 1.0.3 | <notextile></notextile>
-Public Domain | [Public Domain](http://en.wikipedia.org/wiki/Public_domain) | net.i2p.crypto # eddsa # 0.1.0 | <notextile></notextile>
-unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcpkix-jdk15on # 1.56 | <notextile></notextile>
-unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcprov-jdk15on # 1.56 | <notextile></notextile>
+unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcpkix-jdk15on # 1.60 | <notextile></notextile>
+unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcprov-jdk15on # 1.60 | <notextile></notextile>
 unrecognized | [Eclipse Public License 1.0](http://www.eclipse.org/legal/epl-v10.html) | junit # junit # 4.12 | <notextile></notextile>
 unrecognized | [The OpenLDAP Public License](http://www.openldap.org/software/release/license.html) | com.novell.ldap # jldap # 2009-10-07 | <notextile></notextile>
+unrecognized | [none specified](none specified) | com.thoughtworks.paranamer # paranamer # 2.8 | <notextile></notextile>
+unrecognized | [none specified](none specified) | commons-codec # commons-codec # 1.10 | <notextile></notextile>
+unrecognized | [none specified](none specified) | commons-logging # commons-logging # 1.2 | <notextile></notextile>
+unrecognized | [none specified](none specified) | fr.brouillard.oss.security.xhub # xhub4j-core # 1.0.0 | <notextile></notextile>
+unrecognized | [none specified](none specified) | org.ow2.asm # asm # 5.0.4 | <notextile></notextile>
+unrecognized | [none specified](none specified) | tomcat # tomcat-apr # 5.5.23 | <notextile></notextile>
 

doc/readme.md

@@ -1,6 +1,7 @@
 Developer's Guide
 ========
- * [How to run from source tree](how_to_run.md)
+ * [Build from source tree](build.md)
+ * [Debug on IntelliJ](debug.md)
  * [Directory Structure](directory.md)
  * [Mapping and Validation](validation.md)
  * [Authentication in Controller](authenticator.md)

doc/release.md

@@ -34,6 +34,20 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 Generate release files
 --------
 
+### Deploy assembly jar file
+
+For plug-in development, we have to publish the GitBucket jar file to the Maven central repository before release GitBucket itself.
+ 
+First, hit following command to publish artifacts to the sonatype OSS repository:
+
+```bash
+$ sbt publishSigned
+```
+
+Then logged-in to https://oss.sonatype.org/, close and release the repository.
+
+You need to wait up to a day until [gitbucket-notification-plugin](https://plugins.gitbucket-community.org/) which is default bundled plugin is built for new version of GitBucket.
+
 ### Make release war file
 
 Run `sbt executable`. The release war file and fingerprint are generated into `target/executable/gitbucket.war`.
@@ -42,20 +56,4 @@ Run `sbt executable`. The release war file and fingerprint are generated into `t
 $ sbt executable
 ```
 
-### Deploy assembly jar file
-
-For plug-in development, we have to publish the GitBucket jar file to the Maven central repository as well. At first, hit following command to publish artifacts to the sonatype OSS repository:
-
-```bash
-$ sbt publishSigned
-```
-
-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.
+Create new release from the corresponded tag on GitHub, then upload generated jar file and fingerprints to the release.

doc/validation.md

@@ -1,11 +1,11 @@
 Mapping and Validation
 ========
-GitBucket uses [scalatra-forms](https://github.com/takezoe/scalatra-forms) to validate request parameters and map them to the scala object. This is inspired by Play2 form mapping / validation.
+GitBucket uses [scalatra-forms](http://scalatra.org/guides/2.6/formats/forms.html) to validate request parameters and map them to the scala object. This is inspired by Play2 form mapping / validation.
 
 At first, define the mapping as following:
 
 ```scala
-import jp.sf.amateras.scalatra.forms._
+import org.scalatra.forms._
 
 case class RegisterForm(name: String, description: String)
 
@@ -15,17 +15,17 @@ val form = mapping(
 )(RegisterForm.apply)
 ```
 
-The servlet have to mixed in ```jp.sf.amateras.scalatra.forms.ClientSideValidationFormSupport``` to validate request parameters and take mapped object. It validates request parameters before action. If any errors are detected, it throws an exception.
+The servlet have to mixed in `gitbucket.core.controller.ValidationFormSupport` to validate request parameters and take mapped object. It validates request parameters before action. If any errors are detected, it throws an exception.
 
 ```scala
-class RegisterServlet extends ScalatraServlet with ClientSideValidationFormSupport {
+class RegisterServlet extends ScalatraServlet with ValidationFormSupport {
   post("/register", form) { form: RegisterForm =>
     ...
   }
 }
 ```
 
-In the view template, you can add client-side validation by adding ```validate="true"``` to your form. Error messages are set to ```span#error-<fieldname>```.
+In the view template, you can add client-side validation by adding `validate="true"` to your form. Error messages are set to `span#error-<fieldname>`.
 
 ```html
 <form method="POST" action="/register" validate="true">
@@ -39,9 +39,9 @@ In the view template, you can add client-side validation by adding ```validate="
 </form>
 ```
 
-Client-side validation calls ```<form-action>/validate``` to validate form contents. It returns a validation result as JSON. In this case, form action is ```/register```, so ```/register/validate``` is called before submitting a form. ```ClientSideValidationFormSupport``` adds this JSON API automatically.
+Client-side validation calls `<form-action>/validate` to validate form contents. It returns a validation result as JSON. In this case, form action is `/register`, so `/register/validate` is called before submitting a form. `ValidationFormSupport` adds this JSON API automatically.
 
-For Ajax request, you have to use '''ajaxGet''' or '''ajaxPost''' to define action. It almost same as '''get''' or '''post'''. You can implement actions which handle Ajax request as same as normal actions.
+For Ajax request, you have to use `ajaxGet` or `ajaxPost` to define action. It almost same as '''get''' or '''post'''. You can implement actions which handle Ajax request as same as normal actions.
 Small difference is they return validation errors as JSON.
 
 ```scala

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.3
+sbt.version=1.2.6

project/build.sbt

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

project/plugins.sbt

@@ -1,9 +1,12 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.geirsson"     % "sbt-scalafmt" % "1.5.0")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"    % "1.3.13")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly" % "0.14.5")
-addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.1")
-addSbtPlugin("com.jsuereth"     % "sbt-pgp"      % "1.1.0")
+addSbtPlugin("com.geirsson"     % "sbt-scalafmt"         % "1.5.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"            % "1.3.15")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly"         % "0.14.9")
+addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"         % "1.0.3")
+addSbtPlugin("com.jsuereth"     % "sbt-pgp"              % "1.1.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-license-report"   % "1.2.0")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "1.5.1")
+
 addSbtCoursier
-addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")

src/main/resources/bundle-plugins.txt

@@ -1 +1 @@
-notifications:1.6.0
+notifications:1.7.0

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

@@ -206,7 +206,7 @@
     <column name="PULL_REQUEST" type="boolean" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="ISSUE_ID, USER_NAME, REPOSITORY_NAME"/>
+  <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK0" baseTableName="ISSUE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK2" baseTableName="ISSUE" baseColumnNames="MILESTONE_ID" referencedTableName="MILESTONE" referencedColumnNames="MILESTONE_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK1" baseTableName="ISSUE" baseColumnNames="OPENED_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
@@ -348,4 +348,4 @@
   <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK" tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT"/>
   <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0" baseTableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" baseColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" referencedTableName="PROTECTED_BRANCH" referencedColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" onDelete="CASCADE" onUpdate="CASCADE"/>
 
-</changeSet>
+</changeSet>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <!--================================================================================================-->
+  <!-- SSH_KEY -->
+  <!--================================================================================================-->
+  <createTable tableName="GPG_KEY">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="KEY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="GPG_KEY_ID" type="bigint" nullable="false"/>
+    <column name="TITLE" type="varchar(100)" nullable="false"/>
+    <column name="PUBLIC_KEY" type="text" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_GPG_KEY_PK" tableName="GPG_KEY" columnNames="USER_NAME, GPG_KEY_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_GPG_KEY_FK0" baseTableName="GPG_KEY" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+</changeSet>

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

@@ -58,5 +58,8 @@ object GitBucketCoreModule
       new Version("4.26.0"),
       new Version("4.27.0", new LiquibaseMigration("update/gitbucket-core_4.27.xml")),
       new Version("4.28.0"),
-      new Version("4.29.0")
+      new Version("4.29.0"),
+      new Version("4.30.0"),
+      new Version("4.30.1"),
+      new Version("4.31.0", new LiquibaseMigration("update/gitbucket-core_4.31.xml"))
     )

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

@@ -0,0 +1,9 @@
+package gitbucket.core.api
+
+case class AddACollaborator(permission: String) {
+  val role: String = permission match {
+    case "admin" => "ADMIN"
+    case "push"  => "DEVELOPER"
+    case "pull"  => "GUEST"
+  }
+}

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

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

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

@@ -21,22 +21,14 @@ case class ApiCommit(
   modified: List[String],
   author: ApiPersonIdent,
   committer: ApiPersonIdent
-)(repositoryName: RepositoryName, urlIsHtmlUrl: Boolean)
+)(repositoryName: RepositoryName)
     extends FieldSerializable {
-  val url = if (urlIsHtmlUrl) {
-    ApiPath(s"/${repositoryName.fullName}/commit/${id}")
-  } else {
-    ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
-  }
-  val html_url = if (urlIsHtmlUrl) {
-    None
-  } else {
-    Some(ApiPath(s"/${repositoryName.fullName}/commit/${id}"))
-  }
+  val url = ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/commit/${id}")
 }
 
 object ApiCommit {
-  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo, urlIsHtmlUrl: Boolean = false): ApiCommit = {
+  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = {
     val diffs = JGitUtil.getDiffs(git, None, commit.id, false, false)
     ApiCommit(
       id = commit.id,
@@ -53,8 +45,6 @@ object ApiCommit {
       },
       author = ApiPersonIdent.author(commit),
       committer = ApiPersonIdent.committer(commit)
-    )(repositoryName, urlIsHtmlUrl)
+    )(repositoryName)
   }
-  def forWebhookPayload(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit =
-    apply(git, repositoryName, commit, true)
 }

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

@@ -98,7 +98,7 @@ object ApiCommits {
       url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
       sha = commitInfo.id,
       html_url = ApiPath(s"${repositoryName.fullName}/commit/${commitInfo.id}"),
-      comment_url = ApiPath(""),
+      comment_url = ApiPath(""), // TODO no API for commit comment
       commit = Commit(
         url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
         author = ApiPersonIdent.author(commitInfo),

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

@@ -0,0 +1,20 @@
+package gitbucket.core.api
+
+import java.util.Date
+
+import gitbucket.core.model.Account
+
+case class ApiGroup(login: String, description: Option[String], created_at: Date) {
+  val id = 0 // dummy id
+  val url = ApiPath(s"/api/v3/orgs/${login}")
+  val html_url = ApiPath(s"/${login}")
+  val avatar_url = ApiPath(s"/${login}/_avatar")
+}
+
+object ApiGroup {
+  def apply(group: Account): ApiGroup = ApiGroup(
+    login = group.userName,
+    description = group.description,
+    created_at = group.registeredDate
+  )
+}

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

@@ -0,0 +1,42 @@
+package gitbucket.core.api
+import gitbucket.core.model.{Account, ReleaseAsset, ReleaseTag}
+import gitbucket.core.util.RepositoryName
+
+case class ApiReleaseAsset(name: String, size: Long)(tag: String, fileName: String, repositoryName: RepositoryName) {
+  val label = name
+  val file_id = fileName
+  val browser_download_url = ApiPath(
+    s"/api/v3/repos/${repositoryName.fullName}/releases/${tag}/assets/${fileName}"
+  )
+}
+
+object ApiReleaseAsset {
+  def apply(asset: ReleaseAsset, repositoryName: RepositoryName): ApiReleaseAsset =
+    ApiReleaseAsset(asset.label, asset.size)(asset.tag, asset.fileName, repositoryName)
+}
+
+case class ApiRelease(
+  name: String,
+  tag_name: String,
+  body: Option[String],
+  author: ApiUser,
+  assets: Seq[ApiReleaseAsset]
+)
+
+object ApiRelease {
+  def apply(
+    release: ReleaseTag,
+    assets: Seq[ReleaseAsset],
+    author: Account,
+    repositoryName: RepositoryName
+  ): ApiRelease =
+    ApiRelease(
+      release.name,
+      release.tag,
+      release.content,
+      ApiUser(author),
+      assets.map { asset =>
+        ApiReleaseAsset(asset, repositoryName)
+      }
+    )
+}

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

@@ -13,15 +13,11 @@ case class ApiRepository(
   `private`: Boolean,
   default_branch: String,
   owner: ApiUser
-)(urlIsHtmlUrl: Boolean) {
+) {
   val id = 0 // dummy id
   val forks_count = forks
   val watchers_count = watchers
-  val url = if (urlIsHtmlUrl) {
-    ApiPath(s"/${full_name}")
-  } else {
-    ApiPath(s"/api/v3/repos/${full_name}")
-  }
+  val url = ApiPath(s"/api/v3/repos/${full_name}")
   val http_url = ApiPath(s"/git/${full_name}.git")
   val clone_url = ApiPath(s"/git/${full_name}.git")
   val html_url = ApiPath(s"/${full_name}")
@@ -33,8 +29,7 @@ object ApiRepository {
     repository: Repository,
     owner: ApiUser,
     forkedCount: Int = 0,
-    watchers: Int = 0,
-    urlIsHtmlUrl: Boolean = false
+    watchers: Int = 0
   ): ApiRepository =
     ApiRepository(
       name = repository.repositoryName,
@@ -45,16 +40,13 @@ object ApiRepository {
       `private` = repository.isPrivate,
       default_branch = repository.defaultBranch,
       owner = owner
-    )(urlIsHtmlUrl)
+    )
 
   def apply(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
     ApiRepository(repositoryInfo.repository, owner, forkedCount = repositoryInfo.forkedCount)
 
   def apply(repositoryInfo: RepositoryInfo, owner: Account): ApiRepository =
-    this(repositoryInfo.repository, ApiUser(owner))
-
-  def forWebhookPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(repositoryInfo.repository, owner, forkedCount = repositoryInfo.forkedCount, urlIsHtmlUrl = true)
+    this(repositoryInfo, ApiUser(owner))
 
   def forDummyPayload(owner: ApiUser): ApiRepository =
     ApiRepository(
@@ -66,5 +58,5 @@ object ApiRepository {
       `private` = false,
       default_branch = "master",
       owner = owner
-    )(true)
+    )
 }

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

@@ -0,0 +1,13 @@
+package gitbucket.core.api
+
+/**
+ * https://developer.github.com/v3/repos/contents/#create-a-file
+ */
+case class CreateAFile(
+  message: String,
+  content: String,
+  sha: Option[String],
+  branch: Option[String],
+  committer: Option[ApiPusher],
+  author: Option[ApiPusher]
+)

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

@@ -0,0 +1,8 @@
+package gitbucket.core.api
+
+case class CreateAGroup(
+  login: String,
+  admin: String,
+  profile_name: Option[String],
+  url: Option[String]
+)

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

@@ -0,0 +1,16 @@
+package gitbucket.core.api
+
+case class CreateAPullRequest(
+  title: String,
+  head: String,
+  base: String,
+  body: Option[String],
+  maintainer_can_modify: Option[Boolean]
+)
+
+case class CreateAPullRequestAlt(
+  issue: Integer,
+  head: String,
+  base: String,
+  maintainer_can_modify: Option[Boolean]
+)

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

@@ -0,0 +1,10 @@
+package gitbucket.core.api
+
+case class CreateARelease(
+  tag_name: String,
+  target_commitish: Option[String],
+  name: Option[String],
+  body: Option[String],
+  draft: Option[Boolean],
+  prerelease: Option[Boolean]
+)

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

@@ -0,0 +1,11 @@
+package gitbucket.core.api
+
+case class CreateAUser(
+  login: String,
+  password: String,
+  email: String,
+  fullName: Option[String],
+  isAdmin: Option[Boolean],
+  description: Option[String],
+  url: Option[String]
+)

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

@@ -24,6 +24,7 @@ object JsonFormat {
         }, { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
     )
   ) + FieldSerializer[ApiUser]() +
+    FieldSerializer[ApiGroup]() +
     FieldSerializer[ApiPullRequest]() +
     FieldSerializer[ApiRepository]() +
     FieldSerializer[ApiCommitListItem.Parent]() +
@@ -42,6 +43,8 @@ object JsonFormat {
     FieldSerializer[ApiCommits.Tree]() +
     FieldSerializer[ApiCommits.Stats]() +
     FieldSerializer[ApiCommits.File]() +
+    FieldSerializer[ApiRelease]() +
+    FieldSerializer[ApiReleaseAsset]() +
     ApiBranchProtection.enforcementLevelSerializer
 
   def apiPathSerializer(c: Context) =

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

@@ -0,0 +1,11 @@
+package gitbucket.core.api
+
+case class UpdateAUser(
+  name: Option[String],
+  email: Option[String],
+  blog: Option[String],
+  company: Option[String],
+  location: Option[String],
+  hireable: Option[Boolean],
+  bio: Option[String]
+)

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

@@ -26,6 +26,7 @@ class AccountController
     with WikiService
     with LabelsService
     with SshKeyService
+    with GpgKeyService
     with OneselfAuthenticator
     with UsersAuthenticator
     with GroupManagerAuthenticator
@@ -42,6 +43,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     with WikiService
     with LabelsService
     with SshKeyService
+    with GpgKeyService
     with OneselfAuthenticator
     with UsersAuthenticator
     with GroupManagerAuthenticator
@@ -75,6 +77,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   case class SshKeyForm(title: String, publicKey: String)
 
+  case class GpgKeyForm(title: String, publicKey: String)
+
   case class PersonalTokenForm(note: String)
 
   val newForm = mapping(
@@ -108,6 +112,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "publicKey" -> trim2(label("Key", text(required, validPublicKey)))
   )(SshKeyForm.apply)
 
+  val gpgKeyForm = mapping(
+    "title" -> trim(label("Title", text(required, maxlength(100)))),
+    "publicKey" -> label("Key", text(required, validGpgPublicKey))
+  )(GpgKeyForm.apply)
+
   val personalTokenForm = mapping(
     "note" -> trim(label("Token", text(required, maxlength(100))))
   )(PersonalTokenForm.apply)
@@ -360,13 +369,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
 //        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
 //      }
-          // Remove from GROUP_MEMBER and COLLABORATOR
-          removeUserRelatedData(userName)
-          updateAccount(account.copy(isRemoved = true))
-
-          // call hooks
-          PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
-
+          suspendAccount(account)
           session.invalidate
           redirect("/")
         }
@@ -393,6 +396,27 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     redirect(s"/${userName}/_ssh")
   })
 
+  get("/:userName/_gpg")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { x =>
+      //html.ssh(x, getPublicKeys(x.userName))
+      html.gpg(x, getGpgPublicKeys(x.userName))
+    } getOrElse NotFound()
+  })
+
+  post("/:userName/_gpg", gpgKeyForm)(oneselfOnly { form =>
+    val userName = params("userName")
+    addGpgPublicKey(userName, form.title, form.publicKey)
+    redirect(s"/${userName}/_gpg")
+  })
+
+  get("/:userName/_gpg/delete/:id")(oneselfOnly {
+    val userName = params("userName")
+    val keyId = params("id").toInt
+    deleteGpgPublicKey(userName, keyId)
+    redirect(s"/${userName}/_gpg")
+  })
+
   get("/:userName/_application")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
@@ -427,7 +451,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     redirect(s"/${userName}/_application")
   })
 
-  get("/:userName/_hooks")(oneselfOnly {
+  get("/:userName/_hooks")(managersOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       gitbucket.core.account.html.hooks(account, getAccountWebHooks(account.userName), flash.get("info"))
@@ -437,7 +461,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   /**
    * Display the account web hook edit page.
    */
-  get("/:userName/_hooks/new")(oneselfOnly {
+  get("/:userName/_hooks/new")(managersOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       val webhook = AccountWebHook(userName, "", WebHookContentType.FORM, None)
@@ -448,7 +472,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   /**
    * Add the account web hook URL.
    */
-  post("/:userName/_hooks/new", accountWebHookForm(false))(oneselfOnly { form =>
+  post("/:userName/_hooks/new", accountWebHookForm(false))(managersOnly { form =>
     val userName = params("userName")
     addAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
     flash += "info" -> s"Webhook ${form.url} created"
@@ -458,7 +482,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   /**
    * Delete the account web hook URL.
    */
-  get("/:userName/_hooks/delete")(oneselfOnly {
+  get("/:userName/_hooks/delete")(managersOnly {
     val userName = params("userName")
     deleteAccountWebHook(userName, params("url"))
     flash += "info" -> s"Webhook ${params("url")} deleted"
@@ -468,7 +492,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   /**
    * Display the account web hook edit page.
    */
-  get("/:userName/_hooks/edit")(oneselfOnly {
+  get("/:userName/_hooks/edit")(managersOnly {
     val userName = params("userName")
     getAccountByUserName(userName).flatMap { account =>
       getAccountWebHook(userName, params("url")).map {
@@ -481,7 +505,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   /**
    * Update account web hook settings.
    */
-  post("/:userName/_hooks/edit", accountWebHookForm(true))(oneselfOnly { form =>
+  post("/:userName/_hooks/edit", accountWebHookForm(true))(managersOnly { form =>
     val userName = params("userName")
     updateAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
     flash += "info" -> s"webhook ${form.url} updated"
@@ -491,7 +515,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   /**
    * Send the test request to registered account web hook URLs.
    */
-  ajaxPost("/:userName/_hooks/test")(oneselfOnly {
+  ajaxPost("/:userName/_hooks/test")(managersOnly {
     // TODO Is it possible to merge with [[RepositorySettingsController.ajaxPost]]?
     import scala.concurrent.duration._
     import scala.concurrent._
@@ -777,6 +801,20 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       }
   }
 
+  private def validGpgPublicKey: Constraint = new Constraint() {
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      GpgUtil.str2GpgKeyId(value) match {
+        case Some(s) if GpgUtil.getGpgKey(s).isEmpty =>
+          None
+        case Some(_) =>
+          Some("GPG key is duplicated.")
+        case None =>
+          Some("GPG key is invalid.")
+      }
+    }
+
+  }
+
   private def validAccountName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       getAccountByUserName(value) match {

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

@@ -1,29 +1,28 @@
 package gitbucket.core.controller
 
 import gitbucket.core.api._
-import gitbucket.core.model._
-import gitbucket.core.service.IssuesService.IssueSearchCondition
-import gitbucket.core.service.PullRequestService._
+import gitbucket.core.controller.api._
 import gitbucket.core.service._
-import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.JGitUtil._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
 import gitbucket.core.plugin.PluginRegistry
-import gitbucket.core.servlet.Database
-import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.revwalk.RevWalk
-import org.scalatra.{Created, NoContent, UnprocessableEntity}
-
-import scala.collection.JavaConverters._
-import scala.concurrent.Await
-import scala.concurrent.duration.Duration
 
 class ApiController
     extends ApiControllerBase
+    with ApiGitReferenceControllerBase
+    with ApiIssueCommentControllerBase
+    with ApiIssueControllerBase
+    with ApiIssueLabelControllerBase
+    with ApiOrganizationControllerBase
+    with ApiPullRequestControllerBase
+    with ApiReleaseControllerBase
+    with ApiRepositoryBranchControllerBase
+    with ApiRepositoryCollaboratorControllerBase
+    with ApiRepositoryCommitControllerBase
+    with ApiRepositoryContentsControllerBase
+    with ApiRepositoryControllerBase
+    with ApiRepositoryStatusControllerBase
+    with ApiUserControllerBase
     with RepositoryService
     with AccountService
     with ProtectedBranchService
@@ -33,15 +32,20 @@ class ApiController
     with PullRequestService
     with CommitsService
     with CommitStatusService
+    with ReleaseService
     with RepositoryCreationService
+    with RepositoryCommitFileService
     with IssueCreationService
     with HandleCommentService
+    with MergeService
     with WebHookService
     with WebHookPullRequestService
     with WebHookIssueCommentService
+    with WebHookPullRequestReviewCommentService
     with WikiService
     with ActivityService
     with PrioritiesService
+    with AdminAuthenticator
     with OwnerAuthenticator
     with UsersAuthenticator
     with GroupManagerAuthenticator
@@ -50,25 +54,6 @@ class ApiController
     with WritableUsersAuthenticator
 
 trait ApiControllerBase extends ControllerBase {
-  self: RepositoryService
-    with AccountService
-    with ProtectedBranchService
-    with IssuesService
-    with LabelsService
-    with MilestonesService
-    with PullRequestService
-    with CommitsService
-    with CommitStatusService
-    with RepositoryCreationService
-    with IssueCreationService
-    with HandleCommentService
-    with PrioritiesService
-    with OwnerAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /**
    * 404 for non-implemented api
@@ -76,6 +61,18 @@ trait ApiControllerBase extends ControllerBase {
   get("/api/v3/*") {
     NotFound()
   }
+  post("/api/v3/*") {
+    NotFound()
+  }
+  put("/api/v3/*") {
+    NotFound()
+  }
+  delete("/api/v3/*") {
+    NotFound()
+  }
+  patch("/api/v3/*") {
+    NotFound()
+  }
 
   /**
    * https://developer.github.com/v3/#root-endpoint
@@ -84,318 +81,6 @@ trait ApiControllerBase extends ControllerBase {
     JsonFormat(ApiEndPoint())
   }
 
-  /**
-   * https://developer.github.com/v3/orgs/#get-an-organization
-   */
-  get("/api/v3/orgs/:groupName") {
-    getAccountByUserName(params("groupName")).filter(account => account.isGroupAccount).map { account =>
-      JsonFormat(ApiUser(account))
-    } getOrElse NotFound()
-  }
-
-  /**
-   * 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")).map { account =>
-      JsonFormat(ApiUser(account))
-    } getOrElse NotFound()
-  }
-
-  /**
-   * https://developer.github.com/v3/repos/#list-organization-repositories
-   */
-  get("/api/v3/orgs/:orgName/repos") {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("orgName"))).map { r =>
-      ApiRepository(r, getAccountByUserName(r.owner).get)
-    })
-  }
-
-  /**
-   * https://developer.github.com/v3/repos/#list-user-repositories
-   */
-  get("/api/v3/users/:userName/repos") {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("userName"))).map { r =>
-      ApiRepository(r, getAccountByUserName(r.owner).get)
-    })
-  }
-
-  /*
-   * https://developer.github.com/v3/repos/branches/#list-branches
-   */
-  get("/api/v3/repos/:owner/:repository/branches")(referrersOnly { repository =>
-    JsonFormat(
-      JGitUtil
-        .getBranches(
-          owner = repository.owner,
-          name = repository.name,
-          defaultBranch = repository.repository.defaultBranch,
-          origin = repository.repository.originUserName.isEmpty
-        )
-        .map { br =>
-          ApiBranchForList(br.name, ApiBranchCommit(br.commitId))
-        }
-    )
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/branches/#get-branch
-   */
-  get("/api/v3/repos/:owner/:repository/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
-   */
-  get("/api/v3/repos/:owner/:repository/contents")(referrersOnly { repository =>
-    getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch))
-  })
-
-  /*
-   * https://developer.github.com/v3/repos/contents/#get-contents
-   */
-  get("/api/v3/repos/:owner/:repository/contents/*")(referrersOnly { repository =>
-    getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
-  })
-
-  private def getContents(repository: RepositoryService.RepositoryInfo, path: String, refStr: String) = {
-    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
-      val (dirName, fileName) = pathStr.lastIndexOf('/') match {
-        case -1 =>
-          (".", pathStr)
-        case n =>
-          (pathStr.take(n), pathStr.drop(n + 1))
-      }
-      getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
-    }
-
-    using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
-      val fileList = getFileList(git, refStr, path)
-      if (fileList.isEmpty) { // file or NotFound
-        getFileInfo(git, refStr, path)
-          .flatMap { f =>
-            val largeFile = params.get("large_file").exists(s => s.equals("true"))
-            val content = getContentFromId(git, f.id, largeFile)
-            request.getHeader("Accept") match {
-              case "application/vnd.github.v3.raw" => {
-                contentType = "application/vnd.github.v3.raw"
-                content
-              }
-              case "application/vnd.github.v3.html" if isRenderable(f.name) => {
-                contentType = "application/vnd.github.v3.html"
-                content.map { c =>
-                  List(
-                    "<div data-path=\"",
-                    path,
-                    "\" id=\"file\">",
-                    "<article>",
-                    renderMarkup(path.split("/").toList, new String(c), refStr, repository, false, false, true).body,
-                    "</article>",
-                    "</div>"
-                  ).mkString
-                }
-              }
-              case "application/vnd.github.v3.html" => {
-                contentType = "application/vnd.github.v3.html"
-                content.map { c =>
-                  List(
-                    "<div data-path=\"",
-                    path,
-                    "\" id=\"file\">",
-                    "<div class=\"plain\">",
-                    "<pre>",
-                    play.twirl.api.HtmlFormat.escape(new String(c)).body,
-                    "</pre>",
-                    "</div>",
-                    "</div>"
-                  ).mkString
-                }
-              }
-              case _ =>
-                Some(JsonFormat(ApiContents(f, RepositoryName(repository), content)))
-            }
-          }
-          .getOrElse(NotFound())
-
-      } else { // directory
-        JsonFormat(fileList.map { f =>
-          ApiContents(f, RepositoryName(repository), None)
-        })
-      }
-    }
-  }
-
-  /*
-   * https://developer.github.com/v3/git/refs/#get-a-reference
-   */
-  get("/api/v3/repos/:owner/:repository/git/refs/*")(referrersOnly { repository =>
-    val revstr = multiParams("splat").head
-    using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
-      val ref = git.getRepository().findRef(revstr)
-
-      if (ref != null) {
-        val sha = ref.getObjectId().name()
-        JsonFormat(ApiRef(revstr, ApiObject(sha)))
-
-      } else {
-        val refs = git
-          .getRepository()
-          .getRefDatabase()
-          .getRefsByPrefix("refs/")
-          .asScala
-
-        JsonFormat(refs.map { ref =>
-          val sha = ref.getObjectId().name()
-          ApiRef(revstr, ApiObject(sha))
-        })
-      }
-    }
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/collaborators/#list-collaborators
-   */
-  get("/api/v3/repos/:owner/:repository/collaborators")(referrersOnly { repository =>
-    // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
-    JsonFormat(
-      getCollaboratorUserNames(params("owner"), params("repository")).map(u => ApiUser(getAccountByUserName(u).get))
-    )
-  })
-
-  /**
-   * https://developer.github.com/v3/users/#get-the-authenticated-user
-   */
-  get("/api/v3/user") {
-    context.loginAccount.map { account =>
-      JsonFormat(ApiUser(account))
-    } getOrElse Unauthorized()
-  }
-
-  /**
-   * List user's own repository
-   * https://developer.github.com/v3/repos/#list-your-repositories
-   */
-  get("/api/v3/user/repos")(usersOnly {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map { r =>
-      ApiRepository(r, getAccountByUserName(r.owner).get)
-    })
-  })
-
-  /**
-   * Create user repository
-   * https://developer.github.com/v3/repos/#create
-   */
-  post("/api/v3/user/repos")(usersOnly {
-    val owner = context.loginAccount.get.userName
-    (for {
-      data <- extractFromJsonBody[CreateARepository] if data.isValid
-    } yield {
-      LockUtil.lock(s"${owner}/${data.name}") {
-        if (getRepository(owner, data.name).isEmpty) {
-          val f = createRepository(
-            context.loginAccount.get,
-            owner,
-            data.name,
-            data.description,
-            data.`private`,
-            data.auto_init
-          )
-          Await.result(f, Duration.Inf)
-
-          val repository = Database() withTransaction { session =>
-            getRepository(owner, data.name)(session).get
-          }
-          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
-        } else {
-          ApiError(
-            "A repository with this name already exists on this account",
-            Some("https://developer.github.com/v3/repos/#create")
-          )
-        }
-      }
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * Create group repository
-   * https://developer.github.com/v3/repos/#create
-   */
-  post("/api/v3/orgs/:org/repos")(managersOnly {
-    val groupName = params("org")
-    (for {
-      data <- extractFromJsonBody[CreateARepository] if data.isValid
-    } yield {
-      LockUtil.lock(s"${groupName}/${data.name}") {
-        if (getRepository(groupName, data.name).isEmpty) {
-          val f = createRepository(
-            context.loginAccount.get,
-            groupName,
-            data.name,
-            data.description,
-            data.`private`,
-            data.auto_init
-          )
-          Await.result(f, Duration.Inf)
-          val repository = Database() withTransaction { session =>
-            getRepository(groupName, data.name).get
-          }
-          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
-        } else {
-          ApiError(
-            "A repository with this name already exists for this group",
-            Some("https://developer.github.com/v3/repos/#create")
-          )
-        }
-      }
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
-   */
-  patch("/api/v3/repos/:owner/:repository/branches/*")(ownerOnly { repository =>
-    import gitbucket.core.api._
-    (for {
-      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, ApiBranchCommit(br.commitId), protection)(RepositoryName(repository)))
-    }) getOrElse NotFound()
-  })
-
   /**
    * @see https://developer.github.com/v3/rate_limit/#get-your-current-rate-limit-status
    * but not enabled.
@@ -406,459 +91,6 @@ 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),
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-            .map(ApiLabel(_, RepositoryName(repository)))
-        )
-    })
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/#get-a-single-issue
-   */
-  get("/api/v3/repos/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      openedUser <- getAccountByUserName(issue.openedUserName)
-    } yield {
-      JsonFormat(
-        ApiIssue(
-          issue,
-          RepositoryName(repository),
-          ApiUser(openedUser),
-          getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository)))
-        )
-      )
-    }) 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),
-            getIssueLabels(repository.owner, repository.name, issue.issueId)
-              .map(ApiLabel(_, RepositoryName(repository)))
-          )
-        )
-      }) 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)
-    } yield {
-      JsonFormat(comments.map {
-        case (issueComment, user, issue) =>
-          ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest)
-      })
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/comments/#create-a-comment
-   */
-  post("/api/v3/repos/:owner/:repository/issues/:id/comments")(readableUsersOnly { repository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      body <- extractFromJsonBody[CreateAComment].map(_.body) if !body.isEmpty
-      action = params.get("action").filter(_ => isEditable(issue.userName, issue.repositoryName, issue.openedUserName))
-      (issue, id) <- handleComment(issue, Some(body), repository, action)
-      issueComment <- getComment(repository.owner, repository.name, id.toString())
-    } yield {
-      JsonFormat(
-        ApiComment(
-          issueComment,
-          RepositoryName(repository),
-          issueId,
-          ApiUser(context.loginAccount.get),
-          issue.isPullRequest
-        )
-      )
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * List all labels for this repository
-   * https://developer.github.com/v3/issues/labels/#list-all-labels-for-this-repository
-   */
-  get("/api/v3/repos/:owner/:repository/labels")(referrersOnly { repository =>
-    JsonFormat(getLabels(repository.owner, repository.name).map { label =>
-      ApiLabel(label, RepositoryName(repository))
-    })
-  })
-
-  /**
-   * Get a single label
-   * https://developer.github.com/v3/issues/labels/#get-a-single-label
-   */
-  get("/api/v3/repos/:owner/:repository/labels/:labelName")(referrersOnly { repository =>
-    getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-      JsonFormat(ApiLabel(label, RepositoryName(repository)))
-    } getOrElse NotFound()
-  })
-
-  /**
-   * Create a label
-   * https://developer.github.com/v3/issues/labels/#create-a-label
-   */
-  post("/api/v3/repos/:owner/:repository/labels")(writableUsersOnly { repository =>
-    (for {
-      data <- extractFromJsonBody[CreateALabel] if data.isValid
-    } yield {
-      LockUtil.lock(RepositoryName(repository).fullName) {
-        if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
-          val labelId = createLabel(repository.owner, repository.name, data.name, data.color)
-          getLabel(repository.owner, repository.name, labelId).map { label =>
-            Created(JsonFormat(ApiLabel(label, RepositoryName(repository))))
-          } getOrElse NotFound()
-        } else {
-          // TODO ApiError should support errors field to enhance compatibility of GitHub API
-          UnprocessableEntity(
-            ApiError(
-              "Validation Failed",
-              Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-            )
-          )
-        }
-      }
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * Update a label
-   * https://developer.github.com/v3/issues/labels/#update-a-label
-   */
-  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
-    (for {
-      data <- extractFromJsonBody[CreateALabel] if data.isValid
-    } yield {
-      LockUtil.lock(RepositoryName(repository).fullName) {
-        getLabel(repository.owner, repository.name, params("labelName")).map {
-          label =>
-            if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
-              updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
-              JsonFormat(
-                ApiLabel(
-                  getLabel(repository.owner, repository.name, label.labelId).get,
-                  RepositoryName(repository)
-                )
-              )
-            } else {
-              // TODO ApiError should support errors field to enhance compatibility of GitHub API
-              UnprocessableEntity(
-                ApiError(
-                  "Validation Failed",
-                  Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-                )
-              )
-            }
-        } getOrElse NotFound()
-      }
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * Delete a label
-   * https://developer.github.com/v3/issues/labels/#delete-a-label
-   */
-  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
-    LockUtil.lock(RepositoryName(repository).fullName) {
-      getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-        deleteLabel(repository.owner, repository.name, label.labelId)
-        NoContent()
-      } getOrElse NotFound()
-    }
-  })
-
-  /**
-   * https://developer.github.com/v3/pulls/#list-pull-requests
-   */
-  get("/api/v3/repos/:owner/:repository/pulls")(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, Int, PullRequest, Repository, Account, Option[Account])] =
-      searchPullRequestByApi(
-        condition = condition,
-        offset = (page - 1) * PullRequestLimit,
-        limit = PullRequestLimit,
-        repos = repository.owner -> repository.name
-      )
-
-    JsonFormat(issues.map {
-      case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
-        ApiPullRequest(
-          issue = issue,
-          pullRequest = pullRequest,
-          headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
-          baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
-          user = ApiUser(issueUser),
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-            .map(ApiLabel(_, RepositoryName(repository))),
-          assignee = assignee.map(ApiUser.apply),
-          mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-        )
-    })
-  })
-
-  /**
-   * https://developer.github.com/v3/pulls/#get-a-single-pull-request
-   */
-  get("/api/v3/repos/:owner/:repository/pulls/:id")(referrersOnly { repository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
-      users = getAccountsByUserNames(
-        Set(repository.owner, pullRequest.requestUserName, issue.openedUserName),
-        Set.empty
-      )
-      baseOwner <- users.get(repository.owner)
-      headOwner <- users.get(pullRequest.requestUserName)
-      issueUser <- users.get(issue.openedUserName)
-      assignee = issue.assignedUserName.flatMap { userName =>
-        getAccountByUserName(userName, false)
-      }
-      headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
-    } yield {
-      JsonFormat(
-        ApiPullRequest(
-          issue = issue,
-          pullRequest = pullRequest,
-          headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
-          baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
-          user = ApiUser(issueUser),
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-            .map(ApiLabel(_, RepositoryName(repository))),
-          assignee = assignee.map(ApiUser.apply),
-          mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-        )
-      )
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
-   */
-  get("/api/v3/repos/:owner/:repository/pulls/:id/commits")(referrersOnly { repository =>
-    val owner = repository.owner
-    val name = repository.name
-    params("id").toIntOpt.flatMap {
-      issueId =>
-        getPullRequest(owner, name, issueId) map {
-          case (issue, pullreq) =>
-            using(Git.open(getRepositoryDir(owner, name))) { git =>
-              val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
-              val newId = git.getRepository.resolve(pullreq.commitIdTo)
-              val repoFullName = RepositoryName(repository)
-              val commits = git.log
-                .addRange(oldId, newId)
-                .call
-                .iterator
-                .asScala
-                .map { c =>
-                  ApiCommitListItem(new CommitInfo(c), repoFullName)
-                }
-                .toList
-              JsonFormat(commits)
-            }
-        }
-    } getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/#get
-   */
-  get("/api/v3/repos/:owner/:repository")(referrersOnly { repository =>
-    JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(repository.owner).get)))
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/statuses/#create-a-status
-   */
-  post("/api/v3/repos/:owner/:repository/statuses/:sha")(writableUsersOnly { repository =>
-    (for {
-      ref <- params.get("sha")
-      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
-      data <- extractFromJsonBody[CreateAStatus] if data.isValid
-      creator <- context.loginAccount
-      state <- CommitState.valueOf(data.state)
-      statusId = createCommitStatus(
-        repository.owner,
-        repository.name,
-        sha,
-        data.context.getOrElse("default"),
-        state,
-        data.target_url,
-        data.description,
-        new java.util.Date(),
-        creator
-      )
-      status <- getCommitStatus(repository.owner, repository.name, statusId)
-    } yield {
-      JsonFormat(ApiCommitStatus(status, ApiUser(creator)))
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
-   *
-   * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
-   */
-  val listStatusesRoute = get("/api/v3/repos/:owner/:repository/commits/:ref/statuses")(referrersOnly { repository =>
-    (for {
-      ref <- params.get("ref")
-      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
-    } yield {
-      JsonFormat(getCommitStatuesWithCreator(repository.owner, repository.name, sha).map {
-        case (status, creator) =>
-          ApiCommitStatus(status, ApiUser(creator))
-      })
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
-   *
-   * legacy route
-   */
-  get("/api/v3/repos/:owner/:repository/statuses/:ref") {
-    listStatusesRoute.action()
-  }
-
-  /**
-   * https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
-   *
-   * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
-   */
-  get("/api/v3/repos/:owner/:repository/commits/:ref/status")(referrersOnly { repository =>
-    (for {
-      ref <- params.get("ref")
-      owner <- getAccountByUserName(repository.owner)
-      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
-    } yield {
-      val statuses = getCommitStatuesWithCreator(repository.owner, repository.name, sha)
-      JsonFormat(ApiCombinedCommitStatus(sha, statuses, ApiRepository(repository, owner)))
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/commits/#get-a-single-commit
-   */
-  get("/api/v3/repos/:owner/:repository/commits/:sha")(referrersOnly { repository =>
-    val owner = repository.owner
-    val name = repository.name
-    val sha = params("sha")
-
-    using(Git.open(getRepositoryDir(owner, name))) {
-      git =>
-        val repo = git.getRepository
-        val objectId = repo.resolve(sha)
-        val commitInfo = using(new RevWalk(repo)) { revWalk =>
-          new CommitInfo(revWalk.parseCommit(objectId))
-        }
-
-        JsonFormat(
-          ApiCommits(
-            repositoryName = RepositoryName(repository),
-            commitInfo = commitInfo,
-            diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
-            author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
-            committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
-            commentCount = getCommitComment(repository.owner, repository.name, sha).size
-          )
-        )
-    }
-  })
-
-  private def getAccount(userName: String, email: String): Account = {
-    getAccountByMailAddress(email).getOrElse {
-      Account(
-        userName = userName,
-        fullName = userName,
-        mailAddress = email,
-        password = "xxx",
-        isAdmin = false,
-        url = None,
-        registeredDate = new java.util.Date(),
-        updatedDate = new java.util.Date(),
-        lastLoginDate = None,
-        image = None,
-        isGroupAccount = false,
-        isRemoved = true,
-        description = None
-      )
-    }
-  }
-
-  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/:repository/raw/*")(referrersOnly { repository =>
-    val (id, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      getPathObjectId(git, path, revCommit).map { objectId =>
-        responseRawFile(git, objectId, path, repository)
-      } getOrElse NotFound()
-    }
-  })
-
   /**
    * non-GitHub compatible API for listing plugins
    */

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

@@ -9,12 +9,17 @@ import gitbucket.core.service.IssuesService._
 class DashboardController
     extends DashboardControllerBase
     with IssuesService
+    with MergeService
     with PullRequestService
     with RepositoryService
     with AccountService
+    with ActivityService
     with CommitsService
     with LabelsService
     with PrioritiesService
+    with WebHookService
+    with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
     with MilestonesService
     with UsersAuthenticator
 

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

@@ -10,6 +10,7 @@ import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
+import gitbucket.core.view.helpers._
 import org.scalatra.Ok
 import org.scalatra.forms._
 
@@ -206,7 +207,8 @@ trait IndexControllerBase extends ControllerBase {
             }
             .map { t =>
               Map(
-                "label" -> s"<b>@${StringUtil.escapeHtml(t.userName)}</b> ${StringUtil.escapeHtml(t.fullName)}",
+                "label" -> s"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(t.userName)}</b> ${StringUtil
+                  .escapeHtml(t.fullName)}",
                 "value" -> t.userName
               )
             }

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

@@ -24,8 +24,10 @@ class IssuesController
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
+    with MergeService
     with PullRequestService
     with WebHookIssueCommentService
+    with WebHookPullRequestReviewCommentService
     with CommitsService
     with PrioritiesService
 
@@ -256,6 +258,7 @@ trait IssuesControllerBase extends ControllerBase {
                 "content" -> Markdown.toHtml(
                   markdown = x.content getOrElse "No description given.",
                   repository = repository,
+                  branch = repository.repository.defaultBranch,
                   enableWikiLink = false,
                   enableRefsLink = true,
                   enableAnchor = true,
@@ -283,6 +286,7 @@ trait IssuesControllerBase extends ControllerBase {
                 "content" -> view.Markdown.toHtml(
                   markdown = x.content,
                   repository = repository,
+                  branch = repository.repository.defaultBranch,
                   enableWikiLink = false,
                   enableRefsLink = true,
                   enableAnchor = true,

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

@@ -1,5 +1,6 @@
 package gitbucket.core.controller
 
+import gitbucket.core.plugin.PluginRegistry
 import org.scalatra.MovedPermanently
 
 class PreProcessController extends PreProcessControllerBase
@@ -30,7 +31,10 @@ trait PreProcessControllerBase extends ControllerBase {
    */
   get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
     if (!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
-        !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs")) {
+        !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs") &&
+        !PluginRegistry().getAnonymousAccessiblePaths().exists { path =>
+          context.currentPath.startsWith(path)
+        }) {
       Unauthorized()
     } else {
       pass()

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

@@ -15,7 +15,7 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import org.scalatra.forms._
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.lib.PersonIdent
+import org.eclipse.jgit.lib.{ObjectId, PersonIdent}
 import org.eclipse.jgit.revwalk.RevWalk
 import org.scalatra.BadRequest
 
@@ -32,6 +32,7 @@ class PullRequestsController
     with CommitsService
     with ActivityService
     with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
@@ -294,11 +295,12 @@ trait PullRequestsControllerBase extends ControllerBase {
       issueId <- params("id").toIntOpt
       loginAccount <- context.loginAccount
       (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
+      repository <- getRepository(pullreq.requestUserName, pullreq.requestRepositoryName)
+      remoteRepository <- getRepository(pullreq.userName, pullreq.repositoryName)
       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.needStatusCheck(loginAccount.userName)) {
         flash += "error" -> s"branch ${pullreq.requestBranch} is protected need status check."
@@ -314,83 +316,19 @@ trait PullRequestsControllerBase extends ControllerBase {
             JGitUtil.getAllCommitIds(git)
           }.toSet
           pullRemote(
-            owner,
-            name,
+            repository,
             pullreq.requestBranch,
-            pullreq.userName,
-            pullreq.repositoryName,
+            remoteRepository,
             pullreq.branch,
             loginAccount,
-            s"Merge branch '${alias}' into ${pullreq.requestBranch}"
+            s"Merge branch '${alias}' into ${pullreq.requestBranch}",
+            Some(pullreq)
           ) match {
             case None => // conflict
               flash += "error" -> s"Can't automatic merging branch '${alias}' into ${pullreq.requestBranch}."
             case Some(oldId) =>
               // update pull request
-              updatePullRequests(owner, name, pullreq.requestBranch)
-
-              using(Git.open(Directory.getRepositoryDir(owner, name))) {
-                git =>
-                  //  after update branch
-                  val newCommitId = git.getRepository.resolve(s"refs/heads/${pullreq.requestBranch}")
-                  val commits = git.log
-                    .addRange(oldId, newCommitId)
-                    .call
-                    .iterator
-                    .asScala
-                    .map(c => new JGitUtil.CommitInfo(c))
-                    .toList
-
-                  commits.foreach { commit =>
-                    if (!existIds.contains(commit.id)) {
-                      createIssueComment(owner, name, commit)
-                    }
-                  }
-
-                  // record activity
-                  recordPushActivity(owner, name, loginAccount.userName, pullreq.branch, commits)
-
-                  // close issue by commit message
-                  if (pullreq.requestBranch == repository.repository.defaultBranch) {
-                    commits.foreach { commit =>
-                      closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
-                        issueId =>
-                          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                            callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
-                            PluginRegistry().getIssueHooks
-                              .foreach(
-                                _.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount)
-                              )
-                          }
-                      }
-                    }
-                  }
-
-                  // call web hook
-                  callPullRequestWebHookByRequestBranch(
-                    "synchronize",
-                    repository,
-                    pullreq.requestBranch,
-                    baseUrl,
-                    loginAccount
-                  )
-                  callWebHookOf(owner, name, WebHook.Push) {
-                    for {
-                      ownerAccount <- getAccountByUserName(owner)
-                    } yield {
-                      WebHookService.WebHookPushPayload(
-                        git,
-                        loginAccount,
-                        pullreq.requestBranch,
-                        repository,
-                        commits,
-                        ownerAccount,
-                        oldId = oldId,
-                        newId = newCommitId
-                      )
-                    }
-                  }
-              }
+              updatePullRequests(owner, name, pullreq.requestBranch, loginAccount, "synchronize")
               flash += "info" -> s"Merge branch '${alias}' into ${pullreq.requestBranch}"
           }
         }
@@ -401,119 +339,14 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/pull/:id/merge", mergeForm)(writableUsersOnly { (form, repository) =>
-    params("id").toIntOpt.flatMap {
-      issueId =>
-        val owner = repository.owner
-        val name = repository.name
-        if (repository.repository.options.mergeOptions.split(",").contains(form.strategy)) {
-          LockUtil.lock(s"${owner}/${name}") {
-            getPullRequest(owner, name, issueId).map {
-              case (issue, pullreq) =>
-                using(Git.open(getRepositoryDir(owner, name))) {
-                  git =>
-                    // mark issue as merged and close.
-                    val loginAccount = context.loginAccount.get
-                    val commentId = createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
-                    createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
-                    updateClosed(owner, name, issueId, true)
+    params("id").toIntOpt.flatMap { issueId =>
+      val owner = repository.owner
+      val name = repository.name
 
-                    // record activity
-                    recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
-
-                    val (commits, _) = getRequestCompareInfo(
-                      owner,
-                      name,
-                      pullreq.commitIdFrom,
-                      pullreq.requestUserName,
-                      pullreq.requestRepositoryName,
-                      pullreq.commitIdTo
-                    )
-
-                    val revCommits = using(new RevWalk(git.getRepository)) { revWalk =>
-                      commits.flatten.map { commit =>
-                        revWalk.parseCommit(git.getRepository.resolve(commit.id))
-                      }
-                    }.reverse
-
-                    // merge git repository
-                    form.strategy match {
-                      case "merge-commit" =>
-                        mergePullRequest(
-                          git,
-                          pullreq.branch,
-                          issueId,
-                          s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" + form.message,
-                          new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
-                        )
-                      case "rebase" =>
-                        rebasePullRequest(
-                          git,
-                          pullreq.branch,
-                          issueId,
-                          revCommits,
-                          new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
-                        )
-                      case "squash" =>
-                        squashPullRequest(
-                          git,
-                          pullreq.branch,
-                          issueId,
-                          s"${issue.title} (#${issueId})\n\n" + form.message,
-                          new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
-                        )
-                    }
-
-                    // close issue by content of pull request
-                    val defaultBranch = getRepository(owner, name).get.repository.defaultBranch
-                    if (pullreq.branch == defaultBranch) {
-                      commits.flatten.foreach { commit =>
-                        closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
-                          issueId =>
-                            getIssue(owner, name, issueId.toString).foreach { issue =>
-                              callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
-                              PluginRegistry().getIssueHooks
-                                .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
-                            }
-                        }
-                      }
-                      val issueContent = issue.title + " " + issue.content.getOrElse("")
-                      closeIssuesFromMessage(
-                        issueContent,
-                        loginAccount.userName,
-                        owner,
-                        name
-                      ).foreach { issueId =>
-                        getIssue(owner, name, issueId.toString).foreach { issue =>
-                          callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
-                          PluginRegistry().getIssueHooks
-                            .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
-                        }
-                      }
-                      closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId =>
-                        getIssue(owner, name, issueId.toString).foreach { issue =>
-                          callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
-                          PluginRegistry().getIssueHooks
-                            .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
-                        }
-                      }
-                    }
-
-                    updatePullRequests(owner, name, pullreq.branch)
-
-                    // call web hook
-                    callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
-
-                    // call hooks
-                    PluginRegistry().getPullRequestHooks.foreach { h =>
-                      h.addedComment(commentId, form.message, issue, repository)
-                      h.merged(issue, repository)
-                    }
-
-                    redirect(s"/${owner}/${name}/pull/${issueId}")
-                }
-            }
-          }
-        } else Some(BadRequest())
+      mergePullRequest(repository, issueId, context.loginAccount.get, form.message, form.strategy) match {
+        case Right(objectId) => redirect(s"/${owner}/${name}/pull/${issueId}")
+        case Left(message)   => Some(BadRequest())
+      }
     } getOrElse NotFound()
   })
 
@@ -579,97 +412,68 @@ trait PullRequestsControllerBase extends ControllerBase {
               .map(_.repository.repositoryName)
           };
           originRepository <- getRepository(originOwner, originRepositoryName)) yield {
-      using(
-        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
-        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
-      ) {
-        case (oldGit, newGit) =>
-          val (oldId, newId) =
-            if (originRepository.branchList.contains(originId)) {
-              val forkedId2 =
-                forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
+      val (oldId, newId) =
+        getPullRequestCommitFromTo(originRepository, forkedRepository, originId, forkedId)
 
-              val originId2 = JGitUtil.getForkedCommitId(
-                oldGit,
-                newGit,
-                originRepository.owner,
-                originRepository.name,
-                originId,
-                forkedRepository.owner,
-                forkedRepository.name,
-                forkedId2
-              )
+      (oldId, newId) match {
+        case (Some(oldId), Some(newId)) => {
+          val (commits, diffs) = getRequestCompareInfo(
+            originRepository.owner,
+            originRepository.name,
+            oldId.getName,
+            forkedRepository.owner,
+            forkedRepository.name,
+            newId.getName
+          )
 
-              (Option(oldGit.getRepository.resolve(originId2)), Option(newGit.getRepository.resolve(forkedId2)))
-
-            } else {
-              val originId2 =
-                originRepository.tags.collectFirst { case x if x.name == originId => x.id }.getOrElse(originId)
-              val forkedId2 =
-                forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
-
-              (Option(oldGit.getRepository.resolve(originId2)), Option(newGit.getRepository.resolve(forkedId2)))
-            }
-
-          (oldId, newId) match {
-            case (Some(oldId), Some(newId)) => {
-              val (commits, diffs) = getRequestCompareInfo(
-                originRepository.owner,
-                originRepository.name,
-                oldId.getName,
-                forkedRepository.owner,
-                forkedRepository.name,
-                newId.getName
-              )
-
-              val title = if (commits.flatten.length == 1) {
-                commits.flatten.head.shortMessage
-              } else {
-                val text = forkedId.replaceAll("[\\-_]", " ")
-                text.substring(0, 1).toUpperCase + text.substring(1)
-              }
-
-              html.compare(
-                title,
-                commits,
-                diffs,
-                ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
-                  case (Some(userName), Some(repositoryName)) =>
-                    getRepository(userName, repositoryName) match {
-                      case Some(x) => x.repository :: getForkedRepositories(userName, repositoryName)
-                      case None    => getForkedRepositories(userName, repositoryName)
-                    }
-                  case _ =>
-                    forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-                }).map { repository =>
-                  (repository.userName, repository.repositoryName, repository.defaultBranch)
-                },
-                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)
-              )
-            }
-            case (oldId, newId) =>
-              redirect(
-                s"/${forkedRepository.owner}/${forkedRepository.name}/compare/" +
-                  s"${originOwner}:${oldId.map(_ => originId).getOrElse(originRepository.repository.defaultBranch)}..." +
-                  s"${forkedOwner}:${newId.map(_ => forkedId).getOrElse(forkedRepository.repository.defaultBranch)}"
-              )
+          val title = if (commits.flatten.length == 1) {
+            commits.flatten.head.shortMessage
+          } else {
+            val text = forkedId.replaceAll("[\\-_]", " ")
+            text.substring(0, 1).toUpperCase + text.substring(1)
           }
+
+          html.compare(
+            title,
+            commits,
+            diffs,
+            ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+              case (Some(userName), Some(repositoryName)) =>
+                getRepository(userName, repositoryName) match {
+                  case Some(x) => x.repository :: getForkedRepositories(userName, repositoryName)
+                  case None    => getForkedRepositories(userName, repositoryName)
+                }
+              case _ =>
+                forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+            }).map { repository =>
+              (repository.userName, repository.repositoryName, repository.defaultBranch)
+            },
+            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)
+          )
+        }
+        case (oldId, newId) =>
+          redirect(
+            s"/${forkedRepository.owner}/${forkedRepository.name}/compare/" +
+              s"${originOwner}:${oldId.map(_ => originId).getOrElse(originRepository.repository.defaultBranch)}..." +
+              s"${forkedOwner}:${newId.map(_ => forkedId).getOrElse(forkedRepository.repository.defaultBranch)}"
+          )
+
       }
     }) getOrElse NotFound()
   })
@@ -730,15 +534,15 @@ trait PullRequestsControllerBase extends ControllerBase {
         )
 
         createPullRequest(
-          originUserName = repository.owner,
-          originRepositoryName = repository.name,
+          originRepository = repository,
           issueId = issueId,
           originBranch = form.targetBranch,
           requestUserName = form.requestUserName,
           requestRepositoryName = form.requestRepositoryName,
           requestBranch = form.requestBranch,
           commitIdFrom = form.commitIdFrom,
-          commitIdTo = form.commitIdTo
+          commitIdTo = form.commitIdTo,
+          loginAccount = context.loginAccount.get
         )
 
         // insert labels
@@ -753,29 +557,6 @@ trait PullRequestsControllerBase extends ControllerBase {
           }
         }
 
-        // fetch requested branch
-        fetchAsPullRequest(owner, name, form.requestUserName, form.requestRepositoryName, form.requestBranch, issueId)
-
-        // record activity
-        recordPullRequestActivity(owner, name, loginUserName, issueId, form.title)
-
-        // call web hook
-        callPullRequestWebHook("opened", repository, issueId, context.baseUrl, context.loginAccount.get)
-
-        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 hooks
-          PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
-        }
-
         redirect(s"/${owner}/${name}/pull/${issueId}")
     }
   })
@@ -785,23 +566,26 @@ trait PullRequestsControllerBase extends ControllerBase {
     val mailAddresses =
       context.loginAccount.map(x => Seq(x.mailAddress) ++ getAccountExtraMailAddresses(x.userName)).getOrElse(Nil)
 
-    val branches = JGitUtil
-      .getBranches(
-        owner = repository.owner,
-        name = repository.name,
-        defaultBranch = repository.repository.defaultBranch,
-        origin = repository.repository.originUserName.isEmpty
-      )
-      .filter { x =>
-        x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0 &&
-        x.commitTime.getTime > thresholdTime &&
-        mailAddresses.contains(x.committerEmailAddress)
+    val branches =
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+        git =>
+          JGitUtil
+            .getBranches(
+              git = git,
+              defaultBranch = repository.repository.defaultBranch,
+              origin = repository.repository.originUserName.isEmpty
+            )
+            .filter { x =>
+              x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0 &&
+              x.commitTime.getTime > thresholdTime &&
+              mailAddresses.contains(x.committerEmailAddress)
+            }
+            .sortBy { br =>
+              (br.mergeInfo.isEmpty, br.commitTime)
+            }
+            .map(_.name)
+            .reverse
       }
-      .sortBy { br =>
-        (br.mergeInfo.isEmpty, br.commitTime)
-      }
-      .map(_.name)
-      .reverse
 
     val targetRepository = (for {
       parentUserName <- repository.repository.parentUserName
@@ -820,20 +604,6 @@ trait PullRequestsControllerBase extends ControllerBase {
     html.proposals(proposedBranches, targetRepository, repository)
   })
 
-  /**
-   * Parses branch identifier and extracts owner and branch name as tuple.
-   *
-   * - "owner:branch" to ("owner", "branch")
-   * - "branch" to ("defaultOwner", "branch")
-   */
-  private def parseCompareIdentifier(value: String, defaultOwner: String): (String, String) =
-    if (value.contains(':')) {
-      val array = value.split(":")
-      (array(0), array(1))
-    } else {
-      (defaultOwner, value)
-    }
-
   private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
     defining(repository.owner, repository.name) {
       case (owner, repoName) =>

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

@@ -3,13 +3,14 @@ package gitbucket.core.controller
 import java.io.File
 
 import gitbucket.core.service.{AccountService, ActivityService, ReleaseService, RepositoryService}
-import gitbucket.core.util.{FileUtil, ReadableUsersAuthenticator, ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.util._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import org.scalatra.forms._
 import gitbucket.core.releases.html
+import gitbucket.core.util.SyntaxSugars.using
 import org.apache.commons.io.FileUtils
-import scala.collection.JavaConverters._
+import org.eclipse.jgit.api.Git
 
 class ReleaseController
     extends ReleaseControllerBase
@@ -87,10 +88,12 @@ trait ReleaseControllerBase extends ControllerBase {
 
   get("/:owner/:repository/releases/:tag/create")(writableUsersOnly { repository =>
     val tagName = params("tag")
+    val previousTags = repository.tags.takeWhile(_.name != tagName).reverse
+
     repository.tags
       .find(_.name == tagName)
       .map { tag =>
-        html.form(repository, tag, None)
+        html.form(repository, tag, previousTags.map(_.name), tag.message, None)
       }
       .getOrElse(NotFound())
   })
@@ -118,19 +121,42 @@ trait ReleaseControllerBase extends ControllerBase {
         createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
     }
 
-    recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name)
+    recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
 
     redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
   })
 
+  get("/:owner/:repository/changelog/*...*")(writableUsersOnly { repository =>
+    val Seq(previousTag, currentTag) = multiParams("splat")
+    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")
+
+    val commitLog = using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
+      commits
+        .map { commit =>
+          s"- ${commit.shortMessage} ${commit.id}"
+        }
+        .mkString("\n")
+    }
+
+    commitLog
+  })
+
   get("/:owner/:repository/releases/:tag/edit")(writableUsersOnly { repository =>
     val tagName = params("tag")
+    val previousTags = repository.tags.takeWhile(_.name != tagName).reverse
 
     (for {
       release <- getRelease(repository.owner, repository.name, tagName)
       tag <- repository.tags.find(_.name == tagName)
     } yield {
-      html.form(repository, tag, Some(release, getReleaseAssets(repository.owner, repository.name, tagName)))
+      html.form(
+        repository,
+        tag,
+        previousTags.map(_.name),
+        release.content.getOrElse(""),
+        Some(release, getReleaseAssets(repository.owner, repository.name, tagName))
+      )
     }).getOrElse(NotFound())
   })
 

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

@@ -13,13 +13,11 @@ import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
 import org.scalatra.forms._
-import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 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
@@ -148,29 +146,6 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     if (repository.name != form.repositoryName) {
       // Update database
       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))
-        }
-      }
-      // Delete parent directory
-      FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
-
-      // 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")
@@ -392,31 +367,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
     // Change repository owner
     if (repository.owner != form.newOwner) {
-      LockUtil.lock(s"${repository.owner}/${repository.name}") {
-        // Update database
-        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 files directory
-        defining(getRepositoryFilesDir(repository.owner, repository.name)) { dir =>
-          if (dir.isDirectory) {
-            FileUtils.moveDirectory(dir, getRepositoryFilesDir(form.newOwner, repository.name))
-          }
-        }
-
-        // Call hooks
-        PluginRegistry().getRepositoryHooks.foreach(_.transferred(repository.owner, form.newOwner, repository.name))
-      }
+      renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
     }
     redirect(s"/${form.newOwner}/${repository.name}")
   })
@@ -425,19 +376,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Delete the repository.
    */
   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))
-      FileUtils.deleteDirectory(getRepositoryFilesDir(repository.owner, repository.name))
-
-      // Call hooks
-      PluginRegistry().getRepositoryHooks.foreach(_.deleted(repository.owner, repository.name))
-    }
-
+    // Delete the repository and related files
+    deleteRepository(repository.repository)
     redirect(s"/${repository.owner}")
   })
 
@@ -572,10 +512,10 @@ trait RepositorySettingsControllerBase extends ControllerBase {
 
   private def mergeOptions = new ValueType[Seq[String]] {
     override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = {
-      params.get("mergeOptions").getOrElse(Nil)
+      params.getOrElse("mergeOptions", Nil)
     }
     override def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = {
-      val mergeOptions = params.get("mergeOptions").getOrElse(Nil)
+      val mergeOptions = params.getOrElse("mergeOptions", Nil)
       if (mergeOptions.isEmpty) {
         Seq("mergeOptions" -> "At least one option must be enabled.")
       } else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) {

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

@@ -7,14 +7,14 @@ import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.repo.html
 import gitbucket.core.helper
 import gitbucket.core.service._
+import gitbucket.core.service.RepositoryCommitFileService.CommitFile
 import gitbucket.core.util._
-import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import gitbucket.core.model.{Account, CommitState, CommitStatus, WebHook}
-import gitbucket.core.service.WebHookService._
+import gitbucket.core.model.{Account, CommitState, CommitStatus}
+import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.view
 import gitbucket.core.view.helpers
 import org.apache.commons.compress.archivers.{ArchiveEntry, ArchiveOutputStream}
@@ -24,17 +24,16 @@ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream
 import org.apache.commons.compress.utils.IOUtils
-import org.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import org.ec4j.core.model.PropertyType
+import org.scalatra.forms._
 import org.eclipse.jgit.api.{ArchiveCommand, Git}
 import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
-import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib._
-import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
-import org.eclipse.jgit.treewalk.TreeWalk
+import org.eclipse.jgit.treewalk.{TreeWalk, WorkingTreeOptions}
+import org.eclipse.jgit.treewalk.TreeWalk.OperationType
 import org.eclipse.jgit.treewalk.filter.PathFilter
+import org.eclipse.jgit.util.io.EolStreamTypeUtil
 import org.json4s.jackson.Serialization
 import org.scalatra._
 import org.scalatra.i18n.Messages
@@ -42,6 +41,7 @@ import org.scalatra.i18n.Messages
 class RepositoryViewerController
     extends RepositoryViewerControllerBase
     with RepositoryService
+    with RepositoryCommitFileService
     with AccountService
     with ActivityService
     with IssuesService
@@ -53,6 +53,7 @@ class RepositoryViewerController
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
+    with MergeService
     with PullRequestService
     with CommitStatusService
     with WebHookPullRequestService
@@ -64,6 +65,7 @@ class RepositoryViewerController
  */
 trait RepositoryViewerControllerBase extends ControllerBase {
   self: RepositoryService
+    with RepositoryCommitFileService
     with AccountService
     with ActivityService
     with IssuesService
@@ -176,7 +178,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         helpers.renderMarkup(
           filePath = List(f),
           fileContent = params("content"),
-          branch = "master",
+          branch = repository.repository.defaultBranch,
           repository = repository,
           enableWikiLink = params("enableWikiLink").toBoolean,
           enableRefsLink = params("enableRefsLink").toBoolean,
@@ -186,6 +188,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         helpers.markdown(
           markdown = params("content"),
           repository = repository,
+          branch = repository.repository.defaultBranch,
           enableWikiLink = params("enableWikiLink").toBoolean,
           enableRefsLink = params("enableRefsLink").toBoolean,
           enableLineBreaks = params("enableLineBreaks").toBoolean,
@@ -271,9 +274,30 @@ trait RepositoryViewerControllerBase extends ControllerBase {
               if (path.isEmpty) Nil else path.split("/").toList,
               branchName,
               repository,
-              logs.splitWith { (commit1, commit2) =>
-                view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
-              },
+              logs
+                .map {
+                  c =>
+                    CommitInfo(
+                      id = c.id,
+                      shortMessage = c.shortMessage,
+                      fullMessage = c.fullMessage,
+                      parents = c.parents,
+                      authorTime = c.authorTime,
+                      authorName = c.authorName,
+                      authorEmailAddress = c.authorEmailAddress,
+                      commitTime = c.commitTime,
+                      committerName = c.committerName,
+                      committerEmailAddress = c.committerEmailAddress,
+                      commitSign = c.commitSign,
+                      verified = c.commitSign
+                        .flatMap { s =>
+                          GpgUtil.verifySign(s)
+                        }
+                    )
+                }
+                .splitWith { (commit1, commit2) =>
+                  view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
+                },
               page,
               hasNext,
               hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
@@ -319,13 +343,34 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
     }
 
+    val newFiles = files.map { file =>
+      file.copy(name = if (form.path.length == 0) file.name else s"${form.path}/${file.name}")
+    }
+
     commitFiles(
       repository = repository,
       branch = form.branch,
       path = form.path,
       files = files,
-      message = form.message.getOrElse("Add files via upload")
-    )
+      message = form.message.getOrElse("Add files via upload"),
+      loginAccount = context.loginAccount.get
+    ) {
+      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), FileUtil.checkFilename(file.id)))
+          builder.add(
+            JGitUtil.createDirCacheEntry(file.name, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes))
+          )
+          builder.finish()
+        }
+    }
 
     if (form.path.length == 0) {
       redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
@@ -394,7 +439,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
       charset = form.charset,
       message = form.message.getOrElse(s"Create ${form.newFileName}"),
-      commit = form.commit
+      commit = form.commit,
+      loginAccount = context.loginAccount.get
     )
 
     redirect(
@@ -417,7 +463,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       } else {
         form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
       },
-      commit = form.commit
+      commit = form.commit,
+      loginAccount = context.loginAccount.get
     )
 
     redirect(
@@ -436,7 +483,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       content = "",
       charset = "",
       message = form.message.getOrElse(s"Delete ${form.fileName}"),
-      commit = form.commit
+      commit = form.commit,
+      loginAccount = context.loginAccount.get
     )
 
     println(form.path)
@@ -593,50 +641,17 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
     val id = params("id")
     createCommitComment(
-      repository.owner,
-      repository.name,
+      repository,
       id,
-      context.loginAccount.get.userName,
+      context.loginAccount.get,
       form.content,
       form.fileName,
       form.oldLineNumber,
       form.newLineNumber,
+      form.diff,
       form.issueId
     )
 
-    for {
-      fileName <- form.fileName
-      diff <- form.diff
-    } {
-      saveCommitCommentDiff(
-        repository.owner,
-        repository.name,
-        id,
-        fileName,
-        form.oldLineNumber,
-        form.newLineNumber,
-        diff
-      )
-    }
-
-    form.issueId match {
-      case Some(issueId) =>
-        recordCommentPullRequestActivity(
-          repository.owner,
-          repository.name,
-          context.loginAccount.get.userName,
-          issueId,
-          form.content
-        )
-      case None =>
-        recordCommentCommitActivity(
-          repository.owner,
-          repository.name,
-          context.loginAccount.get.userName,
-          id,
-          form.content
-        )
-    }
     redirect(s"/${repository.owner}/${repository.name}/commit/${id}")
   })
 
@@ -661,64 +676,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ajaxPost("/:owner/:repository/commit/:id/comment/_data/new", commentForm)(readableUsersOnly { (form, repository) =>
     val id = params("id")
     val commentId = createCommitComment(
-      repository.owner,
-      repository.name,
+      repository,
       id,
-      context.loginAccount.get.userName,
+      context.loginAccount.get,
       form.content,
       form.fileName,
       form.oldLineNumber,
       form.newLineNumber,
+      form.diff,
       form.issueId
     )
 
-    for {
-      fileName <- form.fileName
-      diff <- form.diff
-    } {
-      saveCommitCommentDiff(
-        repository.owner,
-        repository.name,
-        id,
-        fileName,
-        form.oldLineNumber,
-        form.newLineNumber,
-        diff
-      )
-    }
-
     val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
-    form.issueId match {
-      case Some(issueId) =>
-        getPullRequest(repository.owner, repository.name, issueId).foreach {
-          case (issue, pullRequest) =>
-            recordCommentPullRequestActivity(
-              repository.owner,
-              repository.name,
-              context.loginAccount.get.userName,
-              issueId,
-              form.content
-            )
-            PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId, form.content, issue, repository))
-            callPullRequestReviewCommentWebHook(
-              "create",
-              comment,
-              repository,
-              issue,
-              pullRequest,
-              context.baseUrl,
-              context.loginAccount.get
-            )
-        }
-      case None =>
-        recordCommentCommitActivity(
-          repository.owner,
-          repository.name,
-          context.loginAccount.get.userName,
-          id,
-          form.content
-        )
-    }
     helper.html
       .commitcomment(comment, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
   })
@@ -736,6 +705,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                 "content" -> view.Markdown.toHtml(
                   markdown = x.content,
                   repository = repository,
+                  branch = repository.repository.defaultBranch,
                   enableWikiLink = false,
                   enableRefsLink = true,
                   enableAnchor = true,
@@ -778,29 +748,31 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/branches")(referrersOnly { repository =>
     val protectedBranches = getProtectedBranchList(repository.owner, repository.name).toSet
-    val branches = JGitUtil
-      .getBranches(
-        owner = repository.owner,
-        name = repository.name,
-        defaultBranch = repository.repository.defaultBranch,
-        origin = repository.repository.originUserName.isEmpty
-      )
-      .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
-      .map(
-        br =>
-          (
-            br,
-            getPullRequestByRequestCommit(
-              repository.owner,
-              repository.name,
-              repository.repository.defaultBranch,
-              br.name,
-              br.commitId
-            ),
-            protectedBranches.contains(br.name)
-        )
-      )
-      .reverse
+    val branches = using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
+        JGitUtil
+          .getBranches(
+            git = git,
+            defaultBranch = repository.repository.defaultBranch,
+            origin = repository.repository.originUserName.isEmpty
+          )
+          .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+          .map(
+            br =>
+              (
+                br,
+                getPullRequestByRequestCommit(
+                  repository.owner,
+                  repository.name,
+                  repository.repository.defaultBranch,
+                  br.name,
+                  br.commitId
+                ),
+                protectedBranches.contains(br.name)
+            )
+          )
+          .reverse
+    }
 
     html.branches(branches, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
   })
@@ -930,185 +902,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     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), FileUtil.checkFilename(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.fullName,
-          loginAccount.mailAddress,
-          message
-        )
-
-        inserter.flush()
-        inserter.close()
-
-        val receivePack = new ReceivePack(git.getRepository)
-        val receiveCommand = new ReceiveCommand(headTip, commitId, headName)
-
-        // call post commit hook
-        val error = PluginRegistry().getReceiveHooks.flatMap { hook =>
-          hook.preReceive(repository.owner, repository.name, receivePack, receiveCommand, loginAccount.userName)
-        }.headOption
-
-        error match {
-          case Some(error) =>
-            // commit is rejected
-            // TODO Notify commit failure to edited user
-            val refUpdate = git.getRepository.updateRef(headName)
-            refUpdate.setNewObjectId(headTip)
-            refUpdate.setForceUpdate(true)
-            refUpdate.update()
-
-          case None =>
-            // 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
-            if (branch == repository.repository.defaultBranch) {
-              closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach {
-                issueId =>
-                  getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                    callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
-                    PluginRegistry().getIssueHooks
-                      .foreach(_.closedByCommitComment(issue, repository, message, loginAccount))
-                  }
-              }
-            }
-
-            // call post commit hook
-            PluginRegistry().getReceiveHooks.foreach { hook =>
-              hook.postReceive(repository.owner, repository.name, receivePack, receiveCommand, loginAccount.userName)
-            }
-
-            //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")
@@ -1154,7 +947,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                 repository,
                 if (path == ".") Nil else path.split("/").toList, // current path
                 new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
-                JGitUtil.getCommitCount(repository.owner, repository.name, lastModifiedCommit.getName),
+                JGitUtil.getCommitCount(git, lastModifiedCommit.getName),
                 files,
                 readme,
                 hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
@@ -1179,18 +972,19 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     path: String
   ) = {
     def archive(revision: String, archiveFormat: String, archive: ArchiveOutputStream)(
-      entryCreator: (String, Long, Int) => ArchiveEntry
+      entryCreator: (String, Long, java.util.Date, Int) => ArchiveEntry
     ): Unit = {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         val oid = git.getRepository.resolve(revision)
-        val revCommit = JGitUtil.getRevCommitFromId(git, oid)
+        val commit = JGitUtil.getRevCommitFromId(git, oid)
+        val date = commit.getCommitterIdent.getWhen
         val sha1 = oid.getName()
         val repositorySuffix = (if (sha1.startsWith(revision)) sha1 else revision).replace('/', '-')
         val pathSuffix = if (path.isEmpty) "" else '-' + path.replace('/', '-')
         val baseName = repository.name + "-" + repositorySuffix + pathSuffix
 
         using(new TreeWalk(git.getRepository)) { treeWalk =>
-          treeWalk.addTree(revCommit.getTree)
+          treeWalk.addTree(commit.getTree)
           treeWalk.setRecursive(true)
           if (!path.isEmpty) {
             treeWalk.setFilter(PathFilter.create(path))
@@ -1200,12 +994,23 @@ trait RepositoryViewerControllerBase extends ControllerBase {
               val entryPath =
                 if (path.isEmpty) baseName + "/" + treeWalk.getPathString
                 else path.split("/").last + treeWalk.getPathString.substring(path.length)
-              val size = JGitUtil.getFileSize(git, repository, treeWalk)
+              val size = JGitUtil.getContentSize(git.getRepository.open(treeWalk.getObjectId(0)))
               val mode = treeWalk.getFileMode.getBits
-              val entry: ArchiveEntry = entryCreator(entryPath, size, mode)
-              JGitUtil.openFile(git, repository, revCommit.getTree, treeWalk.getPathString) { in =>
+              val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
+              JGitUtil.openFile(git, repository, commit.getTree, treeWalk.getPathString) { in =>
                 archive.putArchiveEntry(entry)
-                IOUtils.copy(in, archive)
+                IOUtils.copy(
+                  EolStreamTypeUtil.wrapInputStream(
+                    in,
+                    EolStreamTypeUtil
+                      .detectStreamType(
+                        OperationType.CHECKOUT_OP,
+                        git.getRepository.getConfig.get(WorkingTreeOptions.KEY),
+                        treeWalk.getAttributes
+                      )
+                  ),
+                  archive
+                )
                 archive.closeArchiveEntry()
               }
             }
@@ -1228,10 +1033,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         contentType = "application/octet-stream"
         response.setBufferSize(1024 * 1024)
         using(new ZipArchiveOutputStream(response.getOutputStream)) { zip =>
-          archive(revision, ".zip", zip) { (path, size, mode) =>
+          archive(revision, ".zip", zip) { (path, size, date, mode) =>
             val entry = new ZipArchiveEntry(path)
-            entry.setSize(size)
             entry.setUnixMode(mode)
+            entry.setTime(date.getTime)
             entry
           }
         }
@@ -1252,9 +1057,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             tar.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR)
             tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU)
             tar.setAddPaxHeadersForNonAsciiNames(true)
-            archive(revision, ".tar.gz", tar) { (path, size, mode) =>
+            archive(revision, ".tar.gz", tar) { (path, size, date, mode) =>
               val entry = new TarArchiveEntry(path)
-              entry.setSize(size)
+              entry.setModTime(date)
               entry.setMode(mode)
               entry
             }

src/main/scala/gitbucket/core/controller/api/ApiGitReferenceControllerBase.scala

@@ -0,0 +1,60 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiObject, ApiRef, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util.ReferrerAuthenticator
+import gitbucket.core.util.SyntaxSugars.using
+import gitbucket.core.util.Implicits._
+import org.eclipse.jgit.api.Git
+import scala.collection.JavaConverters._
+
+trait ApiGitReferenceControllerBase extends ControllerBase {
+  self: ReferrerAuthenticator =>
+
+  /*
+   * i. Get a reference
+   * https://developer.github.com/v3/git/refs/#get-a-reference
+   */
+  get("/api/v3/repos/:owner/:repository/git/refs/*")(referrersOnly { repository =>
+    val revstr = multiParams("splat").head
+    using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+      val ref = git.getRepository().findRef(revstr)
+
+      if (ref != null) {
+        val sha = ref.getObjectId().name()
+        JsonFormat(ApiRef(revstr, ApiObject(sha)))
+
+      } else {
+        val refs = git
+          .getRepository()
+          .getRefDatabase()
+          .getRefsByPrefix("refs/")
+          .asScala
+
+        JsonFormat(refs.map { ref =>
+          val sha = ref.getObjectId().name()
+          ApiRef(revstr, ApiObject(sha))
+        })
+      }
+    }
+  })
+  /*
+   * ii. Get all references
+   * https://developer.github.com/v3/git/refs/#get-all-references
+   */
+
+  /*
+   * iii. Create a reference
+   * https://developer.github.com/v3/git/refs/#create-a-reference
+   */
+
+  /*
+   * iv. Update a reference
+   * https://developer.github.com/v3/git/refs/#update-a-reference
+   */
+
+  /*
+ * v. Delete a reference
+ * https://developer.github.com/v3/git/refs/#delete-a-reference
+ */
+}

src/main/scala/gitbucket/core/controller/api/ApiIssueCommentControllerBase.scala

@@ -0,0 +1,79 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiComment, ApiUser, CreateAComment, JsonFormat}
+import gitbucket.core.controller.{Context, ControllerBase}
+import gitbucket.core.service._
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName}
+
+trait ApiIssueCommentControllerBase extends ControllerBase {
+  self: AccountService
+    with IssuesService
+    with RepositoryService
+    with HandleCommentService
+    with MilestonesService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator =>
+  /*
+   * i. List comments on an issue
+   * 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)
+    } yield {
+      JsonFormat(comments.map {
+        case (issueComment, user, issue) =>
+          ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest)
+      })
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * ii. List comments in a repository
+   * https://developer.github.com/v3/issues/comments/#list-comments-in-a-repository
+   */
+
+  /*
+   * iii. Get a single comment
+   * https://developer.github.com/v3/issues/comments/#get-a-single-comment
+   */
+
+  /*
+   * iv. Create a comment
+   * https://developer.github.com/v3/issues/comments/#create-a-comment
+   */
+  post("/api/v3/repos/:owner/:repository/issues/:id/comments")(readableUsersOnly { repository =>
+    (for {
+      issueId <- params("id").toIntOpt
+      issue <- getIssue(repository.owner, repository.name, issueId.toString)
+      body <- extractFromJsonBody[CreateAComment].map(_.body) if !body.isEmpty
+      action = params.get("action").filter(_ => isEditable(issue.userName, issue.repositoryName, issue.openedUserName))
+      (issue, id) <- handleComment(issue, Some(body), repository, action)
+      issueComment <- getComment(repository.owner, repository.name, id.toString())
+    } yield {
+      JsonFormat(
+        ApiComment(
+          issueComment,
+          RepositoryName(repository),
+          issueId,
+          ApiUser(context.loginAccount.get),
+          issue.isPullRequest
+        )
+      )
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * v. Edit a comment
+   * https://developer.github.com/v3/issues/comments/#edit-a-comment
+   */
+
+  /*
+   * vi. Delete a comment
+   * https://developer.github.com/v3/issues/comments/#delete-a-comment
+   */
+
+  private def isEditable(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/api/ApiIssueControllerBase.scala

@@ -0,0 +1,122 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api._
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.model.{Account, Issue}
+import gitbucket.core.service.{AccountService, IssueCreationService, IssuesService, MilestonesService}
+import gitbucket.core.service.IssuesService.IssueSearchCondition
+import gitbucket.core.service.PullRequestService.PullRequestLimit
+import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName, UsersAuthenticator}
+import gitbucket.core.util.Implicits._
+
+trait ApiIssueControllerBase extends ControllerBase {
+  self: AccountService
+    with IssuesService
+    with IssueCreationService
+    with MilestonesService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator =>
+  /*
+   * i. List issues
+   * https://developer.github.com/v3/issues/#list-issues
+   * requested: 1743
+   */
+
+  /*
+   * ii. List issues for a repository
+   * 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),
+          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+            .map(ApiLabel(_, RepositoryName(repository)))
+        )
+    })
+  })
+
+  /*
+   * iii. Get a single issue
+   * https://developer.github.com/v3/issues/#get-a-single-issue
+   */
+  get("/api/v3/repos/:owner/:repository/issues/:id")(referrersOnly { repository =>
+    (for {
+      issueId <- params("id").toIntOpt
+      issue <- getIssue(repository.owner, repository.name, issueId.toString)
+      openedUser <- getAccountByUserName(issue.openedUserName)
+    } yield {
+      JsonFormat(
+        ApiIssue(
+          issue,
+          RepositoryName(repository),
+          ApiUser(openedUser),
+          getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository)))
+        )
+      )
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * iv. Create an issue
+   * 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),
+            getIssueLabels(repository.owner, repository.name, issue.issueId)
+              .map(ApiLabel(_, RepositoryName(repository)))
+          )
+        )
+      }) getOrElse NotFound()
+    } else Unauthorized()
+  })
+  /*
+   * v. Edit an issue
+   * https://developer.github.com/v3/issues/#edit-an-issue
+   */
+
+  /*
+   * vi. Lock an issue
+   * https://developer.github.com/v3/issues/#lock-an-issue
+   */
+
+  /*
+ * vii. Unlock an issue
+ * https://developer.github.com/v3/issues/#unlock-an-issue
+ */
+}

src/main/scala/gitbucket/core/controller/api/ApiIssueLabelControllerBase.scala

@@ -0,0 +1,195 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiError, ApiLabel, CreateALabel, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service._
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util._
+import org.scalatra.{Created, NoContent, UnprocessableEntity}
+
+trait ApiIssueLabelControllerBase extends ControllerBase {
+  self: AccountService
+    with IssuesService
+    with LabelsService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator =>
+
+  /*
+   * i. List all labels for this repository
+   * https://developer.github.com/v3/issues/labels/#list-all-labels-for-this-repository
+   */
+  get("/api/v3/repos/:owner/:repository/labels")(referrersOnly { repository =>
+    JsonFormat(getLabels(repository.owner, repository.name).map { label =>
+      ApiLabel(label, RepositoryName(repository))
+    })
+  })
+
+  /*
+   * ii. Get a single label
+   * https://developer.github.com/v3/issues/labels/#get-a-single-label
+   */
+  get("/api/v3/repos/:owner/:repository/labels/:labelName")(referrersOnly { repository =>
+    getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+      JsonFormat(ApiLabel(label, RepositoryName(repository)))
+    } getOrElse NotFound()
+  })
+
+  /*
+   * iii. Create a label
+   * https://developer.github.com/v3/issues/labels/#create-a-label
+   */
+  post("/api/v3/repos/:owner/:repository/labels")(writableUsersOnly { repository =>
+    (for {
+      data <- extractFromJsonBody[CreateALabel] if data.isValid
+    } yield {
+      LockUtil.lock(RepositoryName(repository).fullName) {
+        if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
+          val labelId = createLabel(repository.owner, repository.name, data.name, data.color)
+          getLabel(repository.owner, repository.name, labelId).map { label =>
+            Created(JsonFormat(ApiLabel(label, RepositoryName(repository))))
+          } getOrElse NotFound()
+        } else {
+          // TODO ApiError should support errors field to enhance compatibility of GitHub API
+          UnprocessableEntity(
+            ApiError(
+              "Validation Failed",
+              Some("https://developer.github.com/v3/issues/labels/#create-a-label")
+            )
+          )
+        }
+      }
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * iv. Update a label
+   * https://developer.github.com/v3/issues/labels/#update-a-label
+   */
+  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
+    (for {
+      data <- extractFromJsonBody[CreateALabel] if data.isValid
+    } yield {
+      LockUtil.lock(RepositoryName(repository).fullName) {
+        getLabel(repository.owner, repository.name, params("labelName")).map {
+          label =>
+            if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
+              updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
+              JsonFormat(
+                ApiLabel(
+                  getLabel(repository.owner, repository.name, label.labelId).get,
+                  RepositoryName(repository)
+                )
+              )
+            } else {
+              // TODO ApiError should support errors field to enhance compatibility of GitHub API
+              UnprocessableEntity(
+                ApiError(
+                  "Validation Failed",
+                  Some("https://developer.github.com/v3/issues/labels/#create-a-label")
+                )
+              )
+            }
+        } getOrElse NotFound()
+      }
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * v. Delete a label
+   * https://developer.github.com/v3/issues/labels/#delete-a-label
+   */
+  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
+    LockUtil.lock(RepositoryName(repository).fullName) {
+      getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+        deleteLabel(repository.owner, repository.name, label.labelId)
+        NoContent()
+      } getOrElse NotFound()
+    }
+  })
+  /*
+   * vi. List labels on an issue
+   * https://developer.github.com/v3/issues/labels/#list-labels-on-an-issue
+   */
+  get("/api/v3/repos/:owner/:repository/issues/:id/labels")(referrersOnly { repository =>
+    JsonFormat(getIssueLabels(repository.owner, repository.name, params("id").toInt).map { l =>
+      ApiLabel(l, RepositoryName(repository.owner, repository.name))
+    })
+  })
+
+  /*
+   * vii. Add labels to an issue
+   * https://developer.github.com/v3/issues/labels/#add-labels-to-an-issue
+   */
+  post("/api/v3/repos/:owner/:repository/issues/:id/labels")(writableUsersOnly { repository =>
+    JsonFormat(for {
+      data <- extractFromJsonBody[Seq[String]];
+      issueId <- params("id").toIntOpt
+    } yield {
+      data.map { labelName =>
+        val label = getLabel(repository.owner, repository.name, labelName).getOrElse(
+          getLabel(
+            repository.owner,
+            repository.name,
+            createLabel(repository.owner, repository.name, labelName)
+          ).get
+        )
+        registerIssueLabel(repository.owner, repository.name, issueId, label.labelId, true)
+        ApiLabel(label, RepositoryName(repository.owner, repository.name))
+      }
+    })
+  })
+
+  /*
+   * viii. Remove a label from an issue
+   * https://developer.github.com/v3/issues/labels/#remove-a-label-from-an-issue
+   */
+  delete("/api/v3/repos/:owner/:repository/issues/:id/labels/:name")(writableUsersOnly { repository =>
+    val issueId = params("id").toInt
+    val labelName = params("name")
+    getLabel(repository.owner, repository.name, labelName) match {
+      case Some(label) =>
+        deleteIssueLabel(repository.owner, repository.name, issueId, label.labelId, true)
+        JsonFormat(Seq(label))
+      case None =>
+        NotFound()
+    }
+  })
+
+  /*
+   * ix. Replace all labels for an issue
+   * https://developer.github.com/v3/issues/labels/#replace-all-labels-for-an-issue
+   */
+  put("/api/v3/repos/:owner/:repository/issues/:id/labels")(writableUsersOnly { repository =>
+    JsonFormat(for {
+      data <- extractFromJsonBody[Seq[String]];
+      issueId <- params("id").toIntOpt
+    } yield {
+      deleteAllIssueLabels(repository.owner, repository.name, issueId, true)
+      data.map { labelName =>
+        val label = getLabel(repository.owner, repository.name, labelName).getOrElse(
+          getLabel(
+            repository.owner,
+            repository.name,
+            createLabel(repository.owner, repository.name, labelName)
+          ).get
+        )
+        registerIssueLabel(repository.owner, repository.name, issueId, label.labelId, true)
+        ApiLabel(label, RepositoryName(repository.owner, repository.name))
+      }
+    })
+  })
+
+  /*
+   * x. Remove all labels from an issue
+   * https://developer.github.com/v3/issues/labels/#remove-all-labels-from-an-issue
+   */
+  delete("/api/v3/repos/:owner/:repository/issues/:id/labels")(writableUsersOnly { repository =>
+    val issueId = params("id").toInt
+    deleteAllIssueLabels(repository.owner, repository.name, issueId, true)
+    NoContent()
+  })
+
+  /*
+ * xi Get labels for every issue in a milestone
+ * https://developer.github.com/v3/issues/labels/#get-labels-for-every-issue-in-a-milestone
+ */
+}

src/main/scala/gitbucket/core/controller/api/ApiOrganizationControllerBase.scala

@@ -0,0 +1,76 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiGroup, CreateAGroup, ApiRepository, ApiUser, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, RepositoryService}
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.{AdminAuthenticator, UsersAuthenticator}
+
+trait ApiOrganizationControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService with AdminAuthenticator with UsersAuthenticator =>
+
+  /*
+   * i. List your organizations
+   * https://developer.github.com/v3/orgs/#list-your-organizations
+   */
+  get("/api/v3/user/orgs")(usersOnly {
+    JsonFormat(getGroupsByUserName(context.loginAccount.get.userName).flatMap(getAccountByUserName(_)).map(ApiGroup(_)))
+  })
+
+  /*
+   * ii. List all organizations
+   * https://developer.github.com/v3/orgs/#list-all-organizations
+   */
+  get("/api/v3/organizations") {
+    JsonFormat(getAllUsers(false, true).filter(a => a.isGroupAccount).map(ApiGroup(_)))
+  }
+
+  /*
+   * iii. List user organizations
+   * https://developer.github.com/v3/orgs/#list-user-organizations
+   */
+  get("/api/v3/users/:userName/orgs") {
+    JsonFormat(getGroupsByUserName(params("userName")).flatMap(getAccountByUserName(_)).map(ApiGroup(_)))
+  }
+
+  /**
+   * iv. Get an organization
+   * https://developer.github.com/v3/orgs/#get-an-organization
+   */
+  get("/api/v3/orgs/:groupName") {
+    getAccountByUserName(params("groupName")).filter(account => account.isGroupAccount).map { account =>
+      JsonFormat(ApiGroup(account))
+    } getOrElse NotFound()
+  }
+
+  /*
+   * v. Edit an organization
+   * https://developer.github.com/v3/orgs/#edit-an-organization
+   */
+
+  /*
+   * ghe: i. Create an organization
+   * https://developer.github.com/enterprise/2.14/v3/enterprise-admin/orgs/#create-an-organization
+   */
+  post("/api/v3/admin/organizations")(adminOnly {
+    for {
+      data <- extractFromJsonBody[CreateAGroup]
+    } yield {
+      val group = createGroup(
+        data.login,
+        data.profile_name,
+        data.url
+      )
+      updateGroupMembers(data.login, List(data.admin -> true))
+      JsonFormat(ApiGroup(group))
+    }
+  })
+
+  /*
+   * ghe: ii. Rename an organization
+   * https://developer.github.com/enterprise/2.14/v3/enterprise-admin/orgs/#rename-an-organization
+   */
+
+  /*
+ * should implement delete an organization API?
+ */
+}

src/main/scala/gitbucket/core/controller/api/ApiPullRequestControllerBase.scala

@@ -0,0 +1,252 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api._
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.model.{Account, Issue, PullRequest, Repository}
+import gitbucket.core.service._
+import gitbucket.core.service.IssuesService.IssueSearchCondition
+import gitbucket.core.service.PullRequestService.PullRequestLimit
+import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.JGitUtil.CommitInfo
+import gitbucket.core.util.SyntaxSugars.using
+import gitbucket.core.util._
+import org.eclipse.jgit.api.Git
+import org.scalatra.NoContent
+
+import scala.collection.JavaConverters._
+
+trait ApiPullRequestControllerBase extends ControllerBase {
+  self: AccountService
+    with IssuesService
+    with PullRequestService
+    with RepositoryService
+    with MergeService
+    with ReferrerAuthenticator
+    with ReadableUsersAuthenticator
+    with WritableUsersAuthenticator =>
+
+  /*
+   * i. Link Relations
+   * https://developer.github.com/v3/pulls/#link-relations
+   */
+
+  /*
+   * ii. List pull requests
+   * https://developer.github.com/v3/pulls/#list-pull-requests
+   */
+  get("/api/v3/repos/:owner/:repository/pulls")(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, Int, PullRequest, Repository, Account, Option[Account])] =
+      searchPullRequestByApi(
+        condition = condition,
+        offset = (page - 1) * PullRequestLimit,
+        limit = PullRequestLimit,
+        repos = repository.owner -> repository.name
+      )
+
+    JsonFormat(issues.map {
+      case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
+        ApiPullRequest(
+          issue = issue,
+          pullRequest = pullRequest,
+          headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
+          baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
+          user = ApiUser(issueUser),
+          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+            .map(ApiLabel(_, RepositoryName(repository))),
+          assignee = assignee.map(ApiUser.apply),
+          mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
+        )
+    })
+  })
+
+  /*
+   * iii. Get a single pull request
+   * https://developer.github.com/v3/pulls/#get-a-single-pull-request
+   */
+  get("/api/v3/repos/:owner/:repository/pulls/:id")(referrersOnly { repository =>
+    (for {
+      issueId <- params("id").toIntOpt
+    } yield {
+      JsonFormat(getApiPullRequest(repository, issueId))
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * iv. Create a pull request
+   * https://developer.github.com/v3/pulls/#create-a-pull-request
+   * requested #1843
+   */
+  post("/api/v3/repos/:owner/:repository/pulls")(readableUsersOnly { repository =>
+    (for {
+      data <- extractFromJsonBody[Either[CreateAPullRequest, CreateAPullRequestAlt]]
+    } yield {
+      data match {
+        case Left(createPullReq) =>
+          val (reqOwner, reqBranch) = parseCompareIdentifier(createPullReq.head, repository.owner)
+          getRepository(reqOwner, repository.name)
+            .flatMap {
+              forkedRepository =>
+                getPullRequestCommitFromTo(repository, forkedRepository, createPullReq.base, reqBranch) match {
+                  case (Some(commitIdFrom), Some(commitIdTo)) =>
+                    val issueId = insertIssue(
+                      owner = repository.owner,
+                      repository = repository.name,
+                      loginUser = context.loginAccount.get.userName,
+                      title = createPullReq.title,
+                      content = createPullReq.body,
+                      assignedUserName = None,
+                      milestoneId = None,
+                      priorityId = None,
+                      isPullRequest = true
+                    )
+
+                    createPullRequest(
+                      originRepository = repository,
+                      issueId = issueId,
+                      originBranch = createPullReq.base,
+                      requestUserName = reqOwner,
+                      requestRepositoryName = repository.name,
+                      requestBranch = reqBranch,
+                      commitIdFrom = commitIdFrom.getName,
+                      commitIdTo = commitIdTo.getName,
+                      loginAccount = context.loginAccount.get
+                    )
+                    getApiPullRequest(repository, issueId).map(JsonFormat(_))
+                  case _ =>
+                    None
+                }
+            }
+            .getOrElse {
+              NotFound()
+            }
+        case Right(createPullReqAlt) =>
+          val (reqOwner, reqBranch) = parseCompareIdentifier(createPullReqAlt.head, repository.owner)
+          getRepository(reqOwner, repository.name)
+            .flatMap {
+              forkedRepository =>
+                getPullRequestCommitFromTo(repository, forkedRepository, createPullReqAlt.base, reqBranch) match {
+                  case (Some(commitIdFrom), Some(commitIdTo)) =>
+                    changeIssueToPullRequest(repository.owner, repository.name, createPullReqAlt.issue)
+                    createPullRequest(
+                      originRepository = repository,
+                      issueId = createPullReqAlt.issue,
+                      originBranch = createPullReqAlt.base,
+                      requestUserName = reqOwner,
+                      requestRepositoryName = repository.name,
+                      requestBranch = reqBranch,
+                      commitIdFrom = commitIdFrom.getName,
+                      commitIdTo = commitIdTo.getName,
+                      loginAccount = context.loginAccount.get
+                    )
+                    getApiPullRequest(repository, createPullReqAlt.issue).map(JsonFormat(_))
+                  case _ =>
+                    None
+                }
+            }
+            .getOrElse {
+              NotFound()
+            }
+      }
+    })
+  })
+
+  /*
+   * v. Update a pull request
+   * https://developer.github.com/v3/pulls/#update-a-pull-request
+   */
+
+  /*
+   * vi. List commits on a pull request
+   * https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
+   */
+  get("/api/v3/repos/:owner/:repository/pulls/:id/commits")(referrersOnly { repository =>
+    val owner = repository.owner
+    val name = repository.name
+    params("id").toIntOpt.flatMap {
+      issueId =>
+        getPullRequest(owner, name, issueId) map {
+          case (issue, pullreq) =>
+            using(Git.open(getRepositoryDir(owner, name))) { git =>
+              val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
+              val newId = git.getRepository.resolve(pullreq.commitIdTo)
+              val repoFullName = RepositoryName(repository)
+              val commits = git.log
+                .addRange(oldId, newId)
+                .call
+                .iterator
+                .asScala
+                .map { c =>
+                  ApiCommitListItem(new CommitInfo(c), repoFullName)
+                }
+                .toList
+              JsonFormat(commits)
+            }
+        }
+    } getOrElse NotFound()
+  })
+  /*
+   * vii. List pull requests files
+   * https://developer.github.com/v3/pulls/#list-pull-requests-files
+   */
+
+  /*
+   * viii. Get if a pull request has been merged
+   * https://developer.github.com/v3/pulls/#get-if-a-pull-request-has-been-merged
+   */
+  get("/api/v3/repos/:owner/:repository/pulls/:id/merge")(referrersOnly { repository =>
+    (for {
+      issueId <- params("id").toIntOpt
+      (issue, pullReq) <- getPullRequest(repository.owner, repository.name, issueId)
+    } yield {
+      if (checkConflict(repository.owner, repository.name, pullReq.branch, issueId).isDefined) {
+        NoContent
+      } else {
+        NotFound
+      }
+    }).getOrElse(NotFound)
+  })
+
+  /*
+   * ix. Merge a pull request (Merge Button)
+   * https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
+   */
+
+  /*
+   * x. Labels, assignees, and milestones
+   * https://developer.github.com/v3/pulls/#labels-assignees-and-milestones
+   */
+
+  private def getApiPullRequest(repository: RepositoryService.RepositoryInfo, issueId: Int): Option[ApiPullRequest] = {
+    for {
+      (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
+      users = getAccountsByUserNames(
+        Set(repository.owner, pullRequest.requestUserName, issue.openedUserName),
+        Set.empty
+      )
+      baseOwner <- users.get(repository.owner)
+      headOwner <- users.get(pullRequest.requestUserName)
+      issueUser <- users.get(issue.openedUserName)
+      assignee = issue.assignedUserName.flatMap { userName =>
+        getAccountByUserName(userName, false)
+      }
+      headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
+    } yield {
+      ApiPullRequest(
+        issue = issue,
+        pullRequest = pullRequest,
+        headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
+        baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
+        user = ApiUser(issueUser),
+        labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+          .map(ApiLabel(_, RepositoryName(repository))),
+        assignee = assignee.map(ApiUser.apply),
+        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
+      )
+    }
+  }
+}

src/main/scala/gitbucket/core/controller/api/ApiReleaseControllerBase.scala

@@ -0,0 +1,184 @@
+package gitbucket.core.controller.api
+import java.io.{ByteArrayInputStream, File}
+
+import gitbucket.core.api._
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, ReleaseService}
+import gitbucket.core.util.Directory.getReleaseFilesDir
+import gitbucket.core.util.{FileUtil, ReferrerAuthenticator, RepositoryName, WritableUsersAuthenticator}
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.SyntaxSugars.defining
+import org.apache.commons.io.FileUtils
+import org.scalatra.{Created, NoContent}
+
+trait ApiReleaseControllerBase extends ControllerBase {
+  self: AccountService with ReleaseService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+
+  /**
+   * i. List releases for a repository
+   * https://developer.github.com/v3/repos/releases/#list-releases-for-a-repository
+   */
+  get("/api/v3/repos/:owner/:repository/releases")(referrersOnly { repository =>
+    val releases = getReleases(repository.owner, repository.name)
+    JsonFormat(releases.map { rel =>
+      val assets = getReleaseAssets(repository.owner, repository.name, rel.tag)
+      ApiRelease(rel, assets, getAccountByUserName(rel.author).get, RepositoryName(repository))
+    })
+  })
+
+  /**
+   * ii. Get a single release
+   * https://developer.github.com/v3/repos/releases/#get-a-single-release
+   * GitBucket doesn't have release id
+   */
+  /**
+   * iii. Get the latest release
+   * https://developer.github.com/v3/repos/releases/#get-the-latest-release
+   */
+  get("/api/v3/repos/:owner/:repository/releases/latest")(referrersOnly { repository =>
+    getReleases(repository.owner, repository.name).lastOption
+      .map { release =>
+        val assets = getReleaseAssets(repository.owner, repository.name, release.tag)
+        JsonFormat(ApiRelease(release, assets, getAccountByUserName(release.author).get, RepositoryName(repository)))
+      }
+      .getOrElse {
+        NotFound()
+      }
+  })
+
+  /**
+   * iv. Get a release by tag name
+   * https://developer.github.com/v3/repos/releases/#get-a-release-by-tag-name
+   */
+  get("/api/v3/repos/:owner/:repository/releases/tags/:tag")(referrersOnly { repository =>
+    val tag = params("tag")
+    getRelease(repository.owner, repository.name, tag)
+      .map { release =>
+        val assets = getReleaseAssets(repository.owner, repository.name, tag)
+        JsonFormat(ApiRelease(release, assets, getAccountByUserName(release.author).get, RepositoryName(repository)))
+      }
+      .getOrElse {
+        NotFound()
+      }
+  })
+
+  /**
+   * v. Create a release
+   * https://developer.github.com/v3/repos/releases/#create-a-release
+   */
+  post("/api/v3/repos/:owner/:repository/releases")(writableUsersOnly { repository =>
+    (for {
+      data <- extractFromJsonBody[CreateARelease]
+    } yield {
+      createRelease(
+        repository.owner,
+        repository.name,
+        data.name.getOrElse(data.tag_name),
+        data.body,
+        data.tag_name,
+        context.loginAccount.get
+      )
+      val release = getRelease(repository.owner, repository.name, data.tag_name).get
+      val assets = getReleaseAssets(repository.owner, repository.name, data.tag_name)
+      JsonFormat(ApiRelease(release, assets, context.loginAccount.get, RepositoryName(repository)))
+    })
+  })
+
+  /**
+   * vi. Edit a release
+   * https://developer.github.com/v3/repos/releases/#edit-a-release
+   * Incompatiblity info: GitHub API requires :release_id, but GitBucket API requires :tag_name
+   */
+  patch("/api/v3/repos/:owner/:repository/releases/:tag")(writableUsersOnly { repository =>
+    (for {
+      data <- extractFromJsonBody[CreateARelease]
+    } yield {
+      val tag = params("tag")
+      updateRelease(repository.owner, repository.name, tag, data.name.getOrElse(data.tag_name), data.body)
+      val release = getRelease(repository.owner, repository.name, data.tag_name).get
+      val assets = getReleaseAssets(repository.owner, repository.name, data.tag_name)
+      JsonFormat(ApiRelease(release, assets, context.loginAccount.get, RepositoryName(repository)))
+    })
+  })
+
+  /**
+   * vii. Delete a release
+   * https://developer.github.com/v3/repos/releases/#delete-a-release
+   * Incompatiblity info: GitHub API requires :release_id, but GitBucket API requires :tag_name
+   */
+  delete("/api/v3/repos/:owner/:repository/releases/:tag")(writableUsersOnly { repository =>
+    val tag = params("tag")
+    deleteRelease(repository.owner, repository.name, tag)
+    NoContent()
+  })
+
+  /**
+   * viii. List assets for a release
+   * https://developer.github.com/v3/repos/releases/#list-assets-for-a-release
+   */
+  /**
+   * ix. Upload a release asset
+   * https://developer.github.com/v3/repos/releases/#upload-a-release-asset
+   */
+  post("/api/v3/repos/:owner/:repository/releases/:tag/assets")(writableUsersOnly { repository =>
+    val name = params("name")
+    val tag = params("tag")
+    getRelease(repository.owner, repository.name, tag)
+      .map {
+        release =>
+          defining(FileUtil.generateFileId) { fileId =>
+            val buf = new Array[Byte](request.inputStream.available())
+            request.inputStream.read(buf)
+            FileUtils.writeByteArrayToFile(
+              new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(tag + "/" + fileId)
+              ),
+              buf
+            )
+            createReleaseAsset(
+              repository.owner,
+              repository.name,
+              tag,
+              fileId,
+              name,
+              request.contentLength.getOrElse(0),
+              context.loginAccount.get
+            )
+            getReleaseAsset(repository.owner, repository.name, tag, fileId)
+              .map { asset =>
+                JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
+              }
+              .getOrElse {
+                ApiError("Unknown error")
+              }
+          }
+      }
+      .getOrElse(NotFound())
+  })
+
+  /**
+   * x. Get a single release asset
+   * https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
+   * Incompatibility info: GitHub requires only asset_id, but GitBucket requires tag and fileId(file_id).
+   */
+  get("/api/v3/repos/:owner/:repository/releases/:tag/assets/:fileId")(referrersOnly { repository =>
+    val tag = params("tag")
+    val fileId = params("fileId")
+    getReleaseAsset(repository.owner, repository.name, tag, fileId)
+      .map { asset =>
+        JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
+      }
+      .getOrElse(NotFound())
+  })
+
+  /*
+   * xi. Edit a release asset
+   * https://developer.github.com/v3/repos/releases/#edit-a-release-asset
+   */
+
+  /*
+ * xii. Delete a release asset
+ * https://developer.github.com/v3/repos/releases/#edit-a-release-asset
+ */
+}

src/main/scala/gitbucket/core/controller/api/ApiRepositoryBranchControllerBase.scala

@@ -0,0 +1,243 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api._
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, ProtectedBranchService, RepositoryService}
+import gitbucket.core.util._
+import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.JGitUtil.getBranches
+import org.eclipse.jgit.api.Git
+
+trait ApiRepositoryBranchControllerBase extends ControllerBase {
+  self: RepositoryService
+    with AccountService
+    with OwnerAuthenticator
+    with UsersAuthenticator
+    with GroupManagerAuthenticator
+    with ProtectedBranchService
+    with ReferrerAuthenticator
+    with ReadableUsersAuthenticator
+    with WritableUsersAuthenticator =>
+
+  /**
+   * i. List branches
+   * https://developer.github.com/v3/repos/branches/#list-branches
+   */
+  get("/api/v3/repos/:owner/:repository/branches")(referrersOnly { repository =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      JsonFormat(
+        JGitUtil
+          .getBranches(
+            git = git,
+            defaultBranch = repository.repository.defaultBranch,
+            origin = repository.repository.originUserName.isEmpty
+          )
+          .map { br =>
+            ApiBranchForList(br.name, ApiBranchCommit(br.commitId))
+          }
+      )
+    }
+  })
+
+  /**
+   * ii. Get branch
+   * https://developer.github.com/v3/repos/branches/#get-branch
+   */
+  get("/api/v3/repos/:owner/:repository/branches/*")(referrersOnly { repository =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
+        (for {
+          branch <- params.get("splat") if repository.branchList.contains(branch)
+          br <- getBranches(
+            git,
+            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()
+    }
+  })
+
+  /*
+   * iii. Get branch protection
+   * https://developer.github.com/v3/repos/branches/#get-branch-protection
+   */
+
+  /*
+   * iv. Update branch protection
+   * https://developer.github.com/v3/repos/branches/#update-branch-protection
+   */
+
+  /*
+   * v. Remove branch protection
+   * https://developer.github.com/v3/repos/branches/#remove-branch-protection
+   */
+
+  /*
+   * vi. Get required status checks of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-required-status-checks-of-protected-branch
+   */
+
+  /*
+   * vii. Update required status checks of protected branch
+   * https://developer.github.com/v3/repos/branches/#update-required-status-checks-of-protected-branch
+   */
+
+  /*
+   * viii. Remove required status checks of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-required-status-checks-of-protected-branch
+   */
+
+  /*
+   * ix. List required status checks contexts of protected branch
+   * https://developer.github.com/v3/repos/branches/#list-required-status-checks-contexts-of-protected-branch
+   */
+
+  /*
+   * x. Replace required status checks contexts of protected branch
+   * https://developer.github.com/v3/repos/branches/#replace-required-status-checks-contexts-of-protected-branch
+   */
+
+  /*
+   * xi. Add required status checks contexts of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-required-status-checks-contexts-of-protected-branch
+   */
+
+  /*
+   * xii. Remove required status checks contexts of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-required-status-checks-contexts-of-protected-branch
+   */
+
+  /*
+   * xiii. Get pull request review enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-pull-request-review-enforcement-of-protected-branch
+   */
+
+  /*
+   * xiv. Update pull request review enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#update-pull-request-review-enforcement-of-protected-branch
+   */
+
+  /*
+   * xv. Remove pull request review enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-pull-request-review-enforcement-of-protected-branch
+   */
+
+  /*
+   * xvi. Get required signatures of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-required-signatures-of-protected-branch
+   */
+
+  /*
+   * xvii. Add required signatures of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-required-signatures-of-protected-branch
+   */
+
+  /*
+   * xviii. Remove required signatures of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-required-signatures-of-protected-branch
+   */
+
+  /*
+   * xix. Get admin enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-admin-enforcement-of-protected-branch
+   */
+
+  /*
+   * xx. Add admin enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-admin-enforcement-of-protected-branch
+   */
+
+  /*
+   * xxi. Remove admin enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-admin-enforcement-of-protected-branch
+   */
+
+  /*
+   * xxii. Get restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxiii. Remove restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxiv. List team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#list-team-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxv. Replace team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#replace-team-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxvi. Add team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-team-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxvii. Remove team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-team-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxviii. List user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#list-user-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxix. Replace user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#replace-user-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxx. Add user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-user-restrictions-of-protected-branch
+   */
+
+  /*
+   * xxxi. Remove user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-user-restrictions-of-protected-branch
+   */
+
+  /**
+   * Enabling and disabling branch protection: deprecated?
+   * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
+   */
+  patch("/api/v3/repos/:owner/:repository/branches/*")(ownerOnly { repository =>
+    import gitbucket.core.api._
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
+        (for {
+          branch <- params.get("splat") if repository.branchList.contains(branch)
+          protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
+          br <- getBranches(
+            git,
+            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, ApiBranchCommit(br.commitId), protection)(RepositoryName(repository)))
+        }) getOrElse NotFound()
+    }
+  })
+}

src/main/scala/gitbucket/core/controller/api/ApiRepositoryCollaboratorControllerBase.scala

@@ -0,0 +1,55 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{AddACollaborator, ApiUser, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, RepositoryService}
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.{OwnerAuthenticator, ReferrerAuthenticator}
+import org.scalatra.NoContent
+
+trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService with ReferrerAuthenticator with OwnerAuthenticator =>
+
+  /*
+   * i. List collaborators
+   * https://developer.github.com/v3/repos/collaborators/#list-collaborators
+   */
+  get("/api/v3/repos/:owner/:repository/collaborators")(referrersOnly { repository =>
+    // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
+    JsonFormat(
+      getCollaboratorUserNames(params("owner"), params("repository")).map(u => ApiUser(getAccountByUserName(u).get))
+    )
+  })
+  /*
+   * ii. Check if a user is a collaborator
+   * https://developer.github.com/v3/repos/collaborators/#check-if-a-user-is-a-collaborator
+   */
+
+  /*
+   * iii. Review a user's permission level
+   * https://developer.github.com/v3/repos/collaborators/#review-a-users-permission-level
+   */
+
+  /*
+   * iv. Add user as a collaborator
+   * https://developer.github.com/v3/repos/collaborators/#add-user-as-a-collaborator
+   * requested #1586
+   */
+  put("/api/v3/repos/:owner/:repository/collaborators/:userName")(ownerOnly { repository =>
+    for {
+      data <- extractFromJsonBody[AddACollaborator]
+    } yield {
+      addCollaborator(repository.owner, repository.name, params("userName"), data.role)
+      NoContent()
+    }
+  })
+
+  /*
+   * v. Remove user as a collaborator
+   * https://developer.github.com/v3/repos/collaborators/#remove-user-as-a-collaborator
+   * requested #1586
+   */
+  delete("/api/v3/repos/:owner/:repository/collaborators/:userName")(ownerOnly { repository =>
+    removeCollaborator(repository.owner, repository.name, params("userName"))
+    NoContent()
+  })
+}

src/main/scala/gitbucket/core/controller/api/ApiRepositoryCommitControllerBase.scala

@@ -0,0 +1,85 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiCommits, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.model.Account
+import gitbucket.core.service.{AccountService, CommitsService}
+import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.JGitUtil.CommitInfo
+import gitbucket.core.util.{JGitUtil, ReferrerAuthenticator, RepositoryName}
+import gitbucket.core.util.SyntaxSugars.using
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.revwalk.RevWalk
+
+trait ApiRepositoryCommitControllerBase extends ControllerBase {
+  self: AccountService with CommitsService with ReferrerAuthenticator =>
+  /*
+   * i. List commits on a repository
+   * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository
+   */
+
+  /*
+   * ii. Get a single commit
+   * https://developer.github.com/v3/repos/commits/#get-a-single-commit
+   */
+  get("/api/v3/repos/:owner/:repository/commits/:sha")(referrersOnly { repository =>
+    val owner = repository.owner
+    val name = repository.name
+    val sha = params("sha")
+
+    using(Git.open(getRepositoryDir(owner, name))) {
+      git =>
+        val repo = git.getRepository
+        val objectId = repo.resolve(sha)
+        val commitInfo = using(new RevWalk(repo)) { revWalk =>
+          new CommitInfo(revWalk.parseCommit(objectId))
+        }
+
+        JsonFormat(
+          ApiCommits(
+            repositoryName = RepositoryName(repository),
+            commitInfo = commitInfo,
+            diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
+            author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
+            committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
+            commentCount = getCommitComment(repository.owner, repository.name, sha).size
+          )
+        )
+    }
+  })
+
+  private def getAccount(userName: String, email: String): Account = {
+    getAccountByMailAddress(email).getOrElse {
+      Account(
+        userName = userName,
+        fullName = userName,
+        mailAddress = email,
+        password = "xxx",
+        isAdmin = false,
+        url = None,
+        registeredDate = new java.util.Date(),
+        updatedDate = new java.util.Date(),
+        lastLoginDate = None,
+        image = None,
+        isGroupAccount = false,
+        isRemoved = true,
+        description = None
+      )
+    }
+  }
+
+  /*
+   * iii. Get the SHA-1 of a commit reference
+   * https://developer.github.com/v3/repos/commits/#get-the-sha-1-of-a-commit-reference
+   */
+
+  /*
+   * iv. Compare two commits
+   * https://developer.github.com/v3/repos/commits/#compare-two-commits
+   */
+
+  /*
+ * v. Commit signature verification
+ * https://developer.github.com/v3/repos/commits/#commit-signature-verification
+ */
+}

src/main/scala/gitbucket/core/controller/api/ApiRepositoryContentsControllerBase.scala

@@ -0,0 +1,158 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiContents, ApiError, CreateAFile, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{RepositoryCommitFileService, RepositoryService}
+import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util.JGitUtil.{FileInfo, getContentFromId, getFileList}
+import gitbucket.core.util._
+import gitbucket.core.util.SyntaxSugars.using
+import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
+import gitbucket.core.util.Implicits._
+import org.eclipse.jgit.api.Git
+
+trait ApiRepositoryContentsControllerBase extends ControllerBase {
+  self: ReferrerAuthenticator with WritableUsersAuthenticator with RepositoryCommitFileService =>
+
+  /*
+   * i. Get the README
+   * https://developer.github.com/v3/repos/contents/#get-the-readme
+   */
+
+  /**
+   * ii. Get contents
+   * https://developer.github.com/v3/repos/contents/#get-contents
+   */
+  get("/api/v3/repos/:owner/:repository/contents")(referrersOnly { repository =>
+    getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch))
+  })
+
+  /**
+   * ii. Get contents
+   * https://developer.github.com/v3/repos/contents/#get-contents
+   */
+  get("/api/v3/repos/:owner/:repository/contents/*")(referrersOnly { repository =>
+    getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
+  })
+
+  private def getContents(repository: RepositoryService.RepositoryInfo, path: String, refStr: String) = {
+    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
+      val (dirName, fileName) = pathStr.lastIndexOf('/') match {
+        case -1 =>
+          (".", pathStr)
+        case n =>
+          (pathStr.take(n), pathStr.drop(n + 1))
+      }
+      getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
+    }
+
+    using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+      val fileList = getFileList(git, refStr, path)
+      if (fileList.isEmpty) { // file or NotFound
+        getFileInfo(git, refStr, path)
+          .flatMap { f =>
+            val largeFile = params.get("large_file").exists(s => s.equals("true"))
+            val content = getContentFromId(git, f.id, largeFile)
+            request.getHeader("Accept") match {
+              case "application/vnd.github.v3.raw" => {
+                contentType = "application/vnd.github.v3.raw"
+                content
+              }
+              case "application/vnd.github.v3.html" if isRenderable(f.name) => {
+                contentType = "application/vnd.github.v3.html"
+                content.map { c =>
+                  List(
+                    "<div data-path=\"",
+                    path,
+                    "\" id=\"file\">",
+                    "<article>",
+                    renderMarkup(path.split("/").toList, new String(c), refStr, repository, false, false, true).body,
+                    "</article>",
+                    "</div>"
+                  ).mkString
+                }
+              }
+              case "application/vnd.github.v3.html" => {
+                contentType = "application/vnd.github.v3.html"
+                content.map { c =>
+                  List(
+                    "<div data-path=\"",
+                    path,
+                    "\" id=\"file\">",
+                    "<div class=\"plain\">",
+                    "<pre>",
+                    play.twirl.api.HtmlFormat.escape(new String(c)).body,
+                    "</pre>",
+                    "</div>",
+                    "</div>"
+                  ).mkString
+                }
+              }
+              case _ =>
+                Some(JsonFormat(ApiContents(f, RepositoryName(repository), content)))
+            }
+          }
+          .getOrElse(NotFound())
+
+      } else { // directory
+        JsonFormat(fileList.map { f =>
+          ApiContents(f, RepositoryName(repository), None)
+        })
+      }
+    }
+  }
+  /*
+   * iii. Create a file or iv. Update a file
+   * https://developer.github.com/v3/repos/contents/#create-a-file
+   * https://developer.github.com/v3/repos/contents/#update-a-file
+   * if sha is presented, update a file else create a file.
+   * requested #2112
+   */
+
+  put("/api/v3/repos/:owner/:repository/contents/*")(writableUsersOnly { repository =>
+    JsonFormat(for {
+      data <- extractFromJsonBody[CreateAFile]
+    } yield {
+      val branch = data.branch.getOrElse(repository.repository.defaultBranch)
+      val commit = using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+        revCommit.name
+      }
+      val paths = multiParams("splat").head.split("/")
+      val path = paths.take(paths.size - 1).toList.mkString("/")
+      if (data.sha.isDefined && data.sha.get != commit) {
+        ApiError("The blob SHA is not matched.", Some("https://developer.github.com/v3/repos/contents/#update-a-file"))
+      } else {
+        val objectId = commitFile(
+          repository,
+          branch,
+          path,
+          Some(paths.last),
+          if (data.sha.isDefined) {
+            Some(paths.last)
+          } else {
+            None
+          },
+          StringUtil.base64Decode(data.content),
+          data.message,
+          commit,
+          context.loginAccount.get,
+          data.committer.map(_.name).getOrElse(context.loginAccount.get.fullName),
+          data.committer.map(_.email).getOrElse(context.loginAccount.get.mailAddress)
+        )
+        ApiContents("file", paths.last, path, objectId.name, None, None)(RepositoryName(repository))
+      }
+    })
+  })
+
+  /*
+   * v. Delete a file
+   * https://developer.github.com/v3/repos/contents/#delete-a-file
+   * should be implemented
+   */
+
+  /*
+ * vi. Get archive link
+ * https://developer.github.com/v3/repos/contents/#get-archive-link
+ */
+
+}

src/main/scala/gitbucket/core/controller/api/ApiRepositoryControllerBase.scala

@@ -0,0 +1,204 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api._
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, RepositoryCreationService, RepositoryService}
+import gitbucket.core.servlet.Database
+import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util._
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.SyntaxSugars.using
+import gitbucket.core.model.Profile.profile.blockingApi._
+import org.eclipse.jgit.api.Git
+
+import scala.concurrent.Await
+import scala.concurrent.duration.Duration
+
+trait ApiRepositoryControllerBase extends ControllerBase {
+  self: RepositoryService
+    with RepositoryCreationService
+    with AccountService
+    with OwnerAuthenticator
+    with UsersAuthenticator
+    with GroupManagerAuthenticator
+    with ReferrerAuthenticator
+    with ReadableUsersAuthenticator
+    with WritableUsersAuthenticator =>
+
+  /**
+   * i. List your repositories
+   * https://developer.github.com/v3/repos/#list-your-repositories
+   */
+  get("/api/v3/user/repos")(usersOnly {
+    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map { r =>
+      ApiRepository(r, getAccountByUserName(r.owner).get)
+    })
+  })
+
+  /**
+   * ii. List user repositories
+   * https://developer.github.com/v3/repos/#list-user-repositories
+   */
+  get("/api/v3/users/:userName/repos") {
+    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("userName"))).map { r =>
+      ApiRepository(r, getAccountByUserName(r.owner).get)
+    })
+  }
+
+  /**
+   * iii. List organization repositories
+   * https://developer.github.com/v3/repos/#list-organization-repositories
+   */
+  get("/api/v3/orgs/:orgName/repos") {
+    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("orgName"))).map { r =>
+      ApiRepository(r, getAccountByUserName(r.owner).get)
+    })
+  }
+
+  /*
+   * iv. List all public repositories
+   * https://developer.github.com/v3/repos/#list-all-public-repositories
+   * Not implemented
+   */
+
+  /*
+   * v. Create
+   * https://developer.github.com/v3/repos/#create
+   * Implemented with two methods (user/orgs)
+   */
+
+  /**
+   * Create user repository
+   * https://developer.github.com/v3/repos/#create
+   */
+  post("/api/v3/user/repos")(usersOnly {
+    val owner = context.loginAccount.get.userName
+    (for {
+      data <- extractFromJsonBody[CreateARepository] if data.isValid
+    } yield {
+      LockUtil.lock(s"${owner}/${data.name}") {
+        if (getRepository(owner, data.name).isEmpty) {
+          val f = createRepository(
+            context.loginAccount.get,
+            owner,
+            data.name,
+            data.description,
+            data.`private`,
+            data.auto_init
+          )
+          Await.result(f, Duration.Inf)
+
+          val repository = Database() withTransaction { session =>
+            getRepository(owner, data.name)(session).get
+          }
+          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
+        } else {
+          ApiError(
+            "A repository with this name already exists on this account",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
+        }
+      }
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * Create group repository
+   * https://developer.github.com/v3/repos/#create
+   */
+  post("/api/v3/orgs/:org/repos")(managersOnly {
+    val groupName = params("org")
+    (for {
+      data <- extractFromJsonBody[CreateARepository] if data.isValid
+    } yield {
+      LockUtil.lock(s"${groupName}/${data.name}") {
+        if (getRepository(groupName, data.name).isEmpty) {
+          val f = createRepository(
+            context.loginAccount.get,
+            groupName,
+            data.name,
+            data.description,
+            data.`private`,
+            data.auto_init
+          )
+          Await.result(f, Duration.Inf)
+          val repository = Database() withTransaction { session =>
+            getRepository(groupName, data.name).get
+          }
+          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
+        } else {
+          ApiError(
+            "A repository with this name already exists for this group",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
+        }
+      }
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * vi. Get
+   * https://developer.github.com/v3/repos/#get
+   */
+  get("/api/v3/repos/:owner/:repository")(referrersOnly { repository =>
+    JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(repository.owner).get)))
+  })
+
+  /*
+   * vii. Edit
+   * https://developer.github.com/v3/repos/#edit
+   */
+
+  /*
+   * viii. List all topics for a repository
+   * https://developer.github.com/v3/repos/#list-all-topics-for-a-repository
+   */
+
+  /*
+   * ix. Replace all topics for a repository
+   * https://developer.github.com/v3/repos/#replace-all-topics-for-a-repository
+   */
+
+  /*
+   * x. List contributors
+   * https://developer.github.com/v3/repos/#list-contributors
+   */
+
+  /*
+   * xi. List languages
+   * https://developer.github.com/v3/repos/#list-languages
+   */
+
+  /*
+   * xii. List teams
+   * https://developer.github.com/v3/repos/#list-teams
+   */
+
+  /*
+   * xiii. List tags
+   * https://developer.github.com/v3/repos/#list-tags
+   */
+
+  /*
+   * xiv. Delete a repository
+   * https://developer.github.com/v3/repos/#delete-a-repository
+   */
+
+  /*
+   * xv. Transfer a repository
+   * https://developer.github.com/v3/repos/#transfer-a-repository
+   */
+
+  /**
+   * non-GitHub compatible API for Jenkins-Plugin
+   */
+  get("/api/v3/repos/:owner/:repository/raw/*")(referrersOnly { repository =>
+    val (id, path) = repository.splitPath(multiParams("splat").head)
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        responseRawFile(git, objectId, path, repository)
+      } getOrElse NotFound()
+    }
+  })
+}

src/main/scala/gitbucket/core/controller/api/ApiRepositoryStatusControllerBase.scala

@@ -0,0 +1,80 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api._
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.model.CommitState
+import gitbucket.core.service.{AccountService, CommitStatusService}
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.{JGitUtil, ReferrerAuthenticator, WritableUsersAuthenticator}
+
+trait ApiRepositoryStatusControllerBase extends ControllerBase {
+  self: AccountService with CommitStatusService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+
+  /*
+   * i. Create a status
+   * https://developer.github.com/v3/repos/statuses/#create-a-status
+   */
+  post("/api/v3/repos/:owner/:repository/statuses/:sha")(writableUsersOnly { repository =>
+    (for {
+      ref <- params.get("sha")
+      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+      data <- extractFromJsonBody[CreateAStatus] if data.isValid
+      creator <- context.loginAccount
+      state <- CommitState.valueOf(data.state)
+      statusId = createCommitStatus(
+        repository.owner,
+        repository.name,
+        sha,
+        data.context.getOrElse("default"),
+        state,
+        data.target_url,
+        data.description,
+        new java.util.Date(),
+        creator
+      )
+      status <- getCommitStatus(repository.owner, repository.name, statusId)
+    } yield {
+      JsonFormat(ApiCommitStatus(status, ApiUser(creator)))
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * ii. List statuses for a specific ref
+   * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
+   * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
+   */
+  val listStatusesRoute = get("/api/v3/repos/:owner/:repository/commits/:ref/statuses")(referrersOnly { repository =>
+    (for {
+      ref <- params.get("ref")
+      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+    } yield {
+      JsonFormat(getCommitStatuesWithCreator(repository.owner, repository.name, sha).map {
+        case (status, creator) =>
+          ApiCommitStatus(status, ApiUser(creator))
+      })
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
+   * legacy route
+   */
+  get("/api/v3/repos/:owner/:repository/statuses/:ref") {
+    listStatusesRoute.action()
+  }
+
+  /*
+   * iii. Get the combined status for a specific ref
+   * https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
+   * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
+   */
+  get("/api/v3/repos/:owner/:repository/commits/:ref/status")(referrersOnly { repository =>
+    (for {
+      ref <- params.get("ref")
+      owner <- getAccountByUserName(repository.owner)
+      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+    } yield {
+      val statuses = getCommitStatuesWithCreator(repository.owner, repository.name, sha)
+      JsonFormat(ApiCombinedCommitStatus(sha, statuses, ApiRepository(repository, owner)))
+    }) getOrElse NotFound()
+  })
+}

src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala

@@ -0,0 +1,114 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiUser, CreateAUser, JsonFormat, UpdateAUser}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, RepositoryService}
+import gitbucket.core.util.{AdminAuthenticator, UsersAuthenticator}
+import gitbucket.core.util.Implicits._
+import org.scalatra.NoContent
+
+trait ApiUserControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService with AdminAuthenticator with UsersAuthenticator =>
+
+  /**
+   * i. Get a single user
+   * 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")).map { account =>
+      JsonFormat(ApiUser(account))
+    } getOrElse NotFound()
+  }
+
+  /**
+   * ii. Get the authenticated user
+   * https://developer.github.com/v3/users/#get-the-authenticated-user
+   */
+  get("/api/v3/user") {
+    context.loginAccount.map { account =>
+      JsonFormat(ApiUser(account))
+    } getOrElse Unauthorized()
+  }
+
+  /*
+   * iii. Update the authenticated user
+   * https://developer.github.com/v3/users/#update-the-authenticated-user
+   */
+  patch("/api/v3/user")(usersOnly {
+    (for {
+      data <- extractFromJsonBody[UpdateAUser]
+    } yield {
+      val loginAccount = context.loginAccount.get
+      val updatedAccount = loginAccount.copy(
+        mailAddress = data.email.getOrElse(loginAccount.mailAddress)
+      )
+      updateAccount(updatedAccount)
+      JsonFormat(ApiUser(updatedAccount))
+    })
+  })
+
+  /*
+   * iv. Get contextual information about a user
+   * https://developer.github.com/v3/users/#get-contextual-information-about-a-user
+   */
+
+  /*
+   * v. Get all users
+   * https://developer.github.com/v3/users/#get-all-users
+   */
+  get("/api/v3/users") {
+    JsonFormat(getAllUsers(false, false).map(a => ApiUser(a)))
+  }
+
+  /*
+   * ghe: i. Create a new user
+   * https://developer.github.com/enterprise/2.14/v3/enterprise-admin/users/#create-a-new-user
+   */
+  post("/api/v3/admin/users")(adminOnly {
+    for {
+      data <- extractFromJsonBody[CreateAUser]
+    } yield {
+      val user = createAccount(
+        data.login,
+        data.password,
+        data.fullName.getOrElse(data.login),
+        data.email,
+        data.isAdmin.getOrElse(false),
+        data.description,
+        data.url
+      )
+      JsonFormat(ApiUser(user))
+    }
+  })
+
+  /*
+   * ghe: vii. Suspend a user
+   * https://developer.github.com/enterprise/2.14/v3/enterprise-admin/users/#suspend-a-user
+   */
+  put("/api/v3/users/:userName/suspended")(adminOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName) match {
+      case Some(targetAccount) =>
+        removeUserRelatedData(userName)
+        updateAccount(targetAccount.copy(isRemoved = true))
+        NoContent()
+      case None =>
+        NotFound()
+    }
+  })
+
+  /*
+   * ghe: vii. Unsuspend a user
+   * https://developer.github.com/enterprise/2.14/v3/enterprise-admin/users/#unsuspend-a-user
+   */
+  delete("/api/v3/users/:userName/suspended")(adminOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName) match {
+      case Some(targetAccount) =>
+        updateAccount(targetAccount.copy(isRemoved = false))
+        NoContent()
+      case None =>
+        NotFound()
+    }
+  })
+}

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

@@ -0,0 +1,29 @@
+package gitbucket.core.model
+
+trait GpgKeyComponent { self: Profile =>
+  import profile.api._
+
+  lazy val GpgKeys = TableQuery[GpgKeys]
+
+  class GpgKeys(tag: Tag) extends Table[GpgKey](tag, "GPG_KEY") {
+    val userName = column[String]("USER_NAME")
+    val keyId = column[Int]("KEY_ID", O AutoInc)
+    val gpgKeyId = column[Long]("GPG_KEY_ID")
+    val title = column[String]("TITLE")
+    val publicKey = column[String]("PUBLIC_KEY")
+    def * = (userName, keyId, gpgKeyId, title, publicKey) <> (GpgKey.tupled, GpgKey.unapply)
+
+    def byPrimaryKey(userName: String, keyId: Int) =
+      (this.userName === userName.bind) && (this.keyId === keyId.bind)
+    def byGpgKeyId(gpgKeyId: Long) =
+      this.gpgKeyId === gpgKeyId.bind
+  }
+}
+
+case class GpgKey(
+  userName: String,
+  keyId: Int = 0,
+  gpgKeyId: Long,
+  title: String,
+  publicKey: String
+)

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

@@ -59,6 +59,7 @@ trait CoreProfile
     with PullRequestComponent
     with RepositoryComponent
     with SshKeyComponent
+    with GpgKeyComponent
     with RepositoryWebHookComponent
     with RepositoryWebHookEventComponent
     with AccountWebHookComponent

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

@@ -8,7 +8,7 @@ import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.SyntaxSugars._
 import io.github.gitbucket.solidbase.model.Version
-import org.apache.sshd.server.Command
+import org.apache.sshd.server.command.Command
 import play.twirl.api.Html
 
 /**
@@ -47,6 +47,20 @@ abstract class Plugin {
     settings: SystemSettings
   ): Seq[(String, ControllerBase)] = Nil
 
+  /**
+   * Override to declare this plug-in provides anonymous accessible paths.
+   */
+  val anonymousAccessiblePaths: Seq[String] = Nil
+
+  /**
+   * Override to declare this plug-in provides anonymous accessible paths.
+   */
+  def anonymousAccessiblePaths(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[String] = Nil
+
   /**
    * Override to declare this plug-in provides JavaScript.
    */
@@ -333,6 +347,10 @@ abstract class Plugin {
       case (path, controller) =>
         registry.addController(path, controller)
     }
+    (anonymousAccessiblePaths ++ anonymousAccessiblePaths(registry, context, settings)).foreach {
+      case (path) =>
+        registry.addAnonymousAccessiblePath(path)
+    }
     (javaScripts ++ javaScripts(registry, context, settings)).foreach {
       case (path, script) =>
         registry.addJavaScript(path, script)

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

@@ -1,6 +1,6 @@
 package gitbucket.core.plugin
 
-import java.io.{File, FilenameFilter, InputStream}
+import java.io.{File, FilenameFilter}
 import java.net.URLClassLoader
 import java.nio.file.{Files, Paths, StandardWatchEventKinds}
 import java.util.Base64
@@ -15,7 +15,6 @@ 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.SyntaxSugars._
 import gitbucket.core.util.DatabaseConfig
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.HttpClientUtil._
@@ -24,7 +23,7 @@ import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
 import org.apache.commons.io.FileUtils
 import org.apache.http.client.methods.HttpGet
-import org.apache.sshd.server.Command
+import org.apache.sshd.server.command.Command
 import org.slf4j.LoggerFactory
 import play.twirl.api.Html
 
@@ -35,6 +34,7 @@ class PluginRegistry {
   private val plugins = new ConcurrentLinkedQueue[PluginInfo]
   private val javaScripts = new ConcurrentLinkedQueue[(String, String)]
   private val controllers = new ConcurrentLinkedQueue[(ControllerBase, String)]
+  private val anonymousAccessiblePaths = new ConcurrentLinkedQueue[String]
   private val images = new ConcurrentHashMap[String, String]
   private val renderers = new ConcurrentHashMap[String, Renderer]
   renderers.put("md", MarkdownRenderer)
@@ -70,25 +70,16 @@ class PluginRegistry {
     images.put(id, encoded)
   }
 
-  @deprecated("Use addImage(id: String, bytes: Array[Byte]) instead", "3.4.0")
-  def addImage(id: String, in: InputStream): Unit = {
-    val bytes = using(in) { in =>
-      val bytes = new Array[Byte](in.available)
-      in.read(bytes)
-      bytes
-    }
-    addImage(id, bytes)
-  }
-
   def getImage(id: String): String = images.get(id)
 
   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.asScala.toSeq
 
+  def addAnonymousAccessiblePath(path: String): Unit = anonymousAccessiblePaths.add(path)
+
+  def getAnonymousAccessiblePaths(): Seq[String] = anonymousAccessiblePaths.asScala.toSeq
+
   def addJavaScript(path: String, script: String): Unit =
     javaScripts.add((path, script)) //javaScripts += ((path, script))
 
@@ -340,6 +331,7 @@ object PluginRegistry {
         instance.getPlugins().find(_.pluginId == pluginId) match {
           case Some(x) => {
             logger.warn(s"Plugin ${pluginId} is duplicated. ${x.pluginJar.getName} is available.")
+            classLoader.close()
           }
           case None => {
             // Migration
@@ -379,7 +371,9 @@ object PluginRegistry {
           }
         }
       } catch {
-        case e: Throwable => logger.error(s"Error during plugin initialization: ${pluginJar.getName}", e)
+        case e: Throwable =>
+          logger.error(s"Error during plugin initialization: ${pluginJar.getName}", e)
+          classLoader.close()
       }
     }
 
@@ -418,6 +412,13 @@ object PluginRegistry {
     }
   }
 
+  def getPluginInfoFromClassLoader(classLoader: ClassLoader): Option[PluginInfo] = {
+    instance
+      .getPlugins()
+      .find { info =>
+        info.classLoader.equals(classLoader)
+      }
+  }
 }
 
 case class Link(

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

@@ -25,10 +25,13 @@ object MarkdownRenderer extends Renderer {
       Markdown.toHtml(
         markdown = fileContent,
         repository = repository,
+        branch = branch,
         enableWikiLink = enableWikiLink,
         enableRefsLink = enableRefsLink,
         enableAnchor = enableAnchor,
-        enableLineBreaks = false
+        enableLineBreaks = false,
+        enableTaskList = true,
+        hasWritePermission = false
       )(context)
     )
   }

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

@@ -7,6 +7,7 @@ import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
 import gitbucket.core.util.{LDAPUtil, StringUtil}
 import StringUtil._
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 
 trait AccountService {
@@ -163,8 +164,8 @@ trait AccountService {
     isAdmin: Boolean,
     description: Option[String],
     url: Option[String]
-  )(implicit s: Session): Unit =
-    Accounts insert Account(
+  )(implicit s: Session): Account = {
+    val account = Account(
       userName = userName,
       password = password,
       fullName = fullName,
@@ -179,6 +180,18 @@ trait AccountService {
       isRemoved = false,
       description = description
     )
+    Accounts insert account
+    account
+  }
+
+  def suspendAccount(account: Account)(implicit s: Session): Unit = {
+    // Remove from GROUP_MEMBER and COLLABORATOR
+    removeUserRelatedData(account.userName)
+    updateAccount(account.copy(isRemoved = true))
+
+    // call hooks
+    PluginRegistry().getAccountHooks.foreach(_.deleted(account.userName))
+  }
 
   def updateAccount(account: Account)(implicit s: Session): Unit =
     Accounts
@@ -227,8 +240,8 @@ trait AccountService {
   def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
     Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)
 
-  def createGroup(groupName: String, description: Option[String], url: Option[String])(implicit s: Session): Unit =
-    Accounts insert Account(
+  def createGroup(groupName: String, description: Option[String], url: Option[String])(implicit s: Session): Account = {
+    val group = Account(
       userName = groupName,
       password = "",
       fullName = groupName,
@@ -243,6 +256,9 @@ trait AccountService {
       isRemoved = false,
       description = description
     )
+    Accounts insert group
+    group
+  }
 
   def updateGroup(groupName: String, description: Option[String], url: Option[String], removed: Boolean)(
     implicit s: Session
@@ -278,6 +294,15 @@ trait AccountService {
     Collaborators.filter(_.collaboratorName === userName.bind).delete
   }
 
+  def removeUser(account: Account)(implicit s: Session): Unit = {
+    // Remove from GROUP_MEMBER and COLLABORATOR
+    removeUserRelatedData(account.userName)
+    updateAccount(account.copy(isRemoved = true))
+
+    // call hooks
+    PluginRegistry().getAccountHooks.foreach(_.deleted(account.userName))
+  }
+
   def getGroupNames(userName: String)(implicit s: Session): List[String] = {
     List(userName) ++
       Collaborators.filter(_.collaboratorName === userName.bind).sortBy(_.userName).map(_.userName).list.distinct

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

@@ -352,15 +352,19 @@ trait ActivityService {
       currentDate
     )
 
-  def recordReleaseActivity(userName: String, repositoryName: String, activityUserName: String, name: String)(
-    implicit s: Session
-  ): Unit =
+  def recordReleaseActivity(
+    userName: String,
+    repositoryName: String,
+    activityUserName: String,
+    releaseName: String,
+    tagName: String
+  )(implicit s: Session): Unit =
     Activities insert Activity(
       userName,
       repositoryName,
       activityUserName,
       "release",
-      s"[user:${activityUserName}] released ${name} at [repo:${userName}/${repositoryName}]",
+      s"[user:${activityUserName}] released [release:${userName}/${repositoryName}/${tagName}:${releaseName}] at [repo:${userName}/${repositoryName}]",
       None,
       currentDate
     )

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

@@ -2,15 +2,20 @@ package gitbucket.core.service
 
 import java.io.File
 
-import gitbucket.core.model.CommitComment
+import gitbucket.core.api.JsonFormat
+import gitbucket.core.controller.Context
+import gitbucket.core.model.{Account, CommitComment}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.{FileUtil, StringUtil}
 import org.apache.commons.io.FileUtils
 
 trait CommitsService {
+  self: ActivityService with PullRequestService with WebHookPullRequestReviewCommentService =>
 
   def getCommitComments(owner: String, repository: String, commitId: String, includePullRequest: Boolean)(
     implicit s: Session
@@ -28,21 +33,21 @@ trait CommitsService {
       None
 
   def createCommitComment(
-    owner: String,
-    repository: String,
+    repository: RepositoryInfo,
     commitId: String,
-    loginUser: String,
+    loginAccount: Account,
     content: String,
     fileName: Option[String],
     oldLine: Option[Int],
     newLine: Option[Int],
+    diff: Option[String],
     issueId: Option[Int]
-  )(implicit s: Session): Int =
-    CommitComments returning CommitComments.map(_.commentId) insert CommitComment(
-      userName = owner,
-      repositoryName = repository,
+  )(implicit s: Session, c: JsonFormat.Context, context: Context): Int = {
+    val commentId = CommitComments returning CommitComments.map(_.commentId) insert CommitComment(
+      userName = repository.owner,
+      repositoryName = repository.name,
       commitId = commitId,
-      commentedUserName = loginUser,
+      commentedUserName = loginAccount.userName,
       content = content,
       fileName = fileName,
       oldLine = oldLine,
@@ -55,6 +60,56 @@ trait CommitsService {
       originalNewLine = newLine
     )
 
+    for {
+      fileName <- fileName
+      diff <- diff
+    } {
+      saveCommitCommentDiff(
+        repository.owner,
+        repository.name,
+        commitId,
+        fileName,
+        oldLine,
+        newLine,
+        diff
+      )
+    }
+
+    val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
+    issueId match {
+      case Some(issueId) =>
+        getPullRequest(repository.owner, repository.name, issueId).foreach {
+          case (issue, pullRequest) =>
+            recordCommentPullRequestActivity(
+              repository.owner,
+              repository.name,
+              loginAccount.userName,
+              issueId,
+              content
+            )
+            PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId, content, issue, repository))
+            callPullRequestReviewCommentWebHook(
+              "create",
+              comment,
+              repository,
+              issue,
+              pullRequest,
+              loginAccount
+            )
+        }
+      case None =>
+        recordCommentCommitActivity(
+          repository.owner,
+          repository.name,
+          loginAccount.userName,
+          commitId,
+          content
+        )
+    }
+
+    commentId
+  }
+
   def updateCommitCommentPosition(commentId: Int, commitId: String, oldLine: Option[Int], newLine: Option[Int])(
     implicit s: Session
   ): Unit =

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

@@ -0,0 +1,29 @@
+package gitbucket.core.service
+
+import java.io.ByteArrayInputStream
+
+import gitbucket.core.model.GpgKey
+
+import collection.JavaConverters._
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
+import org.bouncycastle.bcpg.ArmoredInputStream
+import org.bouncycastle.openpgp.PGPPublicKeyRing
+import org.bouncycastle.openpgp.bc.BcPGPObjectFactory
+
+trait GpgKeyService {
+  def getGpgPublicKeys(userName: String)(implicit s: Session): List[GpgKey] =
+    GpgKeys.filter(_.userName === userName.bind).sortBy(_.gpgKeyId).list
+
+  def addGpgPublicKey(userName: String, title: String, publicKey: String)(implicit s: Session): Unit = {
+    val pubKeyOf = new BcPGPObjectFactory(new ArmoredInputStream(new ByteArrayInputStream(publicKey.getBytes)))
+    pubKeyOf.iterator().asScala.foreach {
+      case keyRing: PGPPublicKeyRing =>
+        val key = keyRing.getPublicKey()
+        GpgKeys.insert(GpgKey(userName = userName, gpgKeyId = key.getKeyID, title = title, publicKey = publicKey))
+    }
+  }
+
+  def deleteGpgPublicKey(userName: String, keyId: Int)(implicit s: Session): Unit =
+    GpgKeys.filter(_.byPrimaryKey(userName, keyId)).delete
+}

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

@@ -87,9 +87,9 @@ trait HandleCommentService {
                 case "reopen" => "reopened"
               }
               if (issue.isPullRequest)
-                callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, loginAccount)
+                callPullRequestWebHook(webHookAction, repository, issue.issueId, loginAccount)
               else
-                callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, loginAccount)
+                callIssuesWebHook(webHookAction, repository, issue, loginAccount)
           }
 
           // call hooks

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

@@ -57,7 +57,7 @@ trait IssueCreationService {
     createReferComment(owner, name, issue, title + " " + body.getOrElse(""), loginAccount)
 
     // call web hooks
-    callIssuesWebHook("opened", repository, issue, context.baseUrl, loginAccount)
+    callIssuesWebHook("opened", repository, issue, loginAccount)
 
     // call hooks
     PluginRegistry().getIssueHooks.foreach(_.created(issue, repository))

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

@@ -475,6 +475,25 @@ trait IssuesService {
     IssueLabels filter (_.byPrimaryKey(owner, repository, issueId, labelId)) delete
   }
 
+  def deleteAllIssueLabels(owner: String, repository: String, issueId: Int, insertComment: Boolean = false)(
+    implicit context: Context,
+    s: Session
+  ): Int = {
+    if (insertComment) {
+      IssueComments insert IssueComment(
+        userName = owner,
+        repositoryName = repository,
+        issueId = issueId,
+        action = "delete_label",
+        commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
+        content = "All labels",
+        registeredDate = currentDate,
+        updatedDate = currentDate
+      )
+    }
+    IssueLabels filter (_.byIssue(owner, repository, issueId)) delete
+  }
+
   def createComment(
     owner: String,
     repository: String,
@@ -507,6 +526,15 @@ trait IssuesService {
       .update(title, content, currentDate)
   }
 
+  def changeIssueToPullRequest(owner: String, repository: String, issueId: Int)(implicit s: Session) = {
+    Issues
+      .filter(_.byPrimaryKey(owner, repository, issueId))
+      .map { t =>
+        t.pullRequest
+      }
+      .update(true)
+  }
+
   def updateAssignedUserName(
     owner: String,
     repository: String,

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

@@ -3,6 +3,7 @@ package gitbucket.core.service
 import gitbucket.core.model.Label
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.util.StringUtil
 
 trait LabelsService {
 
@@ -24,6 +25,11 @@ trait LabelsService {
     )
   }
 
+  def createLabel(owner: String, repository: String, labelName: String)(implicit s: Session): Int = {
+    val color = StringUtil.md5(labelName).substring(0, 6)
+    createLabel(owner, repository, labelName, 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,8 +1,16 @@
 package gitbucket.core.service
 
-import gitbucket.core.model.Account
+import gitbucket.core.api.JsonFormat
+import gitbucket.core.controller.Context
+import gitbucket.core.model.{Account, PullRequest, WebHook}
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Directory._
+import gitbucket.core.util.{JGitUtil, LockUtil}
 import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import org.eclipse.jgit.merge.{MergeStrategy, Merger, RecursiveMerger}
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.transport.RefSpec
@@ -13,6 +21,13 @@ import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
 import scala.collection.JavaConverters._
 
 trait MergeService {
+  self: AccountService
+    with ActivityService
+    with IssuesService
+    with RepositoryService
+    with PullRequestService
+    with WebHookPullRequestService =>
+
   import MergeService._
 
   /**
@@ -43,7 +58,13 @@ trait MergeService {
   }
 
   /** merge the pull request with a merge commit */
-  def mergePullRequest(git: Git, branch: String, issueId: Int, message: String, committer: PersonIdent): Unit = {
+  def mergePullRequest(
+    git: Git,
+    branch: String,
+    issueId: Int,
+    message: String,
+    committer: PersonIdent
+  ): ObjectId = {
     new MergeCacheInfo(git, branch, issueId).merge(message, committer)
   }
 
@@ -54,12 +75,18 @@ trait MergeService {
     issueId: Int,
     commits: Seq[RevCommit],
     committer: PersonIdent
-  ): Unit = {
+  ): ObjectId = {
     new MergeCacheInfo(git, branch, issueId).rebase(committer, commits)
   }
 
   /** squash commits in the pull request and append it */
-  def squashPullRequest(git: Git, branch: String, issueId: Int, message: String, committer: PersonIdent): Unit = {
+  def squashPullRequest(
+    git: Git,
+    branch: String,
+    issueId: Int,
+    message: String,
+    committer: PersonIdent
+  ): ObjectId = {
     new MergeCacheInfo(git, branch, issueId).squash(message, committer)
   }
 
@@ -136,27 +163,225 @@ trait MergeService {
     tryMergeRemote(userName, repositoryName, branch, requestUserName, requestRepositoryName, requestBranch).left.toOption
 
   def pullRemote(
-    localUserName: String,
-    localRepositoryName: String,
+    localRepository: RepositoryInfo,
     localBranch: String,
-    remoteUserName: String,
-    remoteRepositoryName: String,
+    remoteRepository: RepositoryInfo,
     remoteBranch: String,
     loginAccount: Account,
-    message: String
-  ): Option[ObjectId] = {
+    message: String,
+    pullreq: Option[PullRequest]
+  )(implicit s: Session, c: JsonFormat.Context): Option[ObjectId] = {
+    val localUserName = localRepository.owner
+    val localRepositoryName = localRepository.name
+    val remoteUserName = remoteRepository.owner
+    val remoteRepositoryName = remoteRepository.name
     tryMergeRemote(localUserName, localRepositoryName, localBranch, remoteUserName, remoteRepositoryName, remoteBranch).map {
       case (newTreeId, oldBaseId, oldHeadId) =>
         using(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
+          val existIds = JGitUtil.getAllCommitIds(git).toSet
+
           val committer = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
           val newCommit =
             Util.createMergeCommit(git.getRepository, newTreeId, committer, message, Seq(oldBaseId, oldHeadId))
           Util.updateRefs(git.getRepository, s"refs/heads/${localBranch}", newCommit, false, committer, Some("merge"))
+
+          val commits = git.log
+            .addRange(oldBaseId, newCommit)
+            .call
+            .iterator
+            .asScala
+            .map(c => new JGitUtil.CommitInfo(c))
+            .toList
+
+          commits.foreach { commit =>
+            if (!existIds.contains(commit.id)) {
+              createIssueComment(localUserName, localRepositoryName, commit)
+            }
+          }
+
+          // record activity
+          recordPushActivity(
+            localUserName,
+            localRepositoryName,
+            loginAccount.userName,
+            localBranch,
+            commits
+          )
+
+          // close issue by commit message
+          if (localBranch == localRepository.repository.defaultBranch) {
+            commits.foreach { commit =>
+              closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, localUserName, localRepositoryName)
+                .foreach { issueId =>
+                  getIssue(localRepository.owner, localRepository.name, issueId.toString).foreach { issue =>
+                    callIssuesWebHook("closed", localRepository, issue, loginAccount)
+                    PluginRegistry().getIssueHooks
+                      .foreach(
+                        _.closedByCommitComment(issue, localRepository, commit.fullMessage, loginAccount)
+                      )
+                  }
+                }
+            }
+          }
+
+          pullreq.foreach { pullreq =>
+            callWebHookOf(localRepository.owner, localRepository.name, WebHook.Push) {
+              for {
+                ownerAccount <- getAccountByUserName(localRepository.owner)
+              } yield {
+                WebHookService.WebHookPushPayload(
+                  git,
+                  loginAccount,
+                  pullreq.requestBranch,
+                  localRepository,
+                  commits,
+                  ownerAccount,
+                  oldId = oldBaseId,
+                  newId = newCommit
+                )
+              }
+            }
+          }
         }
         oldBaseId
     }.toOption
   }
 
+  def mergePullRequest(
+    repository: RepositoryInfo,
+    issueId: Int,
+    loginAccount: Account,
+    message: String,
+    strategy: String
+  )(implicit s: Session, c: JsonFormat.Context, context: Context): Either[String, ObjectId] = {
+    if (repository.repository.options.mergeOptions.split(",").contains(strategy)) {
+      LockUtil.lock(s"${repository.owner}/${repository.name}") {
+        getPullRequest(repository.owner, repository.name, issueId)
+          .map {
+            case (issue, pullreq) =>
+              using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+                // mark issue as merged and close.
+                val commentId =
+                  createComment(repository.owner, repository.name, loginAccount.userName, issueId, message, "merge")
+                createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close")
+                updateClosed(repository.owner, repository.name, issueId, true)
+
+                // record activity
+                recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, message)
+
+                val (commits, _) = getRequestCompareInfo(
+                  repository.owner,
+                  repository.name,
+                  pullreq.commitIdFrom,
+                  pullreq.requestUserName,
+                  pullreq.requestRepositoryName,
+                  pullreq.commitIdTo
+                )
+
+                val revCommits = using(new RevWalk(git.getRepository)) { revWalk =>
+                  commits.flatten.map { commit =>
+                    revWalk.parseCommit(git.getRepository.resolve(commit.id))
+                  }
+                }.reverse
+
+                // merge git repository
+                (strategy match {
+                  case "merge-commit" =>
+                    Some(
+                      mergePullRequest(
+                        git,
+                        pullreq.branch,
+                        issueId,
+                        s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" + message,
+                        new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+                      )
+                    )
+                  case "rebase" =>
+                    Some(
+                      rebasePullRequest(
+                        git,
+                        pullreq.branch,
+                        issueId,
+                        revCommits,
+                        new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+                      )
+                    )
+                  case "squash" =>
+                    Some(
+                      squashPullRequest(
+                        git,
+                        pullreq.branch,
+                        issueId,
+                        s"${issue.title} (#${issueId})\n\n" + message,
+                        new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+                      )
+                    )
+                  case _ =>
+                    None
+                }) match {
+                  case Some(newCommitId) =>
+                    // close issue by content of pull request
+                    val defaultBranch = getRepository(repository.owner, repository.name).get.repository.defaultBranch
+                    if (pullreq.branch == defaultBranch) {
+                      commits.flatten.foreach { commit =>
+                        closeIssuesFromMessage(
+                          commit.fullMessage,
+                          loginAccount.userName,
+                          repository.owner,
+                          repository.name
+                        ).foreach { issueId =>
+                          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                            callIssuesWebHook("closed", repository, issue, loginAccount)
+                            PluginRegistry().getIssueHooks
+                              .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
+                          }
+                        }
+                      }
+                      val issueContent = issue.title + " " + issue.content.getOrElse("")
+                      closeIssuesFromMessage(
+                        issueContent,
+                        loginAccount.userName,
+                        repository.owner,
+                        repository.name
+                      ).foreach { issueId =>
+                        getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                          callIssuesWebHook("closed", repository, issue, loginAccount)
+                          PluginRegistry().getIssueHooks
+                            .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
+                        }
+                      }
+                      closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+                        .foreach { issueId =>
+                          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                            callIssuesWebHook("closed", repository, issue, loginAccount)
+                            PluginRegistry().getIssueHooks
+                              .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
+                          }
+                        }
+                    }
+
+                    callPullRequestWebHook("closed", repository, issueId, context.loginAccount.get)
+
+                    updatePullRequests(repository.owner, repository.name, pullreq.branch, loginAccount, "closed")
+
+                    // call hooks
+                    PluginRegistry().getPullRequestHooks.foreach { h =>
+                      h.addedComment(commentId, message, issue, repository)
+                      h.merged(issue, repository)
+                    }
+
+                    Right(newCommitId)
+                  case None =>
+                    Left("Unknown strategy")
+                }
+              }
+            case _ => Left("Unknown error")
+          }
+          .getOrElse(Left("Pull request not found"))
+      }
+    } else Left("Strategy not allowed")
+
+  }
 }
 
 object MergeService {
@@ -191,13 +416,15 @@ object MergeService {
       force: Boolean,
       committer: PersonIdent,
       refLogMessage: Option[String] = None
-    ): Unit = {
+    ): ObjectId = {
       val refUpdate = repository.updateRef(ref)
       refUpdate.setNewObjectId(newObjectId)
       refUpdate.setForceUpdate(force)
       refUpdate.setRefLogIdent(committer)
       refLogMessage.foreach(refUpdate.setRefLogMessage(_, true))
       refUpdate.update()
+
+      newObjectId
     }
   }
 
@@ -265,7 +492,7 @@ object MergeService {
     }
 
     // update branch from cache
-    def merge(message: String, committer: PersonIdent) = {
+    def merge(message: String, committer: PersonIdent): ObjectId = {
       if (checkConflict().isDefined) {
         throw new RuntimeException("This pull request can't merge automatically.")
       }
@@ -278,7 +505,7 @@ object MergeService {
       Util.updateRefs(repository, s"refs/heads/${branch}", mergeCommitId, false, committer, Some("merged"))
     }
 
-    def rebase(committer: PersonIdent, commits: Seq[RevCommit]): Unit = {
+    def rebase(committer: PersonIdent, commits: Seq[RevCommit]): ObjectId = {
       if (checkConflict().isDefined) {
         throw new RuntimeException("This pull request can't merge automatically.")
       }
@@ -310,7 +537,7 @@ object MergeService {
       Util.updateRefs(repository, s"refs/heads/${branch}", previousId, false, committer, Some("rebased"))
     }
 
-    def squash(message: String, committer: PersonIdent): Unit = {
+    def squash(message: String, committer: PersonIdent): ObjectId = {
       if (checkConflict().isDefined) {
         throw new RuntimeException("This pull request can't merge automatically.")
       }

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

@@ -4,18 +4,31 @@ import gitbucket.core.model.{CommitComments => _, Session => _, _}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import difflib.{Delta, DiffUtils}
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.api.JsonFormat
+import gitbucket.core.controller.Context
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.JGitUtil
+import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.JGitUtil.{CommitInfo, DiffInfo}
 import gitbucket.core.view
 import gitbucket.core.view.helpers
 import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.lib.ObjectId
 
 import scala.collection.JavaConverters._
 
-trait PullRequestService { self: IssuesService with CommitsService =>
+trait PullRequestService {
+  self: IssuesService
+    with CommitsService
+    with WebHookService
+    with WebHookPullRequestService
+    with RepositoryService
+    with MergeService
+    with ActivityService =>
   import PullRequestService._
 
   def getPullRequest(owner: String, repository: String, issueId: Int)(
@@ -76,27 +89,66 @@ trait PullRequestService { self: IssuesService with CommitsService =>
 //      .map { x => PullRequestCount(x._1, x._2) }
 
   def createPullRequest(
-    originUserName: String,
-    originRepositoryName: String,
+    originRepository: RepositoryInfo,
     issueId: Int,
     originBranch: String,
     requestUserName: String,
     requestRepositoryName: String,
     requestBranch: String,
     commitIdFrom: String,
-    commitIdTo: String
-  )(implicit s: Session): Unit =
-    PullRequests insert PullRequest(
-      originUserName,
-      originRepositoryName,
-      issueId,
-      originBranch,
-      requestUserName,
-      requestRepositoryName,
-      requestBranch,
-      commitIdFrom,
-      commitIdTo
-    )
+    commitIdTo: String,
+    loginAccount: Account
+  )(implicit s: Session, context: Context): Unit = {
+    getIssue(originRepository.owner, originRepository.name, issueId.toString).foreach { baseIssue =>
+      PullRequests insert PullRequest(
+        originRepository.owner,
+        originRepository.name,
+        issueId,
+        originBranch,
+        requestUserName,
+        requestRepositoryName,
+        requestBranch,
+        commitIdFrom,
+        commitIdTo
+      )
+
+      // fetch requested branch
+      fetchAsPullRequest(
+        originRepository.owner,
+        originRepository.name,
+        requestUserName,
+        requestRepositoryName,
+        requestBranch,
+        issueId
+      )
+
+      // record activity
+      recordPullRequestActivity(
+        originRepository.owner,
+        originRepository.name,
+        loginAccount.userName,
+        issueId,
+        baseIssue.title
+      )
+
+      // call web hook
+      callPullRequestWebHook("opened", originRepository, issueId, loginAccount)
+
+      getIssue(originRepository.owner, originRepository.name, issueId.toString) foreach { issue =>
+        // extract references and create refer comment
+        createReferComment(
+          originRepository.owner,
+          originRepository.name,
+          issue,
+          baseIssue.title + " " + baseIssue.content,
+          loginAccount
+        )
+
+        // call hooks
+        PluginRegistry().getPullRequestHooks.foreach(_.created(issue, originRepository))
+      }
+    }
+  }
 
   def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Option[Boolean])(
     implicit s: Session
@@ -164,7 +216,10 @@ trait PullRequestService { self: IssuesService with CommitsService =>
   /**
    * Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
    */
-  def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit =
+  def updatePullRequests(owner: String, repository: String, branch: String, loginAccount: Account, action: String)(
+    implicit s: Session,
+    c: JsonFormat.Context
+  ): Unit = {
     getPullRequestsByRequest(owner, repository, branch, Some(false)).foreach { pullreq =>
       if (Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run) {
         // Update the git repository
@@ -204,8 +259,17 @@ trait PullRequestService { self: IssuesService with CommitsService =>
 
         // Update commit id in the PULL_REQUEST table
         updateCommitId(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo, commitIdFrom)
+
+        // call web hook
+        callPullRequestWebHookByRequestBranch(
+          action,
+          getRepository(owner, repository).get,
+          pullreq.requestBranch,
+          loginAccount
+        )
       }
     }
+  }
 
   def getPullRequestByRequestCommit(
     userName: String,
@@ -253,8 +317,8 @@ trait PullRequestService { self: IssuesService with CommitsService =>
           .map { diff =>
             (diff.oldContent, diff.newContent) match {
               case (Some(oldContent), Some(newContent)) => {
-                val oldLines = oldContent.replace("\r\n", "\n").split("\n")
-                val newLines = newContent.replace("\r\n", "\n").split("\n")
+                val oldLines = convertLineSeparator(oldContent, "LF").split("\n")
+                val newLines = convertLineSeparator(newContent, "LF").split("\n")
                 file -> Option(DiffUtils.diff(oldLines.toList.asJava, newLines.toList.asJava))
               }
               case _ =>
@@ -384,6 +448,58 @@ trait PullRequestService { self: IssuesService with CommitsService =>
     updateClosed(owner, repository, pull.issueId, true)
   }
 
+  /**
+   * Parses branch identifier and extracts owner and branch name as tuple.
+   *
+   * - "owner:branch" to ("owner", "branch")
+   * - "branch" to ("defaultOwner", "branch")
+   */
+  def parseCompareIdentifier(value: String, defaultOwner: String): (String, String) =
+    if (value.contains(':')) {
+      val array = value.split(":")
+      (array(0), array(1))
+    } else {
+      (defaultOwner, value)
+    }
+
+  def getPullRequestCommitFromTo(
+    originRepository: RepositoryInfo,
+    forkedRepository: RepositoryInfo,
+    originId: String,
+    forkedId: String
+  ): (Option[ObjectId], Option[ObjectId]) = {
+    using(
+      Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
+      Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+    ) {
+      case (oldGit, newGit) =>
+        if (originRepository.branchList.contains(originId)) {
+          val forkedId2 =
+            forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
+
+          val originId2 = JGitUtil.getForkedCommitId(
+            oldGit,
+            newGit,
+            originRepository.owner,
+            originRepository.name,
+            originId,
+            forkedRepository.owner,
+            forkedRepository.name,
+            forkedId2
+          )
+
+          (Option(oldGit.getRepository.resolve(originId2)), Option(newGit.getRepository.resolve(forkedId2)))
+
+        } else {
+          val originId2 =
+            originRepository.tags.collectFirst { case x if x.name == originId => x.id }.getOrElse(originId)
+          val forkedId2 =
+            forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
+
+          (Option(oldGit.getRepository.resolve(originId2)), Option(newGit.getRepository.resolve(forkedId2)))
+        }
+    }
+  }
 }
 
 object PullRequestService {

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

@@ -73,7 +73,7 @@ trait ReleaseService {
   }
 
   def getReleases(owner: String, repository: String)(implicit s: Session): Seq[ReleaseTag] = {
-    ReleaseTags.filter(x => x.byRepository(owner, repository)).list
+    ReleaseTags.filter(x => x.byRepository(owner, repository)).sortBy(x => x.updatedDate).list
   }
 
   def getRelease(owner: String, repository: String, tag: String)(implicit s: Session): Option[ReleaseTag] = {

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

@@ -0,0 +1,218 @@
+package gitbucket.core.service
+import gitbucket.core.api.JsonFormat
+import gitbucket.core.model.{Account, WebHook}
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.service.WebHookService.WebHookPushPayload
+import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util.JGitUtil.CommitInfo
+import gitbucket.core.util.{JGitUtil, LockUtil}
+import gitbucket.core.util.SyntaxSugars.using
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
+import org.eclipse.jgit.lib._
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
+
+trait RepositoryCommitFileService {
+  self: AccountService with ActivityService with IssuesService with PullRequestService with WebHookPullRequestService =>
+  import RepositoryCommitFileService._
+
+  def commitFiles(
+    repository: RepositoryService.RepositoryInfo,
+    files: Seq[CommitFile],
+    branch: String,
+    path: String,
+    message: String,
+    loginAccount: Account
+  )(
+    f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit
+  )(implicit s: Session, c: JsonFormat.Context) = {
+    // prepend path to the filename
+    _commitFile(repository, branch, message, loginAccount, loginAccount.fullName, loginAccount.mailAddress)(f)
+  }
+
+  def commitFile(
+    repository: RepositoryService.RepositoryInfo,
+    branch: String,
+    path: String,
+    newFileName: Option[String],
+    oldFileName: Option[String],
+    content: String,
+    charset: String,
+    message: String,
+    commit: String,
+    loginAccount: Account
+  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
+    commitFile(
+      repository,
+      branch,
+      path,
+      newFileName,
+      oldFileName,
+      if (content.nonEmpty) { content.getBytes(charset) } else { Array.emptyByteArray },
+      message,
+      commit,
+      loginAccount,
+      loginAccount.fullName,
+      loginAccount.mailAddress
+    )
+  }
+
+  def commitFile(
+    repository: RepositoryService.RepositoryInfo,
+    branch: String,
+    path: String,
+    newFileName: Option[String],
+    oldFileName: Option[String],
+    content: Array[Byte],
+    message: String,
+    commit: String,
+    loginAccount: Account,
+    fullName: String,
+    mailAddress: String
+  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
+
+    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, loginAccount, fullName, mailAddress) {
+      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)))
+          }
+          builder.finish()
+        }
+    }
+  }
+
+  private def _commitFile(
+    repository: RepositoryService.RepositoryInfo,
+    branch: String,
+    message: String,
+    loginAccount: Account,
+    committerName: String,
+    committerMailAddress: String
+  )(
+    f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit
+  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
+
+    LockUtil.lock(s"${repository.owner}/${repository.name}") {
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        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,
+          committerName,
+          committerMailAddress,
+          message
+        )
+
+        inserter.flush()
+        inserter.close()
+
+        val receivePack = new ReceivePack(git.getRepository)
+        val receiveCommand = new ReceiveCommand(headTip, commitId, headName)
+
+        // call post commit hook
+        val error = PluginRegistry().getReceiveHooks.flatMap { hook =>
+          hook.preReceive(repository.owner, repository.name, receivePack, receiveCommand, committerName)
+        }.headOption
+
+        error match {
+          case Some(error) =>
+            // commit is rejected
+            // TODO Notify commit failure to edited user
+            val refUpdate = git.getRepository.updateRef(headName)
+            refUpdate.setNewObjectId(headTip)
+            refUpdate.setForceUpdate(true)
+            refUpdate.update()
+
+          case None =>
+            // update refs
+            val refUpdate = git.getRepository.updateRef(headName)
+            refUpdate.setNewObjectId(commitId)
+            refUpdate.setForceUpdate(false)
+            refUpdate.setRefLogIdent(new PersonIdent(committerName, committerMailAddress))
+            refUpdate.update()
+
+            // update pull request
+            updatePullRequests(repository.owner, repository.name, branch, loginAccount, "synchronize")
+
+            // record activity
+            val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+            recordPushActivity(repository.owner, repository.name, committerName, branch, List(commitInfo))
+
+            // create issue comment by commit message
+            createIssueComment(repository.owner, repository.name, commitInfo)
+
+            // close issue by commit message
+            if (branch == repository.repository.defaultBranch) {
+              closeIssuesFromMessage(message, committerName, repository.owner, repository.name).foreach { issueId =>
+                getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                  callIssuesWebHook("closed", repository, issue, loginAccount)
+                  PluginRegistry().getIssueHooks
+                    .foreach(_.closedByCommitComment(issue, repository, message, loginAccount))
+                }
+              }
+            }
+
+            // call post commit hook
+            PluginRegistry().getReceiveHooks.foreach { hook =>
+              hook.postReceive(repository.owner, repository.name, receivePack, receiveCommand, committerName)
+            }
+
+            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
+                )
+              }
+            }
+        }
+        commitId
+      }
+    }
+  }
+
+}
+
+object RepositoryCommitFileService {
+  case class CommitFile(id: String, name: String)
+}

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

@@ -1,16 +1,25 @@
 package gitbucket.core.service
 
+import gitbucket.core.api.JsonFormat
 import gitbucket.core.controller.Context
 import gitbucket.core.util._
 import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.model.{Account, Collaborator, Repository, RepositoryOptions, Role, ReleaseTag}
+import gitbucket.core.model.{CommitComments => _, Session => _, _}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
-import gitbucket.core.util.JGitUtil.FileInfo
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.service.WebHookService.WebHookPushPayload
+import gitbucket.core.util.Directory.{getRepositoryDir, getRepositoryFilesDir, getTemporaryDir, getWikiRepositoryDir}
+import gitbucket.core.util.JGitUtil.{CommitInfo, FileInfo}
+import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
+import org.eclipse.jgit.lib.{Repository => _, _}
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
 
-trait RepositoryService { self: AccountService =>
+trait RepositoryService {
+  self: AccountService =>
   import RepositoryService._
 
   /**
@@ -68,181 +77,232 @@ trait RepositoryService { self: AccountService =>
       (Repositories filter { t =>
         t.byRepository(oldUserName, oldRepositoryName)
       } firstOption).foreach { repository =>
-        Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
+        LockUtil.lock(s"${repository.userName}/${repository.repositoryName}") {
+          Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
 
-        val webHooks = RepositoryWebHooks.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val webHookEvents = RepositoryWebHookEvents.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val milestones = Milestones.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueId = IssueId.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issues = Issues.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val pullRequests = PullRequests.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val labels = Labels.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val priorities = Priorities.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueComments = IssueComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueLabels = IssueLabels.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val commitComments = CommitComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val commitStatuses = CommitStatuses.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val collaborators = Collaborators.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val protectedBranches = ProtectedBranches.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val protectedBranchContexts =
-          ProtectedBranchContexts.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val deployKeys = DeployKeys.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val releases = ReleaseTags.filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val releaseAssets = ReleaseAssets.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val webHooks = RepositoryWebHooks.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val webHookEvents = RepositoryWebHookEvents.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val milestones = Milestones.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val issueId = IssueId.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val issues = Issues.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val pullRequests = PullRequests.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val labels = Labels.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val priorities = Priorities.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val issueComments = IssueComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val issueLabels = IssueLabels.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val commitComments = CommitComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val commitStatuses = CommitStatuses.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val collaborators = Collaborators.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val protectedBranches = ProtectedBranches.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val protectedBranchContexts =
+            ProtectedBranchContexts.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val deployKeys = DeployKeys.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val releases = ReleaseTags.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+          val releaseAssets = ReleaseAssets.filter(_.byRepository(oldUserName, oldRepositoryName)).list
 
-        Repositories
-          .filter { t =>
-            (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
-          }
-          .map { t =>
-            t.originUserName -> t.originRepositoryName
-          }
-          .update(newUserName, newRepositoryName)
-
-        Repositories
-          .filter { t =>
-            (t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
-          }
-          .map { t =>
-            t.parentUserName -> t.parentRepositoryName
-          }
-          .update(newUserName, newRepositoryName)
-
-        // Updates activity fk before deleting repository because activity is sorted by activityId
-        // and it can't be changed by deleting-and-inserting record.
-        Activities.filter(_.byRepository(oldUserName, oldRepositoryName)).list.foreach { activity =>
-          Activities
-            .filter(_.activityId === activity.activityId.bind)
-            .map(x => (x.userName, x.repositoryName))
-            .update(newUserName, newRepositoryName)
-        }
-
-        deleteRepository(oldUserName, oldRepositoryName)
-
-        RepositoryWebHooks.insertAll(
-          webHooks.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-        RepositoryWebHookEvents.insertAll(
-          webHookEvents.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-        Milestones.insertAll(milestones.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
-        Priorities.insertAll(priorities.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
-        IssueId.insertAll(issueId.map(_.copy(_1 = newUserName, _2 = newRepositoryName)): _*)
-
-        val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
-        val newPriorities = Priorities.filter(_.byRepository(newUserName, newRepositoryName)).list
-        Issues.insertAll(issues.map { x =>
-          x.copy(
-            userName = newUserName,
-            repositoryName = newRepositoryName,
-            milestoneId = x.milestoneId.map { id =>
-              newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
-            },
-            priorityId = x.priorityId.map { id =>
-              newPriorities.find(_.priorityName == priorities.find(_.priorityId == id).get.priorityName).get.priorityId
+          Repositories
+            .filter { t =>
+              (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
             }
+            .map { t =>
+              t.originUserName -> t.originRepositoryName
+            }
+            .update(newUserName, newRepositoryName)
+
+          Repositories
+            .filter { t =>
+              (t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
+            }
+            .map { t =>
+              t.parentUserName -> t.parentRepositoryName
+            }
+            .update(newUserName, newRepositoryName)
+
+          // Updates activity fk before deleting repository because activity is sorted by activityId
+          // and it can't be changed by deleting-and-inserting record.
+          Activities.filter(_.byRepository(oldUserName, oldRepositoryName)).list.foreach { activity =>
+            Activities
+              .filter(_.activityId === activity.activityId.bind)
+              .map(x => (x.userName, x.repositoryName))
+              .update(newUserName, newRepositoryName)
+          }
+
+          deleteRepositoryOnModel(oldUserName, oldRepositoryName)
+
+          RepositoryWebHooks.insertAll(
+            webHooks.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
           )
-        }: _*)
+          RepositoryWebHookEvents.insertAll(
+            webHookEvents.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+          Milestones.insertAll(milestones.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
+          Priorities.insertAll(priorities.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
+          IssueId.insertAll(issueId.map(_.copy(_1 = newUserName, _2 = newRepositoryName)): _*)
 
-        PullRequests.insertAll(pullRequests.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
-        IssueComments.insertAll(
-          issueComments.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-        Labels.insertAll(labels.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
-        CommitComments.insertAll(
-          commitComments.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-        CommitStatuses.insertAll(
-          commitStatuses.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-        ProtectedBranches.insertAll(
-          protectedBranches.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-        ProtectedBranchContexts.insertAll(
-          protectedBranchContexts.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-        DeployKeys.insertAll(deployKeys.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
-        ReleaseTags.insertAll(releases.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
-        ReleaseAssets.insertAll(
-          releaseAssets.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
-
-        // Update source repository of pull requests
-        PullRequests
-          .filter { t =>
-            (t.requestUserName === oldUserName.bind) && (t.requestRepositoryName === oldRepositoryName.bind)
-          }
-          .map { t =>
-            t.requestUserName -> t.requestRepositoryName
-          }
-          .update(newUserName, newRepositoryName)
-
-        // Convert labelId
-        val oldLabelMap = labels.map(x => (x.labelId, x.labelName)).toMap
-        val newLabelMap =
-          Labels.filter(_.byRepository(newUserName, newRepositoryName)).map(x => (x.labelName, x.labelId)).list.toMap
-        IssueLabels.insertAll(
-          issueLabels.map(
-            x =>
-              x.copy(
-                labelId = newLabelMap(oldLabelMap(x.labelId)),
-                userName = newUserName,
-                repositoryName = newRepositoryName
+          val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
+          val newPriorities = Priorities.filter(_.byRepository(newUserName, newRepositoryName)).list
+          Issues.insertAll(issues.map { x =>
+            x.copy(
+              userName = newUserName,
+              repositoryName = newRepositoryName,
+              milestoneId = x.milestoneId.map { id =>
+                newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
+              },
+              priorityId = x.priorityId.map { id =>
+                newPriorities
+                  .find(_.priorityName == priorities.find(_.priorityId == id).get.priorityName)
+                  .get
+                  .priorityId
+              }
             )
-          ): _*
-        )
+          }: _*)
 
-        // TODO Drop transferred owner from collaborators?
-        Collaborators.insertAll(
-          collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
-        )
+          PullRequests.insertAll(
+            pullRequests.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+          IssueComments.insertAll(
+            issueComments.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+          Labels.insertAll(labels.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
+          CommitComments.insertAll(
+            commitComments.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+          CommitStatuses.insertAll(
+            commitStatuses.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+          ProtectedBranches.insertAll(
+            protectedBranches.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+          ProtectedBranchContexts.insertAll(
+            protectedBranchContexts.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+          DeployKeys.insertAll(deployKeys.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
+          ReleaseTags.insertAll(releases.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*)
+          ReleaseAssets.insertAll(
+            releaseAssets.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
 
-        // Update activity messages
-        Activities
-          .filter { t =>
-            (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
-            (t.message like s"%:${oldUserName}/${oldRepositoryName}#%") ||
-            (t.message like s"%:${oldUserName}/${oldRepositoryName}@%")
+          // Update source repository of pull requests
+          PullRequests
+            .filter { t =>
+              (t.requestUserName === oldUserName.bind) && (t.requestRepositoryName === oldRepositoryName.bind)
+            }
+            .map { t =>
+              t.requestUserName -> t.requestRepositoryName
+            }
+            .update(newUserName, newRepositoryName)
+
+          // Convert labelId
+          val oldLabelMap = labels.map(x => (x.labelId, x.labelName)).toMap
+          val newLabelMap =
+            Labels.filter(_.byRepository(newUserName, newRepositoryName)).map(x => (x.labelName, x.labelId)).list.toMap
+          IssueLabels.insertAll(
+            issueLabels.map(
+              x =>
+                x.copy(
+                  labelId = newLabelMap(oldLabelMap(x.labelId)),
+                  userName = newUserName,
+                  repositoryName = newRepositoryName
+              )
+            ): _*
+          )
+
+          // TODO Drop transferred owner from collaborators?
+          Collaborators.insertAll(
+            collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)): _*
+          )
+
+          // Update activity messages
+          Activities
+            .filter { t =>
+              (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
+              (t.message like s"%:${oldUserName}/${oldRepositoryName}#%") ||
+              (t.message like s"%:${oldUserName}/${oldRepositoryName}@%")
+            }
+            .map { t =>
+              t.activityId -> t.message
+            }
+            .list
+            .foreach {
+              case (activityId, message) =>
+                Activities
+                  .filter(_.activityId === activityId.bind)
+                  .map(_.message)
+                  .update(
+                    message
+                      .replace(
+                        s"[repo:${oldUserName}/${oldRepositoryName}]",
+                        s"[repo:${newUserName}/${newRepositoryName}]"
+                      )
+                      .replace(
+                        s"[branch:${oldUserName}/${oldRepositoryName}#",
+                        s"[branch:${newUserName}/${newRepositoryName}#"
+                      )
+                      .replace(
+                        s"[tag:${oldUserName}/${oldRepositoryName}#",
+                        s"[tag:${newUserName}/${newRepositoryName}#"
+                      )
+                      .replace(
+                        s"[pullreq:${oldUserName}/${oldRepositoryName}#",
+                        s"[pullreq:${newUserName}/${newRepositoryName}#"
+                      )
+                      .replace(
+                        s"[issue:${oldUserName}/${oldRepositoryName}#",
+                        s"[issue:${newUserName}/${newRepositoryName}#"
+                      )
+                      .replace(
+                        s"[commit:${oldUserName}/${oldRepositoryName}@",
+                        s"[commit:${newUserName}/${newRepositoryName}@"
+                      )
+                  )
+            }
+          // Move git repository
+          defining(getRepositoryDir(oldUserName, oldRepositoryName)) { dir =>
+            if (dir.isDirectory) {
+              FileUtils.moveDirectory(dir, getRepositoryDir(newUserName, newRepositoryName))
+            }
           }
-          .map { t =>
-            t.activityId -> t.message
+          // Move wiki repository
+          defining(getWikiRepositoryDir(oldUserName, oldRepositoryName)) { dir =>
+            if (dir.isDirectory) {
+              FileUtils.moveDirectory(dir, getWikiRepositoryDir(newUserName, newRepositoryName))
+            }
           }
-          .list
-          .foreach {
-            case (activityId, message) =>
-              Activities
-                .filter(_.activityId === activityId.bind)
-                .map(_.message)
-                .update(
-                  message
-                    .replace(
-                      s"[repo:${oldUserName}/${oldRepositoryName}]",
-                      s"[repo:${newUserName}/${newRepositoryName}]"
-                    )
-                    .replace(
-                      s"[branch:${oldUserName}/${oldRepositoryName}#",
-                      s"[branch:${newUserName}/${newRepositoryName}#"
-                    )
-                    .replace(s"[tag:${oldUserName}/${oldRepositoryName}#", s"[tag:${newUserName}/${newRepositoryName}#")
-                    .replace(
-                      s"[pullreq:${oldUserName}/${oldRepositoryName}#",
-                      s"[pullreq:${newUserName}/${newRepositoryName}#"
-                    )
-                    .replace(
-                      s"[issue:${oldUserName}/${oldRepositoryName}#",
-                      s"[issue:${newUserName}/${newRepositoryName}#"
-                    )
-                    .replace(
-                      s"[commit:${oldUserName}/${oldRepositoryName}@",
-                      s"[commit:${newUserName}/${newRepositoryName}@"
-                    )
-                )
+          // Move files directory
+          defining(getRepositoryFilesDir(oldUserName, oldRepositoryName)) { dir =>
+            if (dir.isDirectory) {
+              FileUtils.moveDirectory(dir, getRepositoryFilesDir(newUserName, newRepositoryName))
+            }
           }
+          // Delete parent directory
+          FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(oldUserName, oldRepositoryName))
+
+          // Call hooks
+          if (oldUserName == newUserName) {
+            PluginRegistry().getRepositoryHooks.foreach(_.renamed(oldUserName, oldRepositoryName, newRepositoryName))
+          } else {
+            PluginRegistry().getRepositoryHooks.foreach(_.transferred(oldUserName, newUserName, newRepositoryName))
+          }
+        }
       }
     }
   }
 
-  def deleteRepository(userName: String, repositoryName: String)(implicit s: Session): Unit = {
+  def deleteRepository(repository: Repository)(implicit s: Session): Unit = {
+    LockUtil.lock(s"${repository.userName}/${repository.repositoryName}") {
+      deleteRepositoryOnModel(repository.userName, repository.repositoryName)
+
+      FileUtils.deleteDirectory(getRepositoryDir(repository.userName, repository.repositoryName))
+      FileUtils.deleteDirectory(getWikiRepositoryDir(repository.userName, repository.repositoryName))
+      FileUtils.deleteDirectory(getTemporaryDir(repository.userName, repository.repositoryName))
+      FileUtils.deleteDirectory(getRepositoryFilesDir(repository.userName, repository.repositoryName))
+
+      // Call hooks
+      PluginRegistry().getRepositoryHooks.foreach(_.deleted(repository.userName, repository.repositoryName))
+    }
+  }
+
+  private def deleteRepositoryOnModel(userName: String, repositoryName: String)(implicit s: Session): Unit = {
     Activities.filter(_.byRepository(userName, repositoryName)).delete
     Collaborators.filter(_.byRepository(userName, repositoryName)).delete
     CommitComments.filter(_.byRepository(userName, repositoryName)).delete
@@ -560,6 +620,14 @@ trait RepositoryService { self: AccountService =>
   ): Unit =
     Collaborators insert Collaborator(userName, repositoryName, collaboratorName, role)
 
+  /**
+   * Remove specified collaborator from the repository.
+   */
+  def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String)(
+    implicit s: Session
+  ): Unit =
+    Collaborators.filter(_.byPrimaryKey(userName, repositoryName, collaboratorName)).delete
+
   /**
    * Remove all collaborators from the repository.
    */
@@ -710,7 +778,6 @@ trait RepositoryService { self: AccountService =>
 }
 
 object RepositoryService {
-
   case class RepositoryInfo(
     owner: String,
     name: String,

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

@@ -233,7 +233,7 @@ trait WebHookService {
             val httpClient = HttpClientBuilder.create.useSystemProperties.addInterceptorLast(itcp).build
             logger.debug(s"start web hook invocation for ${webHook.url}")
             val httpPost = new HttpPost(webHook.url)
-            logger.info(s"Content-Type: ${webHook.ctype.ctype}")
+            logger.debug(s"Content-Type: ${webHook.ctype.ctype}")
             httpPost.addHeader("Content-Type", webHook.ctype.ctype)
             httpPost.addHeader("X-Github-Event", event.name)
             httpPost.addHeader("X-Github-Delivery", java.util.UUID.randomUUID().toString)
@@ -311,7 +311,6 @@ trait WebHookPullRequestService extends WebHookService {
     action: String,
     repository: RepositoryService.RepositoryInfo,
     issue: Issue,
-    baseUrl: String,
     sender: Account
   )(implicit s: Session, context: JsonFormat.Context): Unit = {
     callWebHookOf(repository.owner, repository.name, WebHook.Issues) {
@@ -341,7 +340,6 @@ trait WebHookPullRequestService extends WebHookService {
     action: String,
     repository: RepositoryService.RepositoryInfo,
     issueId: Int,
-    baseUrl: String,
     sender: Account
   )(implicit s: Session, c: JsonFormat.Context): Unit = {
     import WebHookService._
@@ -404,7 +402,6 @@ trait WebHookPullRequestService extends WebHookService {
     action: String,
     requestRepository: RepositoryService.RepositoryInfo,
     requestBranch: String,
-    baseUrl: String,
     sender: Account
   )(implicit s: Session, c: JsonFormat.Context): Unit = {
     import WebHookService._
@@ -450,7 +447,6 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
     repository: RepositoryService.RepositoryInfo,
     issue: Issue,
     pullRequest: PullRequest,
-    baseUrl: String,
     sender: Account
   )(implicit s: Session, c: JsonFormat.Context): Unit = {
     import WebHookService._
@@ -544,11 +540,8 @@ object WebHookService {
   object WebHookCreatePayload {
 
     def apply(
-      git: Git,
       sender: Account,
-      refName: String,
       repositoryInfo: RepositoryInfo,
-      commits: List[CommitInfo],
       repositoryOwner: Account,
       ref: String,
       refType: String
@@ -559,7 +552,7 @@ object WebHookService {
         ref_type = refType,
         description = repositoryInfo.repository.description.getOrElse(""),
         master_branch = repositoryInfo.repository.defaultBranch,
-        repository = ApiRepository.forWebhookPayload(repositoryInfo, owner = ApiUser(repositoryOwner))
+        repository = ApiRepository(repositoryInfo, repositoryOwner)
       )
   }
 
@@ -601,9 +594,9 @@ object WebHookService {
         before = ObjectId.toString(oldId),
         after = ObjectId.toString(newId),
         commits = commits.map { commit =>
-          ApiCommit.forWebhookPayload(git, RepositoryName(repositoryInfo), commit)
+          ApiCommit(git, RepositoryName(repositoryInfo), commit)
         },
-        repository = ApiRepository.forWebhookPayload(repositoryInfo, owner = ApiUser(repositoryOwner))
+        repository = ApiRepository(repositoryInfo, repositoryOwner)
       )
 
     def createDummyPayload(sender: Account): WebHookPushPayload =

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

@@ -25,11 +25,17 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun
         case auth if auth.startsWith("Basic ") => doBasicAuth(auth, loadSystemSettings(), request).toRight(())
         case _                                 => Left(())
       }
+      .orElse {
+        Option(req.getParameter("access_token")).map(AccessTokenService.getAccountByAccessToken(_).toRight(()))
+      }
       .orElse {
         Option(request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]).map(Right(_))
       } match {
-      case Some(Right(account)) => request.setAttribute(Keys.Session.LoginAccount, account); chain.doFilter(req, res)
-      case None                 => chain.doFilter(req, res)
+      case Some(Right(account)) =>
+        request.setAttribute(Keys.Session.LoginAccount, account)
+        updateLastLoginDate(account.userName)
+        chain.doFilter(req, res)
+      case None => chain.doFilter(req, res)
       case Some(Left(_)) => {
         response.setStatus(HttpServletResponse.SC_UNAUTHORIZED)
         response.setContentType("application/json; charset=utf-8")

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

@@ -7,7 +7,32 @@ import org.scalatra.ScalatraFilter
 
 import scala.collection.mutable.ListBuffer
 
-class CompositeScalatraFilter extends Filter {
+abstract class ControllerFilter extends Filter {
+
+  def process(request: ServletRequest, response: ServletResponse, checkPath: String): Boolean
+
+  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
+    val contextPath = request.getServletContext.getContextPath
+    val requestPath = request.asInstanceOf[HttpServletRequest].getRequestURI.substring(contextPath.length)
+    val checkPath = if (requestPath.endsWith("/")) {
+      requestPath
+    } else {
+      requestPath + "/"
+    }
+
+    if (!checkPath.startsWith("/upload/") && !checkPath.startsWith("/git/") && !checkPath.startsWith("/git-lfs/") &&
+        !checkPath.startsWith("/assets/") && !checkPath.startsWith("/plugin-assets/")) {
+      val continue = process(request, response, checkPath)
+      if (!continue) {
+        return ()
+      }
+    }
+
+    chain.doFilter(request, response)
+  }
+}
+
+class CompositeScalatraFilter extends ControllerFilter {
 
   private val filters = new ListBuffer[(ScalatraFilter, String)]()
 
@@ -29,34 +54,23 @@ class CompositeScalatraFilter extends Filter {
     }
   }
 
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
-    val contextPath = request.getServletContext.getContextPath
-    val requestPath = request.asInstanceOf[HttpServletRequest].getRequestURI.substring(contextPath.length)
-    val checkPath = if (requestPath.endsWith("/")) {
-      requestPath
-    } else {
-      requestPath + "/"
-    }
+  override def process(request: ServletRequest, response: ServletResponse, checkPath: String): Boolean = {
+    filters
+      .filter {
+        case (_, path) =>
+          val start = path.replaceFirst("/\\*$", "/")
+          checkPath.startsWith(start)
+      }
+      .foreach {
+        case (filter, _) =>
+          val mockChain = new MockFilterChain()
+          filter.doFilter(request, response, mockChain)
+          if (mockChain.continue == false) {
+            return false
+          }
+      }
 
-    if (!checkPath.startsWith("/upload/") && !checkPath.startsWith("/git/") && !checkPath.startsWith("/git-lfs/") &&
-        !checkPath.startsWith("/plugin-assets/")) {
-      filters
-        .filter {
-          case (_, path) =>
-            val start = path.replaceFirst("/\\*$", "/")
-            checkPath.startsWith(start)
-        }
-        .foreach {
-          case (filter, _) =>
-            val mockChain = new MockFilterChain()
-            filter.doFilter(request, response, mockChain)
-            if (mockChain.continue == false) {
-              return ()
-            }
-        }
-    }
-
-    chain.doFilter(request, response)
+    true
   }
 
 }

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

@@ -106,6 +106,7 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
                   if (isUpdating) {
                     if (hasDeveloperRole(repository.owner, repository.name, Some(account))) {
                       request.setAttribute(Keys.Request.UserName, account.userName)
+                      request.setAttribute(Keys.Request.RepositoryLockKey, s"${repository.owner}/${repository.name}")
                       true
                     } else false
                   } else if (repository.repository.isPrivate) {

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

@@ -22,8 +22,8 @@ import org.eclipse.jgit.transport.resolver._
 import org.slf4j.LoggerFactory
 import javax.servlet.ServletConfig
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
-
 import org.eclipse.jgit.diff.DiffEntry.ChangeType
+import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.json4s.jackson.Serialization._
 
 /**
@@ -41,7 +41,7 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
     setReceivePackFactory(new GitBucketReceivePackFactory())
 
     val root: File = new File(Directory.RepositoryHome)
-    setRepositoryResolver(new GitBucketRepositoryResolver(new FileResolver[HttpServletRequest](root, true)))
+    setRepositoryResolver(new GitBucketRepositoryResolver)
 
     super.init(config)
   }
@@ -55,11 +55,24 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
       res.sendRedirect(baseUrl(req) + "/" + paths.dropRight(1).last + "/" + paths.last)
 
     } else if (req.getMethod.toUpperCase == "POST" && req.getRequestURI.endsWith("/info/lfs/objects/batch")) {
-      serviceGitLfsBatchAPI(req, res)
-
+      withLockRepository(req) {
+        serviceGitLfsBatchAPI(req, res)
+      }
     } else {
       // response for git client
-      super.service(req, res)
+      withLockRepository(req) {
+        super.service(req, res)
+      }
+    }
+  }
+
+  private def withLockRepository[T](req: HttpServletRequest)(f: => T): T = {
+    if (req.hasAttribute(Keys.Request.RepositoryLockKey)) {
+      LockUtil.lock(req.getAttribute(Keys.Request.RepositoryLockKey).asInstanceOf[String]) {
+        f
+      }
+    } else {
+      f
     }
   }
 
@@ -138,10 +151,7 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
   }
 }
 
-class GitBucketRepositoryResolver(parent: FileResolver[HttpServletRequest])
-    extends RepositoryResolver[HttpServletRequest] {
-
-  private val resolver = new FileResolver[HttpServletRequest](new File(Directory.GitBucketHome), true)
+class GitBucketRepositoryResolver extends RepositoryResolver[HttpServletRequest] {
 
   override def open(req: HttpServletRequest, name: String): Repository = {
     // Rewrite repository path if routing is marched
@@ -150,10 +160,10 @@ class GitBucketRepositoryResolver(parent: FileResolver[HttpServletRequest])
       .map {
         case GitRepositoryRouting(urlPattern, localPath, _) =>
           val path = urlPattern.r.replaceFirstIn(name, localPath)
-          resolver.open(req, path)
+          new FileRepository(new File(Directory.GitBucketHome, path))
       }
       .getOrElse {
-        parent.open(req, name)
+        new FileRepository(new File(Directory.RepositoryHome, name))
       }
   }
 
@@ -215,12 +225,14 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
     with AccountService
     with IssuesService
     with ActivityService
+    with MergeService
     with PullRequestService
     with WebHookService
     with LabelsService
     with PrioritiesService
     with MilestonesService
     with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
     with CommitsService {
 
   private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
@@ -299,7 +311,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                     getAccountByUserName(pusher).foreach { pusherAccount =>
                       closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId =>
                         getIssue(owner, repository, issueId.toString).foreach { issue =>
-                          callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount)
+                          callIssuesWebHook("closed", repositoryInfo, issue, pusherAccount)
                           PluginRegistry().getIssueHooks
                             .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount))
                         }
@@ -319,7 +331,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                   }.isDefined) {
                 markMergeAndClosePullRequest(pusher, owner, repository, pull)
                 getAccountByUserName(pusher).foreach { pusherAccount =>
-                  callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, pusherAccount)
+                  callPullRequestWebHook("closed", repositoryInfo, pull.issueId, pusherAccount)
                 }
               }
             }
@@ -346,15 +358,8 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
               command.getType match {
                 case ReceiveCommand.Type.CREATE | ReceiveCommand.Type.UPDATE |
                     ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
-                  updatePullRequests(owner, repository, branchName)
                   getAccountByUserName(pusher).foreach { pusherAccount =>
-                    callPullRequestWebHookByRequestBranch(
-                      "synchronize",
-                      repositoryInfo,
-                      branchName,
-                      baseUrl,
-                      pusherAccount
-                    )
+                    updatePullRequests(owner, repository, branchName, pusherAccount, "synchronize")
                   }
                 case _ =>
               }
@@ -386,11 +391,8 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                 } yield {
                   val refType = if (refName(1) == "tags") "tag" else "branch"
                   WebHookCreatePayload(
-                    git,
                     pusherAccount,
-                    command.getRefName,
                     repositoryInfo,
-                    newCommits,
                     ownerAccount,
                     ref = branchName,
                     refType = refType

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

@@ -1,7 +1,6 @@
 package gitbucket.core.servlet
 
 import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
-
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.util.FileUtil
 import org.apache.commons.io.IOUtils
@@ -17,24 +16,32 @@ class PluginAssetsServlet extends HttpServlet {
 
     assetsMappings
       .find { case (prefix, _, _) => path.startsWith("/plugin-assets" + prefix) }
-      .flatMap {
+      .foreach {
         case (prefix, resourcePath, classLoader) =>
-          val resourceName = path.substring(("/plugin-assets" + prefix).length)
-          Option(classLoader.getResourceAsStream(resourcePath.stripPrefix("/") + resourceName))
-      }
-      .map { in =>
-        try {
-          val bytes = IOUtils.toByteArray(in)
-          resp.setContentLength(bytes.length)
-          resp.setContentType(FileUtil.getMimeType(path, bytes))
-          resp.setHeader("Cache-Control", "max-age=3600")
-          resp.getOutputStream.write(bytes)
-        } finally {
-          in.close()
-        }
-      }
-      .getOrElse {
-        resp.setStatus(404)
+          val ifNoneMatch = req.getHeader("If-None-Match")
+          PluginRegistry.getPluginInfoFromClassLoader(classLoader).map { info =>
+            val etag = s""""${info.pluginJar.lastModified}"""" // ETag must wrapped with double quote
+            if (ifNoneMatch == etag) {
+              resp.setStatus(304)
+            } else {
+              val resourceName = path.substring(("/plugin-assets" + prefix).length)
+              Option(classLoader.getResourceAsStream(resourcePath.stripPrefix("/") + resourceName))
+                .map { in =>
+                  try {
+                    val bytes = IOUtils.toByteArray(in)
+                    resp.setContentLength(bytes.length)
+                    resp.setContentType(FileUtil.getMimeType(path, bytes))
+                    resp.setHeader("ETag", etag)
+                    resp.getOutputStream.write(bytes)
+                  } finally {
+                    in.close()
+                  }
+                }
+                .getOrElse {
+                  resp.setStatus(404)
+                }
+            }
+          }
       }
   }
 

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

@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.plugin.PluginRegistry
 
-class PluginControllerFilter extends Filter {
+class PluginControllerFilter extends ControllerFilter {
 
   private var filterConfig: FilterConfig = null
 
@@ -21,16 +21,13 @@ class PluginControllerFilter extends Filter {
     }
   }
 
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
-    val contextPath = request.getServletContext.getContextPath
-    val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI.substring(contextPath.length)
-
+  override def process(request: ServletRequest, response: ServletResponse, checkPath: String): Boolean = {
     PluginRegistry()
       .getControllers()
       .filter {
         case (_, path) =>
           val start = path.replaceFirst("/\\*$", "/")
-          (requestUri + "/").startsWith(start)
+          checkPath.startsWith(start)
       }
       .foreach {
         case (controller, _) =>
@@ -42,11 +39,11 @@ class PluginControllerFilter extends Filter {
           controller.doFilter(request, response, mockChain)
 
           if (mockChain.continue == false) {
-            return ()
+            return false
           }
       }
 
-    chain.doFilter(request, response)
+    true
   }
 
 }

src/main/scala/gitbucket/core/ssh/GitCommand.scala

@@ -5,7 +5,8 @@ import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.{AccountService, DeployKeyService, RepositoryService, SystemSettingsService}
 import gitbucket.core.servlet.{CommitLogHook, Database}
 import gitbucket.core.util.{SyntaxSugars, Directory}
-import org.apache.sshd.server.{Command, CommandFactory, Environment, ExitCallback, SessionAware}
+import org.apache.sshd.server.{Environment, ExitCallback, SessionAware}
+import org.apache.sshd.server.command.{Command, CommandFactory}
 import org.apache.sshd.server.session.ServerSession
 import org.slf4j.LoggerFactory
 import java.io.{File, InputStream, OutputStream}
@@ -15,7 +16,7 @@ import org.eclipse.jgit.api.Git
 import Directory._
 import gitbucket.core.ssh.PublicKeyAuthenticator.AuthType
 import org.eclipse.jgit.transport.{ReceivePack, UploadPack}
-import org.apache.sshd.server.scp.UnknownCommand
+import org.apache.sshd.server.shell.UnknownCommand
 import org.eclipse.jgit.errors.RepositoryNotFoundException
 
 object GitCommand {

src/main/scala/gitbucket/core/ssh/NoShell.scala

@@ -2,7 +2,8 @@ package gitbucket.core.ssh
 
 import gitbucket.core.service.SystemSettingsService.SshAddress
 import org.apache.sshd.common.Factory
-import org.apache.sshd.server.{Environment, ExitCallback, Command}
+import org.apache.sshd.server.{Environment, ExitCallback}
+import org.apache.sshd.server.command.Command
 import java.io.{OutputStream, InputStream}
 import org.eclipse.jgit.lib.Constants
 

src/main/scala/gitbucket/core/ssh/SshServerListener.scala

@@ -17,7 +17,9 @@ object SshServer {
 
   private def configure(sshAddress: SshAddress, baseUrl: String) = {
     server.setPort(sshAddress.port)
-    val provider = new SimpleGeneratorHostKeyProvider(new File(s"${Directory.GitBucketHome}/gitbucket.ser"))
+    val provider = new SimpleGeneratorHostKeyProvider(
+      java.nio.file.Paths.get(s"${Directory.GitBucketHome}/gitbucket.ser")
+    )
     provider.setAlgorithm("RSA")
     provider.setOverwriteAllowed(false)
     server.setKeyPairProvider(provider)

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

@@ -161,6 +161,8 @@ trait GroupManagerAuthenticator { self: ControllerBase with AccountService =>
 
   private def authenticate(action: => Any) = {
     context.loginAccount match {
+      case Some(x) if x.isAdmin                      => action
+      case Some(x) if x.userName == request.paths(0) => action
       case Some(x) if (getGroupMembers(request.paths(0)).exists { member =>
             member.userName == x.userName && member.isManager
           }) =>

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

@@ -0,0 +1,61 @@
+package gitbucket.core.util
+import java.io.ByteArrayInputStream
+
+import collection.JavaConverters._
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
+import org.bouncycastle.bcpg.ArmoredInputStream
+import org.bouncycastle.openpgp.{PGPPublicKey, PGPPublicKeyRing, PGPSignatureList}
+import org.bouncycastle.openpgp.bc.BcPGPObjectFactory
+import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider
+
+object GpgUtil {
+  def str2GpgKeyId(keyStr: String): Option[Long] = {
+    val pubKeyOf = new BcPGPObjectFactory(new ArmoredInputStream(new ByteArrayInputStream(keyStr.getBytes)))
+    pubKeyOf.iterator().asScala.collectFirst {
+      case keyRing: PGPPublicKeyRing =>
+        keyRing.getPublicKey().getKeyID
+    }
+  }
+
+  def getGpgKey(gpgKeyId: Long)(implicit s: Session): Option[PGPPublicKey] = {
+    val pubKeyOpt = GpgKeys.filter(_.byGpgKeyId(gpgKeyId)).map { _.publicKey }.firstOption
+    pubKeyOpt.flatMap { pubKeyStr =>
+      val pubKeyObjFactory =
+        new BcPGPObjectFactory(new ArmoredInputStream(new ByteArrayInputStream(pubKeyStr.getBytes())))
+      pubKeyObjFactory.nextObject() match {
+        case pubKeyRing: PGPPublicKeyRing =>
+          Option(pubKeyRing.getPublicKey(gpgKeyId))
+        case _ =>
+          None
+      }
+    }
+  }
+
+  def verifySign(signInfo: JGitUtil.GpgSignInfo)(implicit s: Session): Option[JGitUtil.GpgVerifyInfo] = {
+    new BcPGPObjectFactory(new ArmoredInputStream(new ByteArrayInputStream(signInfo.signArmored)))
+      .iterator()
+      .asScala
+      .flatMap {
+        case signList: PGPSignatureList =>
+          signList
+            .iterator()
+            .asScala
+            .flatMap { sign =>
+              getGpgKey(sign.getKeyID)
+                .map { pubKey =>
+                  sign.init(new BcPGPContentVerifierBuilderProvider, pubKey)
+                  sign.update(signInfo.target)
+                  (sign, pubKey)
+                }
+                .collect {
+                  case (sign, pubKey) if sign.verify() =>
+                    JGitUtil.GpgVerifyInfo(pubKey.getUserIDs.next, pubKey.getKeyID.toHexString.toUpperCase)
+                }
+            }
+
+      }
+      .toList
+      .headOption
+  }
+}

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

@@ -1,6 +1,6 @@
 package gitbucket.core.util
 
-import java.io.{ByteArrayOutputStream, File, FileInputStream, InputStream}
+import java.io._
 
 import gitbucket.core.service.RepositoryService
 import org.eclipse.jgit.api.Git
@@ -75,6 +75,59 @@ object JGitUtil {
     linkUrl: Option[String]
   )
 
+  /**
+   * The gpg commit sign data.
+   * @param signArmored signature for commit
+   * @param target string for verification target
+   */
+  case class GpgSignInfo(signArmored: Array[Byte], target: Array[Byte])
+
+  /**
+   * The verified gpg sign data.
+   * @param signedUser
+   * @param signedKeyId
+   */
+  case class GpgVerifyInfo(signedUser: String, signedKeyId: String)
+
+  private def getSignTarget(rev: RevCommit): Array[Byte] = {
+    val ascii = "ASCII"
+    val os = new ByteArrayOutputStream()
+    val w = new OutputStreamWriter(os, rev.getEncoding)
+    os.write("tree ".getBytes(ascii))
+    rev.getTree.copyTo(os)
+    os.write('\n')
+
+    rev.getParents.foreach { p =>
+      os.write("parent ".getBytes(ascii))
+      p.copyTo(os)
+      os.write('\n')
+    }
+
+    os.write("author ".getBytes(ascii))
+    w.write(rev.getAuthorIdent.toExternalString)
+    w.flush()
+    os.write('\n')
+
+    os.write("committer ".getBytes(ascii))
+    w.write(rev.getCommitterIdent.toExternalString)
+    w.flush()
+    os.write('\n')
+
+    if (rev.getEncoding.name != "UTF-8") {
+      os.write("encoding ".getBytes(ascii))
+      os.write(Constants.encodeASCII(rev.getEncoding.name))
+      os.write('\n')
+    }
+
+    os.write('\n')
+
+    if (!rev.getFullMessage.isEmpty) {
+      w.write(rev.getFullMessage)
+      w.flush()
+    }
+    os.toByteArray
+  }
+
   /**
    * The commit data.
    *
@@ -99,7 +152,9 @@ object JGitUtil {
     authorEmailAddress: String,
     commitTime: Date,
     committerName: String,
-    committerEmailAddress: String
+    committerEmailAddress: String,
+    commitSign: Option[GpgSignInfo],
+    verified: Option[GpgVerifyInfo]
   ) {
 
     def this(rev: org.eclipse.jgit.revwalk.RevCommit) =
@@ -113,7 +168,11 @@ object JGitUtil {
         rev.getAuthorIdent.getEmailAddress,
         rev.getCommitterIdent.getWhen,
         rev.getCommitterIdent.getName,
-        rev.getCommitterIdent.getEmailAddress
+        rev.getCommitterIdent.getEmailAddress,
+        Option(rev.getRawGpgSignature).map { s =>
+          GpgSignInfo(s, getSignTarget(rev))
+        },
+        None
       )
 
     val summary = getSummaryMessage(fullMessage, shortMessage)
@@ -240,18 +299,16 @@ object JGitUtil {
    * Returns the number of commits in the specified branch or commit.
    * If the specified branch has over 10000 commits, this method returns 100001.
    */
-  def getCommitCount(owner: String, repository: String, branch: String): Int = {
-    val dir = getRepositoryDir(owner, repository)
+  def getCommitCount(git: Git, branch: String, max: Int = 10001): Int = {
+    val dir = git.getRepository.getDirectory
     val key = dir.getAbsolutePath + "@" + branch
     val entry = cache.getEntry(key)
 
     if (entry == null) {
-      using(Git.open(dir)) { git =>
-        val commitId = git.getRepository.resolve(branch)
-        val commitCount = git.log.add(commitId).call.iterator.asScala.take(10001).size
-        cache.put(key, commitCount)
-        commitCount
-      }
+      val commitId = git.getRepository.resolve(branch)
+      val commitCount = git.log.add(commitId).call.iterator.asScala.take(max).size
+      cache.put(key, commitCount)
+      commitCount
     } else {
       entry.getValue
     }
@@ -1110,6 +1167,7 @@ object JGitUtil {
   /**
    * Fetch pull request contents into refs/pull/${issueId}/head and return (commitIdTo, commitIdFrom)
    */
+  // TODO should take Git instead of owner and username for testability
   def updatePullRequest(
     userName: String,
     repositoryName: String,
@@ -1154,42 +1212,40 @@ object JGitUtil {
     git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next
   }
 
-  def getBranches(owner: String, name: String, defaultBranch: String, origin: Boolean): Seq[BranchInfo] = {
-    using(Git.open(getRepositoryDir(owner, name))) { git =>
-      val repo = git.getRepository
-      val defaultObject = repo.resolve(defaultBranch)
+  def getBranches(git: Git, defaultBranch: String, origin: Boolean): Seq[BranchInfo] = {
+    val repo = git.getRepository
+    val defaultObject = repo.resolve(defaultBranch)
 
-      git.branchList.call.asScala.map { ref =>
-        val walk = new RevWalk(repo)
-        try {
-          val defaultCommit = walk.parseCommit(defaultObject)
-          val branchName = ref.getName.stripPrefix("refs/heads/")
-          val branchCommit = walk.parseCommit(ref.getObjectId)
-          val when = branchCommit.getCommitterIdent.getWhen
-          val committer = branchCommit.getCommitterIdent.getName
-          val committerEmail = branchCommit.getCommitterIdent.getEmailAddress
-          val mergeInfo = if (origin && branchName == defaultBranch) {
-            None
-          } else {
-            walk.reset()
-            walk.setRevFilter(RevFilter.MERGE_BASE)
-            walk.markStart(branchCommit)
-            walk.markStart(defaultCommit)
-            val mergeBase = walk.next()
-            walk.reset()
-            walk.setRevFilter(RevFilter.ALL)
-            Some(
-              BranchMergeInfo(
-                ahead = RevWalkUtils.count(walk, branchCommit, mergeBase),
-                behind = RevWalkUtils.count(walk, defaultCommit, mergeBase),
-                isMerged = walk.isMergedInto(branchCommit, defaultCommit)
-              )
+    git.branchList.call.asScala.map { ref =>
+      val walk = new RevWalk(repo)
+      try {
+        val defaultCommit = walk.parseCommit(defaultObject)
+        val branchName = ref.getName.stripPrefix("refs/heads/")
+        val branchCommit = walk.parseCommit(ref.getObjectId)
+        val when = branchCommit.getCommitterIdent.getWhen
+        val committer = branchCommit.getCommitterIdent.getName
+        val committerEmail = branchCommit.getCommitterIdent.getEmailAddress
+        val mergeInfo = if (origin && branchName == defaultBranch) {
+          None
+        } else {
+          walk.reset()
+          walk.setRevFilter(RevFilter.MERGE_BASE)
+          walk.markStart(branchCommit)
+          walk.markStart(defaultCommit)
+          val mergeBase = walk.next()
+          walk.reset()
+          walk.setRevFilter(RevFilter.ALL)
+          Some(
+            BranchMergeInfo(
+              ahead = RevWalkUtils.count(walk, branchCommit, mergeBase),
+              behind = RevWalkUtils.count(walk, defaultCommit, mergeBase),
+              isMerged = walk.isMergedInto(branchCommit, defaultCommit)
             )
-          }
-          BranchInfo(branchName, committer, when, committerEmail, mergeInfo, ref.getObjectId.name)
-        } finally {
-          walk.dispose()
+          )
         }
+        BranchInfo(branchName, committer, when, committerEmail, mergeInfo, ref.getObjectId.name)
+      } finally {
+        walk.dispose()
       }
     }
   }
@@ -1203,7 +1259,7 @@ object JGitUtil {
         val blame = blamer.call()
         var blameMap = Map[String, JGitUtil.BlameInfo]()
         var idLine = List[(String, Int)]()
-        val commits = 0.to(blame.getResultContents().size() - 1).map { i =>
+        0.to(blame.getResultContents().size() - 1).map { i =>
           val c = blame.getSourceCommit(i)
           if (!blameMap.contains(c.name)) {
             blameMap += c.name -> JGitUtil.BlameInfo(
@@ -1243,24 +1299,7 @@ object JGitUtil {
     }
   }
 
-  def getFileSize(git: Git, repository: RepositoryService.RepositoryInfo, treeWalk: TreeWalk): Long = {
-    val attrs = treeWalk.getAttributes
-    val loader = git.getRepository.open(treeWalk.getObjectId(0))
-    if (attrs.containsKey("filter") && attrs.get("filter").getValue == "lfs") {
-      val lfsAttrs = getLfsAttributes(loader)
-      lfsAttrs.get("size").map(_.toLong).get
-    } else {
-      loader.getSize
-    }
-  }
-
-  def getFileSize(git: Git, repository: RepositoryService.RepositoryInfo, tree: RevTree, path: String): Long = {
-    using(TreeWalk.forPath(git.getRepository, path, tree)) { treeWalk =>
-      getFileSize(git, repository, treeWalk)
-    }
-  }
-
-  def openFile[T](git: Git, repository: RepositoryService.RepositoryInfo, treeWalk: TreeWalk)(
+  private def openFile[T](git: Git, repository: RepositoryService.RepositoryInfo, treeWalk: TreeWalk)(
     f: InputStream => T
   ): T = {
     val attrs = treeWalk.getAttributes
@@ -1270,7 +1309,6 @@ object JGitUtil {
       if (lfsAttrs.nonEmpty) {
         val oid = lfsAttrs("oid").split(":")(1)
 
-        val file = new File(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))
         using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in =>
           f(in)
         }

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

@@ -86,6 +86,11 @@ object Keys {
      */
     val UserName = "USER_NAME"
 
+    /**
+     * Request key for the Lock key which is used during Git repository write access.
+     */
+    val RepositoryLockKey = "REPOSITORY_LOCK_KEY"
+
     /**
      * Generate request key for the request cache.
      */

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

@@ -65,7 +65,7 @@ object SyntaxSugars {
   implicit class HeadValueAccessibleMap(map: Map[String, Seq[String]]) {
     def value(key: String): String = map(key).head
     def optionValue(key: String): Option[String] = map.get(key).flatMap(_.headOption)
-    def values(key: String): Seq[String] = map.get(key).getOrElse(Seq.empty)
+    def values(key: String): Seq[String] = map.getOrElse(key, Seq.empty)
   }
 
 }

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

@@ -16,6 +16,7 @@ object Markdown {
    * Converts Markdown of Wiki pages to HTML.
    *
    * @param repository the repository which contains the markdown
+   * @param branch the target branch
    * @param enableWikiLink if true then wiki style link is available in markdown
    * @param enableRefsLink if true then issue reference (e.g. #123) is rendered as link
    * @param enableAnchor if true then anchor for headline is generated
@@ -27,6 +28,7 @@ object Markdown {
   def toHtml(
     markdown: String,
     repository: RepositoryService.RepositoryInfo,
+    branch: String,
     enableWikiLink: Boolean,
     enableRefsLink: Boolean,
     enableAnchor: Boolean,
@@ -45,6 +47,7 @@ object Markdown {
     val renderer = new GitBucketMarkedRenderer(
       options,
       repository,
+      branch,
       enableWikiLink,
       enableRefsLink,
       enableAnchor,
@@ -62,6 +65,7 @@ object Markdown {
   class GitBucketMarkedRenderer(
     options: Options,
     repository: RepositoryService.RepositoryInfo,
+    branch: String,
     enableWikiLink: Boolean,
     enableRefsLink: Boolean,
     enableAnchor: Boolean,
@@ -131,11 +135,11 @@ object Markdown {
     }
 
     override def link(href: String, title: String, text: String): String = {
-      super.link(fixUrl(href, false), title, text)
+      super.link(fixUrl(href, branch, false), title, text)
     }
 
     override def image(href: String, title: String, text: String): String = {
-      super.image(fixUrl(href, true), title, text)
+      super.image(fixUrl(href, branch, true), title, text)
     }
 
     override def nolink(text: String): String = {
@@ -162,7 +166,7 @@ object Markdown {
       }
     }
 
-    private def fixUrl(url: String, isImage: Boolean = false): String = {
+    private def fixUrl(url: String, branch: String, isImage: Boolean = false): String = {
       lazy val urlWithRawParam: String = url + (if (isImage && !url.endsWith("?raw=true")) "?raw=true" else "")
 
       if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("mailto:") || url.startsWith("/")) {
@@ -174,11 +178,9 @@ object Markdown {
           urlWithRawParam
         } else if (context.currentPath.contains("/tree/")) {
           val paths = context.currentPath.split("/")
-          val branch = if (paths.length > 3) paths.drop(4).mkString("/") else repository.repository.defaultBranch
-          repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + urlWithRawParam
+          val path = if (paths.length > 3) paths.drop(4).mkString("/") else branch
+          repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + path + "/" + urlWithRawParam
         } else {
-          val paths = context.currentPath.split("/")
-          val branch = if (paths.length > 3) paths.last else repository.repository.defaultBranch
           repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + urlWithRawParam
         }
       } else {

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

@@ -102,6 +102,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def markdown(
     markdown: String,
     repository: RepositoryService.RepositoryInfo,
+    branch: String,
     enableWikiLink: Boolean,
     enableRefsLink: Boolean,
     enableLineBreaks: Boolean,
@@ -114,6 +115,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
       Markdown.toHtml(
         markdown = markdown,
         repository = repository,
+        branch = branch,
         enableWikiLink = enableWikiLink,
         enableRefsLink = enableRefsLink,
         enableAnchor = enableAnchor,
@@ -232,6 +234,12 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
             s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/commit/${m.group(3)}">${m.group(1)}/${m
               .group(2)}@${m.group(3).substring(0, 7)}</a>"""
         )
+        .replaceAll(
+          "\\[release:([^\\s]+?)/([^\\s]+?)/([^\\s]+?):(.+)\\]",
+          (m: Match) =>
+            s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/releases/${encodeRefName(m.group(3))}">${m
+              .group(4)}</a>"""
+        )
     )
 
   /**

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

@@ -0,0 +1,39 @@
+@(account: gitbucket.core.model.Account, gpgKeys: List[gitbucket.core.model.GpgKey])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.ssh.SshUtil
+@gitbucket.core.html.main("GPG Keys"){
+  @gitbucket.core.account.html.menu("gpg", context.loginAccount.get.userName, false){
+    <div class="panel panel-default">
+      <div class="panel-heading strong">GPG Keys</div>
+      <div class="panel-body">
+        @if(gpgKeys.isEmpty){
+          No keys
+        }
+        @gpgKeys.zipWithIndex.map { case (key, i) =>
+          @if(i != 0){
+            <hr>
+          }
+        <strong style="line-height: 30px;">@key.title</strong> (@key.gpgKeyId.toHexString.toUpperCase)
+        <a href="@context.path/@account.userName/_gpg/delete/@key.keyId" class="btn btn-sm btn-danger pull-right">Delete</a>
+        }
+      </div>
+    </div>
+    <form method="POST" action="@context.path/@account.userName/_gpg" validate="true" autocomplete="off">
+      <div class="panel panel-default">
+        <div class="panel-heading strong">Add a GPG Key</div>
+        <div class="panel-body">
+          <fieldset class="form-group">
+            <label for="title" class="strong">Title</label>
+            <div><span id="error-title" class="error"></span></div>
+            <input type="text" name="title" id="title" class="form-control"/>
+          </fieldset>
+          <fieldset class="form-group">
+            <label for="publicKey" class="strong">Key</label>
+            <div><span id="error-publicKey" class="error"></span></div>
+            <textarea name="publicKey" id="publicKey" class="form-control" style="height: 200px;"></textarea>
+          </fieldset>
+          <input type="submit" class="btn btn-success" value="Add"/>
+        </div>
+      </div>
+    </form>
+  }
+}

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

@@ -26,6 +26,11 @@
             </a>
           </li>
         }
+        <li class="menu-item-hover @if(active=="gpg"){active}">
+          <a href="@context.path/@userName/_gpg">
+            <i class="menu-icon octicon octicon-key"></i> <span>GPG Keys</span>
+          </a>
+        </li>
         <li class="menu-item-hover @if(active=="application"){active}">
           <a href="@context.path/@userName/_application">
             <i class="menu-icon octicon octicon-rocket"></i> <span>Applications</span>

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

@@ -40,10 +40,6 @@
               <label class="col-md-2">Version</label>
               <span class="col-md-10">@plugin.pluginVersion</span>
             </div>
-            <div class="row">
-              <label class="col-md-2">Name</label>
-              <span class="col-md-10">@plugin.pluginName</span>
-            </div>
             <div class="row">
               <label class="col-md-2">Description</label>
               <span class="col-md-10 muted">@plugin.description</span>

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

@@ -22,12 +22,13 @@
       </div>
       <div class="commit-commentContent-@comment.commentId">
         @helpers.markdown(
-          markdown = comment.content,
-          repository = repository,
-          enableWikiLink = false,
-          enableRefsLink = true,
-          enableLineBreaks = true,
-          enableTaskList = true,
+          markdown           = comment.content,
+          repository         = repository,
+          branch             = repository.repository.defaultBranch,
+          enableWikiLink     = false,
+          enableRefsLink     = true,
+          enableLineBreaks   = true,
+          enableTaskList     = true,
           hasWritePermission = hasWritePermission
         )
       </div>

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

@@ -6,6 +6,7 @@
   commitId: Option[String] = None,
   renderScript: Boolean = true)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
+@import gitbucket.core.util.StringUtil._
 @issueOrPullRequest()={ @if(issue.exists(_.isPullRequest))( "pull request" )else( "issue" ) }
 @showFormattedComment(comment: gitbucket.core.model.IssueComment)={
 <div class="panel panel-default issue-comment-box" id="comment-@comment.commentId">
@@ -32,12 +33,13 @@
   </div>
   <div class="panel-body markdown-body" id="commentContent-@comment.commentId">
     @helpers.markdown(
-      markdown = comment.content,
-      repository = repository,
-      enableWikiLink = false,
-      enableRefsLink = true,
-      enableLineBreaks = true,
-      enableTaskList = true,
+      markdown           = comment.content,
+      repository         = repository,
+      branch             = repository.repository.defaultBranch,
+      enableWikiLink     = false,
+      enableRefsLink     = true,
+      enableLineBreaks   = true,
+      enableTaskList     = true,
       hasWritePermission = isManageable
     )
   </div>
@@ -57,12 +59,13 @@
     </div>
     <div class="panel-body markdown-body" id="issueContent">
       @helpers.markdown(
-        markdown = issue.get.content getOrElse "No description provided.",
-        repository = repository,
-        enableWikiLink = false,
-        enableRefsLink = true,
-        enableLineBreaks = true,
-        enableTaskList = true,
+        markdown           = issue.get.content getOrElse "No description provided.",
+        repository         = repository,
+        branch             = repository.repository.defaultBranch,
+        enableWikiLink     = false,
+        enableRefsLink     = true,
+        enableLineBreaks   = true,
+        enableTaskList     = true,
         hasWritePermission = isManageable
       )
     </div>
@@ -235,7 +238,7 @@
             <span class="discussion-item-icon"><i class="octicon octicon-pencil"></i></span>
             @helpers.avatar(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
-            change title from <code>@comment.content.split("\r\n")(0)</code> to <code>@comment.content.split("\r\n")(1)</code>
+            change title from <code>@convertLineSeparator(comment.content, "LF").split("\n")(0)</code> to <code>@convertLineSeparator(comment.content, "LF").split("\n")(1)</code>
             @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
           </div>
         </div>
@@ -268,12 +271,13 @@
       </div>
       <div class="panel-body markdown-body commit-commentContent-@comment.commentId">
         @helpers.markdown(
-          markdown = comment.content,
-          repository = repository,
-          enableWikiLink = false,
-          enableRefsLink = true,
-          enableLineBreaks = true,
-          enableTaskList = true,
+          markdown           = comment.content,
+          repository         = repository,
+          branch             = repository.repository.defaultBranch,
+          enableWikiLink     = false,
+          enableRefsLink     = true,
+          enableLineBreaks   = true,
+          enableTaskList     = true,
           hasWritePermission = isManageable
         )
       </div>

src/main/twirl/gitbucket/core/issues/milestones/list.scala.html

@@ -76,13 +76,14 @@
                   </div>
                 </div>
               </div>
-              @if(milestone.description.isDefined){
+              @milestone.description.map { description =>
                 <div class="milestone-description markdown-body">
                   @helpers.markdown(
-                    markdown = milestone.description.get,
-                    repository = repository,
-                    enableWikiLink = false,
-                    enableRefsLink = false,
+                    markdown         = description,
+                    repository       = repository,
+                    branch           = repository.repository.defaultBranch,
+                    enableWikiLink   = false,
+                    enableRefsLink   = false,
                     enableLineBreaks = true
                   )
                 </div>

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

@@ -2,12 +2,24 @@
 @import gitbucket.core.plugin.PluginRegistry
 @import gitbucket.core.view.helpers
 <!DOCTYPE html>
-<html>
+<html prefix="og: http://ogp.me/ns#">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title>@title</title>
+    <meta property="og:title" content="@title" />
+    <meta property="og:type" content="object" />
+    <meta property="og:url" content="@context.request.getRequestURL" />
+    @if(repository.isEmpty){
+      <meta property="og:image" content="@context.baseUrl/assets/common/images/gitbucket_ogp.png" />
+    }
+    @repository.map{ r =>
+      <meta property="og:image" content="@context.baseUrl/@r.owner/_avatar" />
+      @r.repository.description.map{ desc =>
+        <meta property="og:description" content="@desc" />
+      }
+    }
     <link rel="icon" href="@helpers.assets("/common/images/gitbucket.png")" type="image/vnd.microsoft.icon" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="@helpers.assets("/vendors/google-fonts/css/source-sans-pro.css")" rel="stylesheet">

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

@@ -43,7 +43,14 @@
           </div>
           <div>
             <hr>
-            @status.conflictMessage.map { message => @helpers.markdown(message, originRepository, false, true, false) }
+            @status.conflictMessage.map { message => @helpers.markdown(
+              markdown         = message,
+              repository       = originRepository,
+              branch           = originRepository.repository.defaultBranch,
+              enableWikiLink   = false,
+              enableRefsLink   = true,
+              enableLineBreaks = false
+            ) }
           </div>
         } else {
           @if(status.branchIsOutOfDate){