Merge pull request #2214 from gitbucket/gitbucket-4.30.0-release

Updates for GitBucket 4.30.0 release

.scalafmt.conf

@@ -0,0 +1,11 @@
+project.git = true
+
+maxColumn = 120
+docstrings = JavaDoc
+
+align.tokens = ["%", "%%", {code = "=>", owner = "Case"}]
+align.openParenCallSite = false
+align.openParenDefnSite = false
+continuationIndent.callSite = 2
+continuationIndent.defnSite = 2
+danglingParentheses = true

.travis.yml

@@ -2,8 +2,11 @@ language: scala
 sudo: true
 jdk: 
   - oraclejdk8
+  - oraclejdk11
+  - openjdk8
+  - openjdk11
 script:
-  - sbt test
+  - sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
 before_script:
   - sudo /etc/init.d/mysql stop
   - sudo /etc/init.d/postgresql stop

CHANGELOG.md

@@ -1,20 +1,91 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-### 4.21.2 - 27 Jan 2018
+## 4.30.0 - xx 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
+- Proxy support for plugin installation
+- Fix some bugs around pull requests
+
+## 4.27.0 - 29 Jul 2018
+- Create new tag on the browser
+- EditorConfig support
+- Improve issues / pull requests search
+- Some improvements and bug fixes for plugin installation via internet and pull request commenting
+
+## 4.26.0 - 30 Jun 2018
+- Installing plugins from the central registry
+- Repositories tab in the dashboard
+- Fork dialog enhancement
+- Adjust pull request creation suggestor
+- Keep showing incompleted task list
+- New notification hooks
+
+## 4.25.0 - 29 May 2018
+- Security improvements
+- Show mail address at the profile page
+- Task list on commit comments
+- More detailed editing history of issues and pull requests
+- Expose user public keys
+- Download repository improvements
+
+## 4.24.1 - 1 May 2018
+- Fix bug in Web API authentication
+
+## 4.24.0 - 30 Apr 2018
+- Diff for each review comment on pull requests
+- Extra mail addresses support
+- Show tags at the commit list
+- Keep wrap mode of the online editor
+- Renew layout of gitbucket-gist-plugin
+- Web API of gitbucket-ci-plugin
+
+## 4.23.1 - 10 Apr 2018
+- Fix bug that the contents API doesn't work for the repository root
+- Fix shutdown problem in Tomcat deployment
+- Render by plugins at the blob view even if it's a binary file
+
+## 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
+- Plugins list API
+- Git authentication with personal access token
+- Max parallel builds and max stored history in CI plugin became configurable
+
+## 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
 - 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.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket)
+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,12 +68,14 @@ Support
 - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
 
-What's New in 4.22.x
+What's New in 4.30.x
 -------------
-### 4.22.0 - 3 Mar 2018
+### 4.30.0 - xx Dec 2018
-- Pull request merge strategy settings
+- Automatic ChangeLog Summary generation for new Releases
-- Create repository with an empty commit
+- A lot of GitBucket Web API updates to increase compatibility with the GitHub API.
-- Improve database viewer
+- Display of checkboxes in Markdown files in Git repositories
-- Update maven-repository-plugin
+- A new extension point for plugins: anonymousAccessiblePaths
+- Group support in the Gist Plugin
+- Allow redirection to the Release Page from the Activity Timeline Page
 
 See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -3,19 +3,23 @@ import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.22.0"
+val GitBucketVersion = "4.30.0"
-val ScalatraVersion = "2.6.1"
+val ScalatraVersion = "2.6.3"
-val JettyVersion = "9.4.7.v20170914"
+val JettyVersion = "9.4.14.v20181114"
+val JgitVersion = "5.1.3.201810200350-r"
 
-lazy val root = (project in file(".")).enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin).settings(
+lazy val root = (project in file("."))
-
+  .enablePlugins(SbtTwirl, ScalatraPlugin)
-)
+  .settings(
+    )
 
 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.4"
+scalaVersion := "2.12.8"
+
+scalafmtOnCompile := true
 
 // dependency settings
 resolvers ++= Seq(
@@ -25,57 +29,59 @@ resolvers ++= Seq(
   "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/",
   "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
 )
+
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.10.0.201712302008-r",
+  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.10.0.201712302008-r",
+  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
-  "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
+  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
+  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-forms"               % ScalatraVersion,
+  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"               % "3.5.3",
+  "org.json4s"                      %% "json4s-jackson"              % "3.6.2",
-  "commons-io"                      %  "commons-io"                   % "2.6",
+  "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",
+  "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.commons"              % "commons-email"                % "1.5",
-  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.4",
+  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.6",
-  "org.apache.sshd"                 %  "apache-sshd"                  % "1.6.0" exclude("org.slf4j","slf4j-jdk14"),
+  "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.17",
+  "org.apache.tika"                 % "tika-core"                    % "1.19.1",
-  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.10",
+  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.11",
-  "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
+  "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
-  "com.h2database"                  %  "h2"                           % "1.4.196",
+  "com.h2database"                  % "h2"                           % "1.4.197",
-  "org.mariadb.jdbc"                %  "mariadb-java-client"          % "2.2.2",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.3.0",
-  "org.postgresql"                  %  "postgresql"                   % "42.1.4",
+  "org.postgresql"                  % "postgresql"                   % "42.2.5",
-  "ch.qos.logback"                  %  "logback-classic"              % "1.2.3",
+  "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      %  "HikariCP"                     % "2.7.4",
+  "com.zaxxer"                      % "HikariCP"                     % "3.2.0",
-  "com.typesafe"                    %  "config"                       % "1.3.2",
+  "com.typesafe"                    % "config"                       % "1.3.3",
-  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.8",
+  "com.typesafe.akka"               %% "akka-actor"                  % "2.5.18",
-  "fr.brouillard.oss.security.xhub" %  "xhub4j-core"                  % "1.0.0",
+  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.0.0",
-  "com.github.bkromhout"            %  "java-diff-utils"              % "2.1.1",
+  "com.github.bkromhout"            % "java-diff-utils"              % "2.1.1",
-  "org.cache2k"                     %  "cache2k-all"                  % "1.0.1.Final",
+  "org.cache2k"                     % "cache2k-all"                  % "1.2.0.Final",
-  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.1-akka-2.5.x" exclude("c3p0","c3p0"),
+  "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",
+  "net.coobird"                     % "thumbnailator"                % "0.4.8",
-  "com.github.zafarkhaja"           %  "java-semver"                  % "0.9.0",
+  "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",
+  "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
-  "javax.servlet"                   %  "javax.servlet-api"            % "3.1.0"          % "provided",
+  "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
-  "junit"                           %  "junit"                        % "4.12"           % "test",
+  "junit"                           % "junit"                        % "4.12" % "test",
-  "org.scalatra"                    %% "scalatra-scalatest"           % ScalatraVersion  % "test",
+  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test",
-  "org.mockito"                     %  "mockito-core"                 % "2.13.0"         % "test",
+  "org.mockito"                     % "mockito-core"                 % "2.23.4" % "test",
-  "com.wix"                         %  "wix-embedded-mysql"           % "3.0.0"          % "test",
+  "com.wix"                         % "wix-embedded-mysql"           % "4.2.0" % "test",
-  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.6"            % "test",
+  "ru.yandex.qatools.embed"         % "postgresql-embedded"          % "2.10" % "test",
-  "net.i2p.crypto"                  % "eddsa"                         % "0.2.0",
+  "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
-  "is.tagomor.woothee"              % "woothee-java"                  % "1.7.0"
+  "is.tagomor.woothee"              % "woothee-java"                 % "1.8.0",
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.3"
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method", "-Xfuture")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 
 // Test settings
 //testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
 javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
-testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
+testOptions in Test += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
 fork in Test := true
 
 // Packaging options
@@ -85,31 +91,18 @@ packageOptions += Package.MainClass("JettyLauncher")
 test in assembly := {}
 assemblyMergeStrategy in assembly := {
   case PathList("META-INF", xs @ _*) =>
-    (xs map {_.toLowerCase}) match {
+    (xs map { _.toLowerCase }) match {
       case ("manifest.mf" :: Nil) => MergeStrategy.discard
-      case _ => MergeStrategy.discard
+      case _                      => MergeStrategy.discard
     }
   case x => MergeStrategy.first
 }
 
-// JRebel
-//Seq(jrebelSettings: _*)
-
-//jrebel.webLinks += (target in webappPrepare).value
-//jrebel.enabled := System.getenv().get("JREBEL") != null
-javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
-  if (path.endsWith(".jar")) {
-    // Legacy JRebel agent
-    Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
-  } else {
-    // New JRebel agent
-    Seq(s"-agentpath:${path}")
-  }
-}
-
 // Exclude a war file from published artifacts
 signedArtifacts := {
-  signedArtifacts.value.filterNot { case (_, file) => file.getName.endsWith(".war") || file.getName.endsWith(".war.asc") }
+  signedArtifacts.value.filterNot {
+    case (_, file) => file.getName.endsWith(".war") || file.getName.endsWith(".war.asc")
+  }
 }
 
 // Create executable war file
@@ -132,32 +125,31 @@ executableKey := {
   import java.util.jar.Attributes.{Name => AttrName}
   import java.util.jar.{Manifest => JarManifest}
 
-  val workDir   = Keys.target.value / "executable"
+  val workDir = Keys.target.value / "executable"
-  val warName   = Keys.name.value + ".war"
+  val warName = Keys.name.value + ".war"
 
-  val log       = streams.value.log
+  val log = streams.value.log
   log info s"building executable webapp in ${workDir}"
 
   // initialize temp directory
-  val temp  = workDir / "webapp"
+  val temp = workDir / "webapp"
   IO delete temp
 
   // include jetty classes
   val jettyJars = Keys.update.value select configurationFilter(name = ExecutableConfig.name)
   jettyJars foreach { jar =>
-    IO unzip (jar, temp, (name:String) =>
+    IO unzip (jar, temp, (name: String) =>
       (name startsWith "javax/") ||
-      (name startsWith "org/")
+        (name startsWith "org/"))
-    )
   }
 
   // include original war file
-  val warFile   = (Keys.`package`).value
+  val warFile = (Keys.`package`).value
   IO unzip (warFile, temp)
 
   // include launcher classes
-  val classDir      = (Keys.classDirectory in Compile).value
+  val classDir = (Keys.classDirectory in Compile).value
-  val launchClasses = Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */)
+  val launchClasses = Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */ )
   launchClasses foreach { name =>
     IO copyFile (classDir / name, temp / name)
   }
@@ -165,32 +157,39 @@ executableKey := {
   // include plugins
   val pluginsDir = temp / "WEB-INF" / "classes" / "plugins"
   IO createDirectory (pluginsDir)
-  IO copyFile(Keys.baseDirectory.value / "plugins.json", pluginsDir / "plugins.json")
 
-  val json = IO read(Keys.baseDirectory.value / "plugins.json")
+  val plugins = IO readLines (Keys.baseDirectory.value / "src" / "main" / "resources" / "bundle-plugins.txt")
-  PluginsJson.getUrls(json).foreach { url =>
+  plugins.foreach { plugin =>
-    log info s"Download: ${url}"
+    plugin.trim.split(":") match {
-    IO transfer(new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
+      case Array(pluginId, pluginVersion) =>
+        val url = "https://plugins.gitbucket-community.org/releases/" +
+          s"gitbucket-${pluginId}-plugin/gitbucket-${pluginId}-plugin-gitbucket_${version.value}-${pluginVersion}.jar"
+        log info s"Download: ${url}"
+        IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
+      case _ => ()
+    }
   }
 
   // zip it up
   IO delete (temp / "META-INF" / "MANIFEST.MF")
-  val contentMappings   = (temp.allPaths --- PathFinder(temp)).get pair { file => IO.relativizeFile(temp, file) }
+  val contentMappings = (temp.allPaths --- PathFinder(temp)).get pair { file =>
-  val manifest          = new JarManifest
+    IO.relativizeFile(temp, file)
+  }
+  val manifest = new JarManifest
   manifest.getMainAttributes put (AttrName.MANIFEST_VERSION, "1.0")
-  manifest.getMainAttributes put (AttrName.MAIN_CLASS,       "JettyLauncher")
+  manifest.getMainAttributes put (AttrName.MAIN_CLASS, "JettyLauncher")
-  val outputFile    = workDir / warName
+  val outputFile = workDir / warName
-  IO jar (contentMappings.map { case (file, path) => (file, path.toString) } , outputFile, manifest)
+  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest)
 
   // generate checksums
   Seq(
-    "md5"    -> "MD5",
+    "md5" -> "MD5",
-    "sha1"   -> "SHA-1",
+    "sha1" -> "SHA-1",
     "sha256" -> "SHA-256"
-  )
+  ).foreach {
-  .foreach { case (extension, algorithm) =>
+    case (extension, algorithm) =>
-    val checksumFile = workDir / (warName + "." + extension)
+      val checksumFile = workDir / (warName + "." + extension)
-    Checksums generate (outputFile, checksumFile, algorithm)
+      Checksums generate (outputFile, checksumFile, algorithm)
   }
 
   // done
@@ -200,10 +199,12 @@ executableKey := {
 publishTo := {
   val nexus = "https://oss.sonatype.org/"
   if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
-  else                                         Some("releases"  at nexus + "service/local/staging/deploy/maven2")
+  else Some("releases" at nexus + "service/local/staging/deploy/maven2")
 }
 publishMavenStyle := true
-pomIncludeRepository := { _ => false }
+pomIncludeRepository := { _ =>
+  false
+}
 pomExtra := (
   <url>https://github.com/gitbucket/gitbucket</url>
   <licenses>

doc/comment_action.md

@@ -6,22 +6,26 @@ The details are saved at `ISSUE_COMMENT` table.
 To determine if it was any operation, you see the `ACTION` column.
 And in the case of some actions, `CONTENT` column value contains additional information.
 
-|ACTION          |CONTENT               |
+|ACTION          |CONTENT                   |
-|----------------|----------------------|
+|----------------|--------------------------|
-|comment         |comment               |
+|comment         |comment                   |
-|close_comment   |comment               |
+|close_comment   |comment                   |
-|reopen_comment  |comment               |
+|reopen_comment  |comment                   |
-|close           |"Close"               |
+|close           |"Close"                   |
-|reopen          |"Reopen"              |
+|reopen          |"Reopen"                  |
-|commit          |comment commitId      |
+|commit          |comment commitId          |
-|merge           |comment               |
+|merge           |comment                   |
-|delete_branch   |branchName            |
+|delete_branch   |branchName                |
-|refer           |issueId:title         |
+|refer           |issueId:title             |
-|add_label       |labelName             |
+|add_label       |labelName                 |
-|delete_label    |labelName             |
+|delete_label    |labelName                 |
-|change_priority |oldPriority:priority  |
+|change_priority |oldPriority:priority      |
-|change_milestone|oldMilestone:milestone|
+|change_milestone|oldMilestone:milestone    |
-|assign          |oldAssigned:assigned  |
+|assign          |oldAssigned:assigned      |
+|change_title    |oldTitle(CRLF)title \[1\] |
+
+\[1\]: (CRLF) is "\r\n"
+
 
 ### comment
 
@@ -79,3 +83,7 @@ This value is saved when users have changed the milestone.
 ### assign
 
 This value is saved when users have assign issue/PR to user or remove the assign.
+
+### change_title
+
+This value is saved when users have changed the title.

doc/jrebel.md

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

doc/readme.md

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

doc/release.md

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

plugins.json

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

project/Checksums.scala

@@ -6,29 +6,31 @@ import io._
 object Checksums {
   private val bufferSize = 2048
 
-  def generate(source:File, target:File, algorithm:String):Unit =
+  def generate(source: File, target: File, algorithm: String): Unit =
-      sbt.IO write (target, compute(source, algorithm))
+    sbt.IO write (target, compute(source, algorithm))
 
-  def compute(file:File, algorithm:String):String =
+  def compute(file: File, algorithm: String): String =
-      hex(raw(file, algorithm))
+    hex(raw(file, algorithm))
 
-  def raw(file:File, algorithm:String):Array[Byte]    =
+  def raw(file: File, algorithm: String): Array[Byte] =
-      (Using fileInputStream file) { is =>
+    (Using fileInputStream file) { is =>
-        val md  = MessageDigest getInstance algorithm
+      val md = MessageDigest getInstance algorithm
-        val buf = new Array[Byte](bufferSize)
+      val buf = new Array[Byte](bufferSize)
-        md.reset()
+      md.reset()
-        @tailrec
+      @tailrec
-        def loop() {
+      def loop(): Unit = {
-          val len = is read buf
+        val len = is read buf
-          if (len != -1) {
+        if (len != -1) {
-            md update (buf, 0, len)
+          md update (buf, 0, len)
-            loop()
+          loop()
-          }
         }
-        loop()
-        md.digest()
       }
+      loop()
+      md.digest()
+    }
 
-  def hex(bytes:Array[Byte]):String =
+  def hex(bytes: Array[Byte]): String =
-      bytes map { it => "%02x" format (it.toInt & 0xff) } mkString ""
+    bytes map { it =>
+      "%02x" format (it.toInt & 0xff)
+    } mkString ""
 }

project/PluginsJson.scala

@@ -13,4 +13,3 @@ object PluginsJson {
   }
 
 }
-

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.1
+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,10 +1,10 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.13")
+addSbtPlugin("com.geirsson"     % "sbt-scalafmt" % "1.5.0")
-addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.5")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"    % "1.3.15")
-//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly" % "0.14.9")
-//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.3")
-addSbtPlugin("org.scalatra.sbt"     % "sbt-scalatra"      % "1.0.1")
+addSbtPlugin("com.jsuereth"     % "sbt-pgp"      % "1.1.2")
-addSbtPlugin("com.jsuereth"         % "sbt-pgp"           % "1.1.0")
 addSbtCoursier
-addSbtPlugin("com.typesafe.sbt"     % "sbt-license-report" % "1.2.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-license-report"   % "1.2.0")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")

src/main/resources/bundle-plugins.txt

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

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <dropForeignKeyConstraint baseTableName="RELEASE_ASSET" constraintName="IDX_RELEASE_ASSET_FK1"/>
+
+  <dropForeignKeyConstraint baseTableName="RELEASE" constraintName="IDX_RELEASE_FK0"/>
+  <dropPrimaryKey tableName="RELEASE" constraintName="IDX_RELEASE_PK"/>
+
+  <renameTable newTableName="RELEASE_TAG" oldTableName="RELEASE" />
+
+  <addPrimaryKey constraintName="IDX_RELEASE_TAG_PK" tableName="RELEASE_TAG" columnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
+  <addForeignKeyConstraint constraintName="IDX_RELEASE_TAG_FK0" baseTableName="RELEASE_TAG" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+
+  <addForeignKeyConstraint constraintName="IDX_RELEASE_ASSET_FK0" baseTableName="RELEASE_ASSET" baseColumnNames="USER_NAME, REPOSITORY_NAME, TAG" referencedTableName="RELEASE_TAG" referencedColumnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
+</changeSet>

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

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

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

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

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

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

src/main/scala/ScalatraBootstrap.scala

@@ -1,4 +1,3 @@
-
 import java.util.EnumSet
 import javax.servlet._
 
@@ -9,28 +8,35 @@ import gitbucket.core.servlet._
 import gitbucket.core.util.Directory
 import org.scalatra._
 
-
 class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
-  override def init(context: ServletContext) {
+  override def init(context: ServletContext): Unit = {
 
     val settings = loadSystemSettings()
-    if(settings.baseUrl.exists(_.startsWith("https://"))) {
+    if (settings.baseUrl.exists(_.startsWith("https://"))) {
       context.getSessionCookieConfig.setSecure(true)
     }
 
     // Register TransactionFilter and BasicAuthenticationFilter at first
     context.addFilter("transactionFilter", new TransactionFilter)
-    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context
+      .getFilterRegistration("transactionFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
     context.addFilter("gitAuthenticationFilter", new GitAuthenticationFilter)
-    context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
+    context
+      .getFilterRegistration("gitAuthenticationFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
     context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
-    context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
+    context
+      .getFilterRegistration("apiAuthenticationFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/*")
 
     // Register controllers
     context.mount(new PreProcessController, "/*")
 
     context.addFilter("pluginControllerFilter", new PluginControllerFilter)
-    context.getFilterRegistration("pluginControllerFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context
+      .getFilterRegistration("pluginControllerFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
     context.mount(new FileUploadController, "/upload")
 
@@ -51,11 +57,13 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     filter.mount(new RepositorySettingsController, "/*")
 
     context.addFilter("compositeScalatraFilter", filter)
-    context.getFilterRegistration("compositeScalatraFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context
+      .getFilterRegistration("compositeScalatraFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
     // Create GITBUCKET_HOME directory if it does not exist
     val dir = new java.io.File(Directory.GitBucketHome)
-    if(!dir.exists){
+    if (!dir.exists) {
       dir.mkdirs()
     }
   }

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

@@ -3,58 +3,61 @@ package gitbucket.core
 import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
 import io.github.gitbucket.solidbase.model.{Version, Module}
 
-object GitBucketCoreModule extends Module("gitbucket-core",
+object GitBucketCoreModule
-  new Version("4.0.0",
+    extends Module(
-    new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
+      "gitbucket-core",
-    new SqlMigration("update/gitbucket-core_4.0.sql")
+      new Version(
-  ),
+        "4.0.0",
-  new Version("4.1.0"),
+        new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
-  new Version("4.2.0",
+        new SqlMigration("update/gitbucket-core_4.0.sql")
-    new LiquibaseMigration("update/gitbucket-core_4.2.xml")
+      ),
-  ),
+      new Version("4.1.0"),
-  new Version("4.2.1"),
+      new Version("4.2.0", new LiquibaseMigration("update/gitbucket-core_4.2.xml")),
-  new Version("4.3.0"),
+      new Version("4.2.1"),
-  new Version("4.4.0"),
+      new Version("4.3.0"),
-  new Version("4.5.0"),
+      new Version("4.4.0"),
-  new Version("4.6.0",
+      new Version("4.5.0"),
-    new LiquibaseMigration("update/gitbucket-core_4.6.xml")
+      new Version("4.6.0", new LiquibaseMigration("update/gitbucket-core_4.6.xml")),
-  ),
+      new Version(
-  new Version("4.7.0",
+        "4.7.0",
-    new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
+        new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
-    new SqlMigration("update/gitbucket-core_4.7.sql")
+        new SqlMigration("update/gitbucket-core_4.7.sql")
-  ),
+      ),
-  new Version("4.7.1"),
+      new Version("4.7.1"),
-  new Version("4.8"),
+      new Version("4.8"),
-  new Version("4.9.0",
+      new Version("4.9.0", new LiquibaseMigration("update/gitbucket-core_4.9.xml")),
-    new LiquibaseMigration("update/gitbucket-core_4.9.xml")
+      new Version("4.10.0"),
-  ),
+      new Version("4.11.0", new LiquibaseMigration("update/gitbucket-core_4.11.xml")),
-  new Version("4.10.0"),
+      new Version("4.12.0"),
-  new Version("4.11.0",
+      new Version("4.12.1"),
-    new LiquibaseMigration("update/gitbucket-core_4.11.xml")
+      new Version("4.13.0"),
-  ),
+      new Version(
-  new Version("4.12.0"),
+        "4.14.0",
-  new Version("4.12.1"),
+        new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
-  new Version("4.13.0"),
+        new SqlMigration("update/gitbucket-core_4.14.sql")
-  new Version("4.14.0",
+      ),
-    new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
+      new Version("4.14.1"),
-    new SqlMigration("update/gitbucket-core_4.14.sql")
+      new Version("4.15.0"),
-  ),
+      new Version("4.16.0"),
-  new Version("4.14.1"),
+      new Version("4.17.0"),
-  new Version("4.15.0"),
+      new Version("4.18.0"),
-  new Version("4.16.0"),
+      new Version("4.19.0"),
-  new Version("4.17.0"),
+      new Version("4.19.1"),
-  new Version("4.18.0"),
+      new Version("4.19.2"),
-  new Version("4.19.0"),
+      new Version("4.19.3"),
-  new Version("4.19.1"),
+      new Version("4.20.0"),
-  new Version("4.19.2"),
+      new Version("4.21.0", new LiquibaseMigration("update/gitbucket-core_4.21.xml")),
-  new Version("4.19.3"),
+      new Version("4.21.1"),
-  new Version("4.20.0"),
+      new Version("4.21.2"),
-  new Version("4.21.0",
+      new Version("4.22.0", new LiquibaseMigration("update/gitbucket-core_4.22.xml")),
-    new LiquibaseMigration("update/gitbucket-core_4.21.xml")
+      new Version("4.23.0", new LiquibaseMigration("update/gitbucket-core_4.23.xml")),
-  ),
+      new Version("4.23.1"),
-  new Version("4.21.1"),
+      new Version("4.24.0", new LiquibaseMigration("update/gitbucket-core_4.24.xml")),
-  new Version("4.21.2"),
+      new Version("4.24.1"),
-  new Version("4.22.0",
+      new Version("4.25.0", new LiquibaseMigration("update/gitbucket-core_4.25.xml")),
-    new LiquibaseMigration("update/gitbucket-core_4.22.xml")
+      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.30.0")
+    )

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

@@ -6,13 +6,14 @@ import gitbucket.core.util.RepositoryName
  * https://developer.github.com/v3/repos/#get-branch
  * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
  */
-case class ApiBranch(
+case class ApiBranch(name: String, commit: ApiBranchCommit, protection: ApiBranchProtection)(
-  name: String,
+  repositoryName: RepositoryName
-  commit: ApiBranchCommit,
+) extends FieldSerializable {
-  protection: ApiBranchProtection)(repositoryName:RepositoryName) extends FieldSerializable {
+  def _links =
-  def _links = Map(
+    Map(
-   "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
+      "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
-   "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}"))
+      "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}")
+    )
 }
 
 case class ApiBranchCommit(sha: String)

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

@@ -4,17 +4,22 @@ import gitbucket.core.service.ProtectedBranchService
 import org.json4s._
 
 /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]){
+case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]) {
   def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
 }
 
-object ApiBranchProtection{
+object ApiBranchProtection {
+
   /** form for enabling-and-disabling-branch-protection */
   case class EnablingAndDisabling(protection: ApiBranchProtection)
 
-  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection = ApiBranchProtection(
+  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection =
-    enabled = info.enabled,
+    ApiBranchProtection(
-    required_status_checks = Some(Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)))
+      enabled = info.enabled,
+      required_status_checks = Some(
+        Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)
+      )
+    )
   val statusNone = Status(Off, Seq.empty)
   case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
   sealed class EnforcementLevel(val name: String)
@@ -22,25 +27,28 @@ object ApiBranchProtection{
   case object NonAdmins extends EnforcementLevel("non_admins")
   case object Everyone extends EnforcementLevel("everyone")
   object EnforcementLevel {
-    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel = if(enabled){
+    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel =
-      if(includeAdministrators){
+      if (enabled) {
-        Everyone
+        if (includeAdministrators) {
-      }else{
+          Everyone
-        NonAdmins
+        } else {
+          NonAdmins
+        }
+      } else {
+        Off
       }
-    }else{
-      Off
-    }
   }
 
-  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](format => (
+  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](
-   {
+    format =>
-     case JString("off") => Off
+      (
-     case JString("non_admins") => NonAdmins
+        {
-     case JString("everyone") => Everyone
+          case JString("off")        => Off
-   },
+          case JString("non_admins") => NonAdmins
-   {
+          case JString("everyone")   => Everyone
-     case x: EnforcementLevel => JString(x.name)
+        }, {
-   }
+          case x: EnforcementLevel => JString(x.name)
- ))
+        }
+    )
+  )
 }

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

@@ -2,7 +2,6 @@ package gitbucket.core.api
 
 import gitbucket.core.model.{Account, CommitState, CommitStatus}
 
-
 /**
  * https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
  */
@@ -11,15 +10,22 @@ case class ApiCombinedCommitStatus(
   sha: String,
   total_count: Int,
   statuses: Iterable[ApiCommitStatus],
-  repository: ApiRepository){
+  repository: ApiRepository
+) {
   // val commit_url = ApiPath(s"/api/v3/repos/${repository.full_name}/${sha}")
   val url = ApiPath(s"/api/v3/repos/${repository.full_name}/commits/${sha}/status")
 }
 object ApiCombinedCommitStatus {
-  def apply(sha:String, statuses: Iterable[(CommitStatus, Account)], repository:ApiRepository): ApiCombinedCommitStatus = ApiCombinedCommitStatus(
+  def apply(
-    state      = CommitState.combine(statuses.map(_._1.state).toSet).name,
+    sha: String,
-    sha        = sha,
+    statuses: Iterable[(CommitStatus, Account)],
-    total_count= statuses.size,
+    repository: ApiRepository
-    statuses   = statuses.map{ case (s, a)=> ApiCommitStatus(s, ApiUser(a)) },
+  ): ApiCombinedCommitStatus =
-    repository = repository)
+    ApiCombinedCommitStatus(
+      state = CommitState.combine(statuses.map(_._1.state).toSet).name,
+      sha = sha,
+      total_count = statuses.size,
+      statuses = statuses.map { case (s, a) => ApiCommitStatus(s, ApiUser(a)) },
+      repository = repository
+    )
 }

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

@@ -5,25 +5,32 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/issues/comments/
  */
-case class ApiComment(
+case class ApiComment(id: Int, user: ApiUser, body: String, created_at: Date, updated_at: Date)(
-  id: Int,
+  repositoryName: RepositoryName,
-  user: ApiUser,
+  issueId: Int,
-  body: String,
+  isPullRequest: Boolean
-  created_at: Date,
+) {
-  updated_at: Date)(repositoryName: RepositoryName, issueId: Int, isPullRequest: Boolean){
+  val html_url = ApiPath(
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${issueId}#comment-${id}")
+    s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${issueId}#comment-${id}"
+  )
 }
 
-object ApiComment{
+object ApiComment {
-  def apply(comment: IssueComment, repositoryName: RepositoryName, issueId: Int, user: ApiUser, isPullRequest: Boolean): ApiComment =
+  def apply(
+    comment: IssueComment,
+    repositoryName: RepositoryName,
+    issueId: Int,
+    user: ApiUser,
+    isPullRequest: Boolean
+  ): ApiComment =
     ApiComment(
       id = comment.commentId,
       user = user,
       body = comment.content,
       created_at = comment.registeredDate,
-      updated_at = comment.updatedDate)(repositoryName, issueId, isPullRequest)
+      updated_at = comment.updatedDate
+    )(repositoryName, issueId, isPullRequest)
 }

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

@@ -20,38 +20,41 @@ case class ApiCommit(
   removed: List[String],
   modified: List[String],
   author: ApiPersonIdent,
-  committer: ApiPersonIdent)(repositoryName:RepositoryName, urlIsHtmlUrl: Boolean) extends FieldSerializable{
+  committer: ApiPersonIdent
-  val url = if(urlIsHtmlUrl){
+)(repositoryName: RepositoryName, urlIsHtmlUrl: Boolean)
+    extends FieldSerializable {
+  val url = if (urlIsHtmlUrl) {
     ApiPath(s"/${repositoryName.fullName}/commit/${id}")
-  }else{
+  } else {
     ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
   }
-  val html_url = if(urlIsHtmlUrl){
+  val html_url = if (urlIsHtmlUrl) {
     None
-  }else{
+  } else {
     Some(ApiPath(s"/${repositoryName.fullName}/commit/${id}"))
   }
 }
 
-object ApiCommit{
+object ApiCommit {
   def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo, urlIsHtmlUrl: Boolean = false): ApiCommit = {
     val diffs = JGitUtil.getDiffs(git, None, commit.id, false, false)
     ApiCommit(
-      id        = commit.id,
+      id = commit.id,
-      message   = commit.fullMessage,
+      message = commit.fullMessage,
       timestamp = commit.commitTime,
-      added     = diffs.collect {
+      added = diffs.collect {
-        case x if x.changeType == DiffEntry.ChangeType.ADD    => x.newPath
+        case x if x.changeType == DiffEntry.ChangeType.ADD => x.newPath
       },
-      removed   = diffs.collect {
+      removed = diffs.collect {
         case x if x.changeType == DiffEntry.ChangeType.DELETE => x.oldPath
       },
-      modified  = diffs.collect {
+      modified = diffs.collect {
         case x if x.changeType != DiffEntry.ChangeType.ADD && x.changeType != DiffEntry.ChangeType.DELETE => x.newPath
       },
-      author    = ApiPersonIdent.author(commit),
+      author = ApiPersonIdent.author(commit),
       committer = ApiPersonIdent.committer(commit)
     )(repositoryName, urlIsHtmlUrl)
   }
-  def forWebhookPayload(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = apply(git, repositoryName, commit, true)
+  def forWebhookPayload(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit =
+    apply(git, repositoryName, commit, true)
 }

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

@@ -4,7 +4,6 @@ import gitbucket.core.api.ApiCommitListItem._
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.RepositoryName
 
-
 /**
  * https://developer.github.com/v3/repos/commits/
  */
@@ -13,30 +12,33 @@ case class ApiCommitListItem(
   commit: Commit,
   author: Option[ApiUser],
   committer: Option[ApiUser],
-  parents: Seq[Parent])(repositoryName: RepositoryName) {
+  parents: Seq[Parent]
+)(repositoryName: RepositoryName) {
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}")
 }
 
 object ApiCommitListItem {
-  def apply(commit: CommitInfo, repositoryName: RepositoryName): ApiCommitListItem = ApiCommitListItem(
+  def apply(commit: CommitInfo, repositoryName: RepositoryName): ApiCommitListItem =
-    sha    = commit.id,
+    ApiCommitListItem(
-    commit = Commit(
+      sha = commit.id,
-      message   = commit.fullMessage,
+      commit = Commit(
-      author    = ApiPersonIdent.author(commit),
+        message = commit.fullMessage,
-      committer = ApiPersonIdent.committer(commit)
+        author = ApiPersonIdent.author(commit),
+        committer = ApiPersonIdent.committer(commit)
       )(commit.id, repositoryName),
-    author    = None,
+      author = None,
-    committer = None,
+      committer = None,
-    parents   = commit.parents.map(Parent(_)(repositoryName)))(repositoryName)
+      parents = commit.parents.map(Parent(_)(repositoryName))
+    )(repositoryName)
 
-  case class Parent(sha: String)(repositoryName: RepositoryName){
+  case class Parent(sha: String)(repositoryName: RepositoryName) {
     val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}")
   }
 
-  case class Commit(
+  case class Commit(message: String, author: ApiPersonIdent, committer: ApiPersonIdent)(
-    message: String,
+    sha: String,
-    author: ApiPersonIdent,
+    repositoryName: RepositoryName
-    committer: ApiPersonIdent)(sha:String, repositoryName: RepositoryName) {
+  ) {
     val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/commits/${sha}")
   }
 }

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

@@ -5,7 +5,6 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/repos/statuses/#create-a-status
  * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
@@ -23,16 +22,16 @@ case class ApiCommitStatus(
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}/statuses")
 }
 
-
 object ApiCommitStatus {
-  def apply(status: CommitStatus, creator:ApiUser): ApiCommitStatus = ApiCommitStatus(
+  def apply(status: CommitStatus, creator: ApiUser): ApiCommitStatus =
-    created_at = status.registeredDate,
+    ApiCommitStatus(
-    updated_at = status.updatedDate,
+      created_at = status.registeredDate,
-    state      = status.state.name,
+      updated_at = status.updatedDate,
-    target_url = status.targetUrl,
+      state = status.state.name,
-    description= status.description,
+      target_url = status.targetUrl,
-    id         = status.commitStatusId,
+      description = status.description,
-    context    = status.context,
+      id = status.commitStatusId,
-    creator    = creator
+      context = status.context,
-  )(status.commitId, RepositoryName(status))
+      creator = creator
+    )(status.commitId, RepositoryName(status))
 }

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

@@ -51,20 +51,25 @@ object ApiCommits {
     patch: String
   )
 
-
+  def apply(
-  def apply(repositoryName: RepositoryName, commitInfo: CommitInfo, diffs: Seq[DiffInfo], author: Account, committer: Account,
+    repositoryName: RepositoryName,
-            commentCount: Int): ApiCommits = {
+    commitInfo: CommitInfo,
+    diffs: Seq[DiffInfo],
+    author: Account,
+    committer: Account,
+    commentCount: Int
+  ): ApiCommits = {
     val files = diffs.map { diff =>
       var additions = 0
       var deletions = 0
 
       diff.patch.getOrElse("").split("\n").foreach { line =>
-        if(line.startsWith("+")) additions = additions + 1
+        if (line.startsWith("+")) additions = additions + 1
-        if(line.startsWith("-")) deletions = deletions + 1
+        if (line.startsWith("-")) deletions = deletions + 1
       }
 
       File(
-        filename = if(diff.changeType == ChangeType.DELETE){ diff.oldPath } else { diff.newPath },
+        filename = if (diff.changeType == ChangeType.DELETE) { diff.oldPath } else { diff.newPath },
         additions = additions,
         deletions = deletions,
         changes = additions + deletions,
@@ -75,12 +80,12 @@ object ApiCommits {
           case ChangeType.RENAME => "renamed"
           case ChangeType.COPY   => "copied"
         },
-        raw_url = if(diff.changeType == ChangeType.DELETE){
+        raw_url = if (diff.changeType == ChangeType.DELETE) {
           ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.parents.head}/${diff.oldPath}")
         } else {
           ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.id}/${diff.newPath}")
         },
-        blob_url = if(diff.changeType == ChangeType.DELETE){
+        blob_url = if (diff.changeType == ChangeType.DELETE) {
           ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.parents.head}/${diff.oldPath}")
         } else {
           ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.id}/${diff.newPath}")

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

@@ -11,18 +11,29 @@ case class ApiContents(
   path: String,
   sha: String,
   content: Option[String],
-  encoding: Option[String])(repositoryName: RepositoryName){
+  encoding: Option[String]
+)(repositoryName: RepositoryName) {
   val download_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/raw/${sha}/${path}")
 }
 
-object ApiContents{
+object ApiContents {
   def apply(fileInfo: FileInfo, repositoryName: RepositoryName, content: Option[Array[Byte]]): ApiContents = {
-    if(fileInfo.isDirectory) {
+    if (fileInfo.isDirectory) {
       ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)
     } else {
-      content.map(arr =>
+      content
-        ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.getEncoder.encodeToString(arr)), Some("base64"))(repositoryName)
+        .map(
-      ).getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
+          arr =>
+            ApiContents(
+              "file",
+              fileInfo.name,
+              fileInfo.path,
+              fileInfo.commitId,
+              Some(Base64.getEncoder.encodeToString(arr)),
+              Some("base64")
+            )(repositoryName)
+        )
+        .getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
     }
   }
 }

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

@@ -1,3 +1,3 @@
 package gitbucket.core.api
 
-case class ApiEndPoint(rate_limit_url: ApiPath = ApiPath("/api/v3/rate_limit"))
+case class ApiEndPoint(rate_limit_url: ApiPath = ApiPath("/api/v3/rate_limit"))

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

@@ -1,5 +1,3 @@
 package gitbucket.core.api
 
-case class ApiError(
+case class ApiError(message: String, documentation_url: Option[String] = None)
-  message: String,
-  documentation_url: Option[String] = None)

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

@@ -5,7 +5,6 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/issues/
  */
@@ -13,33 +12,39 @@ case class ApiIssue(
   number: Int,
   title: String,
   user: ApiUser,
-  // labels,
+  labels: List[ApiLabel],
   state: String,
   created_at: Date,
   updated_at: Date,
-  body: String)(repositoryName: RepositoryName, isPullRequest: Boolean){
+  body: String
+)(repositoryName: RepositoryName, isPullRequest: Boolean) {
+  val id = 0 // dummy id
   val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${number}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${number}")
   val pull_request = if (isPullRequest) {
-    Some(Map(
+    Some(
-      "url" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/${number}"),
+      Map(
-      "html_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}")
+        "url" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/${number}"),
-      // "diff_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.diff"),
+        "html_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}")
-      // "patch_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.patch")
+        // "diff_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.diff"),
-    ))
+        // "patch_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.patch")
+      )
+    )
   } else {
     None
   }
 }
 
-object ApiIssue{
+object ApiIssue {
-  def apply(issue: Issue, repositoryName: RepositoryName, user: ApiUser): ApiIssue =
+  def apply(issue: Issue, repositoryName: RepositoryName, user: ApiUser, labels: List[ApiLabel]): ApiIssue =
     ApiIssue(
       number = issue.issueId,
-      title  = issue.title,
+      title = issue.title,
-      user   = user,
+      user = user,
-      state  = if(issue.closed){ "closed" }else{ "open" },
+      labels = labels,
-      body   = issue.content.getOrElse(""),
+      state = if (issue.closed) { "closed" } else { "open" },
+      body = issue.content.getOrElse(""),
       created_at = issue.registeredDate,
-      updated_at = issue.updatedDate)(repositoryName, issue.isPullRequest)
+      updated_at = issue.updatedDate
+    )(repositoryName, issue.isPullRequest)
 }

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

@@ -4,18 +4,16 @@ import gitbucket.core.model.Label
 import gitbucket.core.util.RepositoryName
 
 /**
-  * https://developer.github.com/v3/issues/labels/
+ * https://developer.github.com/v3/issues/labels/
-  */
+ */
-case class ApiLabel(
+case class ApiLabel(name: String, color: String)(repositoryName: RepositoryName) {
-  name: String,
-  color: String)(repositoryName: RepositoryName){
   var url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/labels/${name}")
 }
 
-object ApiLabel{
+object ApiLabel {
-  def apply(label:Label, repositoryName: RepositoryName): ApiLabel =
+  def apply(label: Label, repositoryName: RepositoryName): ApiLabel =
     ApiLabel(
       name = label.labelName,
       color = label.color
     )(repositoryName)
-}
+}

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

@@ -4,22 +4,11 @@ import gitbucket.core.util.JGitUtil.CommitInfo
 
 import java.util.Date
 
-
+case class ApiPersonIdent(name: String, email: String, date: Date)
-case class ApiPersonIdent(
-  name: String,
-  email: String,
-  date: Date)
-
 
 object ApiPersonIdent {
   def author(commit: CommitInfo): ApiPersonIdent =
-    ApiPersonIdent(
+    ApiPersonIdent(name = commit.authorName, email = commit.authorEmailAddress, date = commit.authorTime)
-      name  = commit.authorName,
-      email = commit.authorEmailAddress,
-      date  = commit.authorTime)
   def committer(commit: CommitInfo): ApiPersonIdent =
-    ApiPersonIdent(
+    ApiPersonIdent(name = commit.committerName, email = commit.committerEmailAddress, date = commit.commitTime)
-      name  = commit.committerName,
-      email = commit.committerEmailAddress,
-      date  = commit.commitTime)
 }

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

@@ -0,0 +1,17 @@
+package gitbucket.core.api
+
+import gitbucket.core.plugin.{PluginRegistry, PluginInfo}
+
+case class ApiPlugin(
+  id: String,
+  name: String,
+  version: String,
+  description: String,
+  jarFileName: String
+)
+
+object ApiPlugin {
+  def apply(plugin: PluginInfo): ApiPlugin = {
+    ApiPlugin(plugin.pluginId, plugin.pluginName, plugin.pluginVersion, plugin.description, plugin.pluginJar.getName)
+  }
+}

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

@@ -20,57 +20,53 @@ case class ApiPullRequest(
   title: String,
   body: String,
   user: ApiUser,
-  assignee: Option[ApiUser]){
+  labels: List[ApiLabel],
-  val html_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
+  assignee: Option[ApiUser]
+) {
+  val id = 0 // dummy id
+  val html_url = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
   //val diff_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}.diff")
   //val patch_url           = ApiPath(s"${base.repo.html_url.path}/pull/${number}.patch")
-  val url                 = ApiPath(s"${base.repo.url.path}/pulls/${number}")
+  val url = ApiPath(s"${base.repo.url.path}/pulls/${number}")
   //val issue_url           = ApiPath(s"${base.repo.url.path}/issues/${number}")
-  val commits_url         = ApiPath(s"${base.repo.url.path}/pulls/${number}/commits")
+  val commits_url = ApiPath(s"${base.repo.url.path}/pulls/${number}/commits")
   val review_comments_url = ApiPath(s"${base.repo.url.path}/pulls/${number}/comments")
-  val review_comment_url  = ApiPath(s"${base.repo.url.path}/pulls/comments/{number}")
+  val review_comment_url = ApiPath(s"${base.repo.url.path}/pulls/comments/{number}")
-  val comments_url        = ApiPath(s"${base.repo.url.path}/issues/${number}/comments")
+  val comments_url = ApiPath(s"${base.repo.url.path}/issues/${number}/comments")
-  val statuses_url        = ApiPath(s"${base.repo.url.path}/statuses/${head.sha}")
+  val statuses_url = ApiPath(s"${base.repo.url.path}/statuses/${head.sha}")
 }
 
-object ApiPullRequest{
+object ApiPullRequest {
   def apply(
     issue: Issue,
     pullRequest: PullRequest,
     headRepo: ApiRepository,
     baseRepo: ApiRepository,
     user: ApiUser,
+    labels: List[ApiLabel],
     assignee: Option[ApiUser],
     mergedComment: Option[(IssueComment, Account)]
   ): ApiPullRequest =
     ApiPullRequest(
-      number     = issue.issueId,
+      number = issue.issueId,
-      state      = if (issue.closed) "closed" else "open",
+      state = if (issue.closed) "closed" else "open",
       updated_at = issue.updatedDate,
       created_at = issue.registeredDate,
-      head       = Commit(
+      head = Commit(sha = pullRequest.commitIdTo, ref = pullRequest.requestBranch, repo = headRepo)(issue.userName),
-                     sha  = pullRequest.commitIdTo,
+      base = Commit(sha = pullRequest.commitIdFrom, ref = pullRequest.branch, repo = baseRepo)(issue.userName),
-                     ref  = pullRequest.requestBranch,
+      mergeable = None, // TODO: need check mergeable.
-                     repo = headRepo)(issue.userName),
+      merged = mergedComment.isDefined,
-      base       = Commit(
+      merged_at = mergedComment.map { case (comment, _) => comment.registeredDate },
-                     sha  = pullRequest.commitIdFrom,
+      merged_by = mergedComment.map { case (_, account) => ApiUser(account) },
-                     ref  = pullRequest.branch,
+      title = issue.title,
-                     repo = baseRepo)(issue.userName),
+      body = issue.content.getOrElse(""),
-      mergeable  = None, // TODO: need check mergeable.
+      user = user,
-      merged     = mergedComment.isDefined,
+      labels = labels,
-      merged_at  = mergedComment.map { case (comment, _) => comment.registeredDate },
+      assignee = assignee
-      merged_by  = mergedComment.map { case (_, account) => ApiUser(account) },
-      title      = issue.title,
-      body       = issue.content.getOrElse(""),
-      user       = user,
-      assignee   = assignee
     )
 
-  case class Commit(
+  case class Commit(sha: String, ref: String, repo: ApiRepository)(baseOwner: String) {
-    sha: String,
+    val label = if (baseOwner == repo.owner.login) { ref } else { s"${repo.owner.login}:${ref}" }
-    ref: String,
-    repo: ApiRepository)(baseOwner:String){
-    val label = if( baseOwner == repo.owner.login ){ ref } else { s"${repo.owner.login}:${ref}" }
     val user = repo.owner
   }
 

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

@@ -17,10 +17,11 @@ case class ApiPullRequestReviewComment(
   commit_id: String, // "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   user: ApiUser,
-  body: String, // "Maybe you should use more emojji on this line.",
+  body: String, // "Maybe you should use more emoji on this line.",
-  created_at: Date,  // "2015-05-05T23:40:27Z",
+  created_at: Date, // "2015-05-05T23:40:27Z",
   updated_at: Date // "2015-05-05T23:40:27Z",
-)(repositoryName:RepositoryName, issueId: Int) extends FieldSerializable {
+)(repositoryName: RepositoryName, issueId: Int)
+    extends FieldSerializable {
   // "url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/comments/29724692",
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/comments/${id}")
   // "html_url": "https://github.com/baxterthehacker/public-repo/pull/1#discussion_r29724692",
@@ -40,22 +41,28 @@ case class ApiPullRequestReviewComment(
         "href": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/1"
       }
     }
-  */
+   */
   val _links = Map(
     "self" -> Map("href" -> url),
     "html" -> Map("href" -> html_url),
-    "pull_request" -> Map("href" -> pull_request_url))
+    "pull_request" -> Map("href" -> pull_request_url)
+  )
 }
 
-object ApiPullRequestReviewComment{
+object ApiPullRequestReviewComment {
-  def apply(comment: CommitComment, commentedUser: ApiUser, repositoryName: RepositoryName, issueId: Int): ApiPullRequestReviewComment =
+  def apply(
+    comment: CommitComment,
+    commentedUser: ApiUser,
+    repositoryName: RepositoryName,
+    issueId: Int
+  ): ApiPullRequestReviewComment =
     new ApiPullRequestReviewComment(
-     id = comment.commentId,
+      id = comment.commentId,
-     path = comment.fileName.getOrElse(""),
+      path = comment.fileName.getOrElse(""),
-     commit_id = comment.commitId,
+      commit_id = comment.commitId,
-     user = commentedUser,
+      user = commentedUser,
-     body = comment.content,
+      body = comment.content,
-     created_at = comment.registeredDate,
+      created_at = comment.registeredDate,
-     updated_at = comment.updatedDate
+      updated_at = comment.updatedDate
-  )(repositoryName, issueId)
+    )(repositoryName, issueId)
 }

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

@@ -5,7 +5,5 @@ import gitbucket.core.model.Account
 case class ApiPusher(name: String, email: String)
 
 object ApiPusher {
-  def apply(user: Account): ApiPusher = ApiPusher(
+  def apply(user: Account): ApiPusher = ApiPusher(name = user.userName, email = user.mailAddress)
-    name  = user.userName,
+}
-    email = user.mailAddress)
-}

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

@@ -3,7 +3,6 @@ package gitbucket.core.api
 import gitbucket.core.model.{Account, Repository}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 
-
 // https://developer.github.com/v3/repos/
 case class ApiRepository(
   name: String,
@@ -13,56 +12,59 @@ case class ApiRepository(
   forks: Int,
   `private`: Boolean,
   default_branch: String,
-  owner: ApiUser)(urlIsHtmlUrl: Boolean) {
+  owner: ApiUser
+)(urlIsHtmlUrl: Boolean) {
+  val id = 0 // dummy id
   val forks_count = forks
   val watchers_count = watchers
-  val url = if(urlIsHtmlUrl){
+  val url = if (urlIsHtmlUrl) {
     ApiPath(s"/${full_name}")
   } else {
     ApiPath(s"/api/v3/repos/${full_name}")
   }
-  val http_url  = ApiPath(s"/git/${full_name}.git")
+  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}")
+  val html_url = ApiPath(s"/${full_name}")
-  val ssh_url   = Some(SshPath(s":${full_name}.git"))
+  val ssh_url = Some(SshPath(s":${full_name}.git"))
 }
 
-object ApiRepository{
+object ApiRepository {
   def apply(
-      repository: Repository,
+    repository: Repository,
-      owner: ApiUser,
+    owner: ApiUser,
-      forkedCount: Int =0,
+    forkedCount: Int = 0,
-      watchers: Int = 0,
+    watchers: Int = 0,
-      urlIsHtmlUrl: Boolean = false): ApiRepository =
+    urlIsHtmlUrl: Boolean = false
+  ): ApiRepository =
     ApiRepository(
-      name           = repository.repositoryName,
+      name = repository.repositoryName,
-      full_name      = s"${repository.userName}/${repository.repositoryName}",
+      full_name = s"${repository.userName}/${repository.repositoryName}",
-      description    = repository.description.getOrElse(""),
+      description = repository.description.getOrElse(""),
-      watchers       = watchers,
+      watchers = watchers,
-      forks          = forkedCount,
+      forks = forkedCount,
-      `private`      = repository.isPrivate,
+      `private` = repository.isPrivate,
       default_branch = repository.defaultBranch,
-      owner          = owner
+      owner = owner
     )(urlIsHtmlUrl)
 
   def apply(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount)
+    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)
+    ApiRepository(repositoryInfo.repository, owner, forkedCount = repositoryInfo.forkedCount, urlIsHtmlUrl = true)
 
   def forDummyPayload(owner: ApiUser): ApiRepository =
     ApiRepository(
-      name           = "dummy",
+      name = "dummy",
-      full_name      = s"${owner.login}/dummy",
+      full_name = s"${owner.login}/dummy",
-      description    = "",
+      description = "",
-      watchers       = 0,
+      watchers = 0,
-      forks          = 0,
+      forks = 0,
-      `private`      = false,
+      `private` = false,
       default_branch = "master",
-      owner          = owner
+      owner = owner
     )(true)
 }

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

@@ -4,16 +4,11 @@ import gitbucket.core.model.Account
 
 import java.util.Date
 
-
+case class ApiUser(login: String, email: String, `type`: String, site_admin: Boolean, created_at: Date) {
-case class ApiUser(
+  val id = 0 // dummy id
-  login: String,
+  val url = ApiPath(s"/api/v3/users/${login}")
-  email: String,
+  val html_url = ApiPath(s"/${login}")
-  `type`: String,
+  val avatar_url = ApiPath(s"/${login}/_avatar")
-  site_admin: Boolean,
-  created_at: Date) {
-  val url                 = ApiPath(s"/api/v3/users/${login}")
-  val html_url            = ApiPath(s"/${login}")
-  val avatar_url          = ApiPath(s"/${login}/_avatar")
   // val followers_url       = ApiPath(s"/api/v3/users/${login}/followers")
   // val following_url       = ApiPath(s"/api/v3/users/${login}/following{/other_user}")
   // val gists_url           = ApiPath(s"/api/v3/users/${login}/gists{/gist_id}")
@@ -25,12 +20,11 @@ case class ApiUser(
   // val received_events_url = ApiPath(s"/api/v3/users/${login}/received_events")
 }
 
-
+object ApiUser {
-object ApiUser{
   def apply(user: Account): ApiUser = ApiUser(
-    login      = user.userName,
+    login = user.userName,
-    email      = user.mailAddress,
+    email = user.mailAddress,
-    `type`     = if(user.isGroupAccount){ "Organization" } else { "User" },
+    `type` = if (user.isGroupAccount) { "Organization" } else { "User" },
     site_admin = user.isAdmin,
     created_at = user.registeredDate
   )

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

@@ -1,18 +1,18 @@
 package gitbucket.core.api
 
 /**
-  * https://developer.github.com/v3/issues/labels/#create-a-label
+ * https://developer.github.com/v3/issues/labels/#create-a-label
-  * api form
+ * api form
-  */
+ */
 case class CreateALabel(
-    name: String,
+  name: String,
-    color: String
+  color: String
 ) {
   def isValid: Boolean = {
-    name.length<=100 &&
+    name.length <= 100 &&
-      !name.startsWith("_") &&
+    !name.startsWith("_") &&
-      !name.startsWith("-") &&
+    !name.startsWith("-") &&
-      color.length==6 &&
+    color.length == 6 &&
-      color.matches("[a-fA-F0-9+_.]+")
+    color.matches("[a-fA-F0-9+_.]+")
   }
-}
+}

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

@@ -5,15 +5,15 @@ package gitbucket.core.api
  * api form
  */
 case class CreateARepository(
-    name: String,
+  name: String,
-    description: Option[String],
+  description: Option[String],
-    `private`: Boolean = false,
+  `private`: Boolean = false,
-    auto_init: Boolean = false
+  auto_init: Boolean = false
 ) {
   def isValid: Boolean = {
     name.length <= 100 &&
-        name.matches("[a-zA-Z0-9\\-\\+_.]+") &&
+    name.matches("[a-zA-Z0-9\\-\\+_.]+") &&
-        !name.startsWith("_") &&
+    !name.startsWith("_") &&
-        !name.startsWith("-")
+    !name.startsWith("-")
   }
 }

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

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

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

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

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

@@ -15,12 +15,16 @@ object JsonFormat {
 
   val parserISO = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
-  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](format =>
+  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](
-    (
+    format =>
-      { case JString(s) => Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date")) },
+      (
-      { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
+        {
+          case JString(s) =>
+            Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date"))
+        }, { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
     )
   ) + FieldSerializer[ApiUser]() +
+    FieldSerializer[ApiGroup]() +
     FieldSerializer[ApiPullRequest]() +
     FieldSerializer[ApiRepository]() +
     FieldSerializer[ApiCommitListItem.Parent]() +
@@ -41,19 +45,31 @@ object JsonFormat {
     FieldSerializer[ApiCommits.File]() +
     ApiBranchProtection.enforcementLevelSerializer
 
-  def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](_ => ({
+  def apiPathSerializer(c: Context) =
-    case JString(s) if s.startsWith(c.baseUrl) => ApiPath(s.substring(c.baseUrl.length))
+    new CustomSerializer[ApiPath](
-    case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
+      _ =>
-  }, {
+        ({
-    case ApiPath(path) => JString(c.baseUrl + path)
+          case JString(s) if s.startsWith(c.baseUrl) => ApiPath(s.substring(c.baseUrl.length))
-  }))
+          case JString(s)                            => throw new MappingException("Can't convert " + s + " to ApiPath")
+        }, {
+          case ApiPath(path) => JString(c.baseUrl + path)
+        })
+    )
 
-  def sshPathSerializer(c: Context) = new CustomSerializer[SshPath](_ => ({
+  def sshPathSerializer(c: Context) =
-    case JString(s) if c.sshUrl.exists(sshUrl => s.startsWith(sshUrl)) => SshPath(s.substring(c.sshUrl.get.length))
+    new CustomSerializer[SshPath](
-    case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
+      _ =>
-  }, {
+        ({
-    case SshPath(path) => c.sshUrl.map { sshUrl => JString(sshUrl + path) } getOrElse JNothing
+          case JString(s) if c.sshUrl.exists(sshUrl => s.startsWith(sshUrl)) =>
-  }))
+            SshPath(s.substring(c.sshUrl.get.length))
+          case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
+        }, {
+          case SshPath(path) =>
+            c.sshUrl.map { sshUrl =>
+              JString(sshUrl + path)
+            } getOrElse JNothing
+        })
+    )
 
   /**
    * convert object to json string

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

@@ -1,8 +1,10 @@
 package gitbucket.core.controller
 
+import java.io.File
+
 import gitbucket.core.account.html
 import gitbucket.core.helper
-import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, Role, WebHook, WebHookContentType}
+import gitbucket.core.model._
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
@@ -16,77 +18,141 @@ import org.scalatra.i18n.Messages
 import org.scalatra.BadRequest
 import org.scalatra.forms._
 
-class AccountController extends AccountControllerBase
+class AccountController
-  with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
+    extends AccountControllerBase
-  with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
+    with AccountService
-  with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService
+    with RepositoryService
-
+    with ActivityService
+    with WikiService
+    with LabelsService
+    with SshKeyService
+    with OneselfAuthenticator
+    with UsersAuthenticator
+    with GroupManagerAuthenticator
+    with ReadableUsersAuthenticator
+    with AccessTokenService
+    with WebHookService
+    with PrioritiesService
+    with RepositoryCreationService
 
 trait AccountControllerBase extends AccountManagementControllerBase {
-  self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
+  self: AccountService
-    with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
+    with RepositoryService
-    with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService =>
+    with ActivityService
+    with WikiService
+    with LabelsService
+    with SshKeyService
+    with OneselfAuthenticator
+    with UsersAuthenticator
+    with GroupManagerAuthenticator
+    with ReadableUsersAuthenticator
+    with AccessTokenService
+    with WebHookService
+    with PrioritiesService
+    with RepositoryCreationService =>
 
-  case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
+  case class AccountNewForm(
-                            description: Option[String], url: Option[String], fileId: Option[String])
+    userName: String,
+    password: String,
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String]
+  )
 
-  case class AccountEditForm(password: Option[String], fullName: String, mailAddress: String,
+  case class AccountEditForm(
-                             description: Option[String], url: Option[String], fileId: Option[String], clearImage: Boolean)
+    password: Option[String],
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    clearImage: Boolean
+  )
 
   case class SshKeyForm(title: String, publicKey: String)
 
   case class PersonalTokenForm(note: String)
 
   val newForm = mapping(
-    "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "userName" -> trim(label("User name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     , text(required, maxlength(20), password))),
+    "password" -> trim(label("Password", text(required, maxlength(20), password))),
-    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
-    "description" -> trim(label("bio"          , optional(text()))),
+    "extraMailAddresses" -> list(
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress())))
-    "fileId"      -> trim(label("File ID"      , optional(text())))
+    ),
+    "description" -> trim(label("bio", optional(text()))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text())))
   )(AccountNewForm.apply)
 
   val editForm = mapping(
-    "password"    -> trim(label("Password"     , optional(text(maxlength(20), password)))),
+    "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
-    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "description" -> trim(label("bio"          , optional(text()))),
+    "extraMailAddresses" -> list(
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
+    ),
-    "clearImage"  -> trim(label("Clear image"  , boolean()))
+    "description" -> trim(label("bio", optional(text()))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text()))),
+    "clearImage" -> trim(label("Clear image", boolean()))
   )(AccountEditForm.apply)
 
   val sshKeyForm = mapping(
-    "title"     -> trim(label("Title", text(required, maxlength(100)))),
+    "title" -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey" -> trim2(label("Key" , text(required, validPublicKey)))
+    "publicKey" -> trim2(label("Key", text(required, validPublicKey)))
   )(SshKeyForm.apply)
 
   val personalTokenForm = mapping(
     "note" -> trim(label("Token", text(required, maxlength(100))))
   )(PersonalTokenForm.apply)
 
-  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String)
+  case class NewGroupForm(
-  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
+    groupName: String,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    members: String
+  )
+  case class EditGroupForm(
+    groupName: String,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    members: String,
+    clearImage: Boolean
+  )
 
   val newGroupForm = mapping(
-    "groupName"   -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"         -> trim(label("URL"        ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"    ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"     -> trim(label("Members"    ,text(required, members)))
+    "members" -> trim(label("Members", text(required, members)))
   )(NewGroupForm.apply)
 
   val editGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"         -> trim(label("URL"         ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"     ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"     -> trim(label("Members"     ,text(required, members))),
+    "members" -> trim(label("Members", text(required, members))),
-    "clearImage"  -> trim(label("Clear image" ,boolean()))
+    "clearImage" -> trim(label("Clear image", boolean()))
   )(EditGroupForm.apply)
 
-  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, initOption: String, sourceUrl: Option[String])
+  case class RepositoryCreationForm(
+    owner: String,
+    name: String,
+    description: Option[String],
+    isPrivate: Boolean,
+    initOption: String,
+    sourceUrl: Option[String]
+  )
   case class ForkRepositoryForm(owner: String, name: String)
 
   val newRepositoryForm = mapping(
@@ -100,7 +166,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   val forkRepositoryForm = mapping(
     "owner" -> trim(label("Repository owner", text(required))),
-    "name"  -> trim(label("Repository name",  text(required)))
+    "name" -> trim(label("Repository name", text(required)))
   )(ForkRepositoryForm.apply)
 
   case class AccountForm(accountName: String)
@@ -110,23 +176,30 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   )(AccountForm.apply)
 
   // for account web hook url addition.
-  case class AccountWebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
+  case class AccountWebHookForm(
-
+    url: String,
-  def accountWebHookForm(update:Boolean) = mapping(
+    events: Set[WebHook.Event],
-    "url"    -> trim(label("url", text(required, accountWebHook(update)))),
+    ctype: WebHookContentType,
-    "events" -> accountWebhookEvents,
+    token: Option[String]
-    "ctype" -> label("ctype", text()),
-    "token" -> optional(trim(label("token", text(maxlength(100)))))
-  )(
-    (url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
   )
+
+  def accountWebHookForm(update: Boolean) =
+    mapping(
+      "url" -> trim(label("url", text(required, accountWebHook(update)))),
+      "events" -> accountWebhookEvents,
+      "ctype" -> label("ctype", text()),
+      "token" -> optional(trim(label("token", text(maxlength(100)))))
+    )(
+      (url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+    )
+
   /**
-    * Provides duplication check for web hook url. duplicated from RepositorySettingsController.scala
+   * Provides duplication check for web hook url. duplicated from RepositorySettingsController.scala
-    */
+   */
-  private def accountWebHook(needExists: Boolean): Constraint = new Constraint(){
+  private def accountWebHook(needExists: Boolean): Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(getAccountWebHook(params("userName"), value).isDefined != needExists){
+      if (getAccountWebHook(params("userName"), value).isDefined != needExists) {
-        Some(if(needExists){
+        Some(if (needExists) {
           "URL had not been registered yet."
         } else {
           "URL had been registered already."
@@ -136,48 +209,68 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       }
   }
 
-  private def accountWebhookEvents = new ValueType[Set[WebHook.Event]]{
+  private def accountWebhookEvents = new ValueType[Set[WebHook.Event]] {
     def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
       WebHook.Event.values.flatMap { t =>
         params.optionValue(name + "." + t.name).map(_ => t)
       }.toSet
     }
     def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
-      if(convert(name, params, messages).isEmpty){
+      if (convert(name, params, messages).isEmpty) {
         Seq(name -> messages("error.required").format(name))
       } else {
         Nil
       }
   }
 
-
   /**
    * Displays user information.
    */
   get("/:userName") {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
+      val extraMailAddresses = getAccountExtraMailAddresses(userName)
       params.getOrElse("tab", "repositories") match {
         // Public Activity
         case "activity" =>
-          gitbucket.core.account.html.activity(account,
+          gitbucket.core.account.html.activity(
-            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            account,
-            getActivitiesByUser(userName, true))
+            if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            getActivitiesByUser(userName, true),
+            extraMailAddresses
+          )
 
         // Members
-        case "members" if(account.isGroupAccount) => {
+        case "members" if (account.isGroupAccount) => {
           val members = getGroupMembers(account.userName)
-          gitbucket.core.account.html.members(account, members,
+          gitbucket.core.account.html.members(
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+            account,
+            members,
+            extraMailAddresses,
+            context.loginAccount.exists(
+              x =>
+                members.exists { member =>
+                  member.userName == x.userName && member.isManager
+              }
+            )
+          )
         }
 
         // Repositories
         case _ => {
           val members = getGroupMembers(account.userName)
-          gitbucket.core.account.html.repositories(account,
+          gitbucket.core.account.html.repositories(
-            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            account,
+            if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
             getVisibleRepositories(context.loginAccount, Some(userName)),
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+            extraMailAddresses,
+            context.loginAccount.exists(
+              x =>
+                members.exists { member =>
+                  member.userName == x.userName && member.isManager
+              }
+            )
+          )
         }
       }
     } getOrElse NotFound()
@@ -189,62 +282,77 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     helper.xml.feed(getActivitiesByUser(userName, true))
   }
 
-  get("/:userName/_avatar"){
+  get("/:userName.keys") {
+    val keys = getPublicKeys(params("userName"))
+    contentType = "text/plain; charset=utf-8"
+    keys.map(_.publicKey).mkString("", "\n", "\n")
+  }
+
+  get("/:userName/_avatar") {
     val userName = params("userName")
     contentType = "image/png"
-    getAccountByUserName(userName).flatMap{ account =>
+    getAccountByUserName(userName)
-      response.setDateHeader("Last-Modified", account.updatedDate.getTime)
+      .flatMap { account =>
-      account.image.map{ image =>
+        response.setDateHeader("Last-Modified", account.updatedDate.getTime)
-        Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image)))
+        account.image
-      }.getOrElse{
+          .map { image =>
-        if (account.isGroupAccount) {
+            Some(
-          TextAvatarUtil.textGroupAvatar(account.fullName)
+              RawData(FileUtil.getMimeType(image), new File(getUserUploadDir(userName), FileUtil.checkFilename(image)))
-        } else {
+            )
-          TextAvatarUtil.textAvatar(account.fullName)
+          }
-        }
+          .getOrElse {
+            if (account.isGroupAccount) {
+              TextAvatarUtil.textGroupAvatar(account.fullName)
+            } else {
+              TextAvatarUtil.textAvatar(account.fullName)
+            }
+          }
+      }
+      .getOrElse {
+        response.setHeader("Cache-Control", "max-age=3600")
+        Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
       }
-    }.getOrElse{
-      response.setHeader("Cache-Control", "max-age=3600")
-      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
-    }
   }
 
   get("/:userName/_edit")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
-      html.edit(x, flash.get("info"), flash.get("error"))
+      val extraMails = getAccountExtraMailAddresses(userName)
+      html.edit(x, extraMails, flash.get("info"), flash.get("error"))
     } getOrElse NotFound()
   })
 
   post("/:userName/_edit", editForm)(oneselfOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName).map { account =>
+    getAccountByUserName(userName).map {
-      updateAccount(account.copy(
+      account =>
-        password    = form.password.map(sha1).getOrElse(account.password),
+        updateAccount(
-        fullName    = form.fullName,
+          account.copy(
-        mailAddress = form.mailAddress,
+            password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
-        description = form.description,
+            fullName = form.fullName,
-        url         = form.url))
+            mailAddress = form.mailAddress,
+            description = form.description,
+            url = form.url
+          )
+        )
 
-      updateImage(userName, form.fileId, form.clearImage)
+        updateImage(userName, form.fileId, form.clearImage)
-      flash += "info" -> "Account information has been updated."
+        updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
-      redirect(s"/${userName}/_edit")
+        flash += "info" -> "Account information has been updated."
+        redirect(s"/${userName}/_edit")
 
     } getOrElse NotFound()
   })
 
-  get("/captures/(.*)".r) {
-    multiParams("captures").head
-  }
-
   get("/:userName/_delete")(oneselfOnly {
     val userName = params("userName")
 
-    getAccountByUserName(userName, true).map { account =>
+    getAccountByUserName(userName, true).map {
-      if(isLastAdministrator(account)){
+      account =>
-        flash += "error" -> "Account can't be removed because this is last one administrator."
+        if (isLastAdministrator(account)) {
-        redirect(s"/${userName}/_edit")
+          flash += "error" -> "Account can't be removed because this is last one administrator."
-      } else {
+          redirect(s"/${userName}/_edit")
+        } else {
 //      // Remove repositories
 //      getRepositoryNamesOfUser(userName).foreach { repositoryName =>
 //        deleteRepository(userName, repositoryName)
@@ -252,16 +360,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
 //        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
 //      }
-        // Remove from GROUP_MEMBER and COLLABORATOR
+          suspendAccount(account)
-        removeUserRelatedData(userName)
+          session.invalidate
-        updateAccount(account.copy(isRemoved = true))
+          redirect("/")
-
+        }
-        // call hooks
-        PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
-
-        session.invalidate
-        redirect("/")
-      }
     } getOrElse NotFound()
   })
 
@@ -290,9 +392,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(userName).map { x =>
       var tokens = getAccessTokens(x.userName)
       val generatedToken = flash.get("generatedToken") match {
-        case Some((tokenId:Int, token:String)) => {
+        case Some((tokenId: Int, token: String)) => {
           val gt = tokens.find(_.accessTokenId == tokenId)
-          gt.map{ t =>
+          gt.map { t =>
             tokens = tokens.filterNot(_ == t)
             (t, token)
           }
@@ -319,7 +421,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"))
@@ -329,7 +431,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)
@@ -340,7 +442,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"
@@ -350,7 +452,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"
@@ -360,11 +462,12 @@ 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 { case (webhook, events) =>
+      getAccountWebHook(userName, params("url")).map {
-        html.edithook(webhook, events, account, false)
+        case (webhook, events) =>
+          html.edithook(webhook, events, account, false)
       }
     } getOrElse NotFound()
   })
@@ -372,7 +475,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"
@@ -382,7 +485,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._
@@ -390,7 +493,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     import org.apache.http.util.EntityUtils
     import scala.concurrent.ExecutionContext.Implicits.global
 
-    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h => Array(h.getName, h.getValue) }
+    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h =>
+      Array(h.getName, h.getValue)
+    }
 
     val userName = params("userName")
     val url = params("url")
@@ -404,31 +509,49 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
     val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
 
-    val toErrorMap: PartialFunction[Throwable, Map[String,String]] = {
+    val toErrorMap: PartialFunction[Throwable, Map[String, String]] = {
-      case e: java.net.UnknownHostException => Map("error"-> ("Unknown host " + e.getMessage))
+      case e: java.net.UnknownHostException                  => Map("error" -> ("Unknown host " + e.getMessage))
-      case e: java.lang.IllegalArgumentException => Map("error"-> ("invalid url"))
+      case e: java.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
-      case e: org.apache.http.client.ClientProtocolException => Map("error"-> ("invalid url"))
+      case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
-      case NonFatal(e) => Map("error"-> (e.getClass + " "+ e.getMessage))
+      case NonFatal(e)                                       => Map("error" -> (e.getClass + " " + e.getMessage))
     }
 
     contentType = formats("json")
-    org.json4s.jackson.Serialization.write(Map(
+    org.json4s.jackson.Serialization.write(
-      "url" -> url,
+      Map(
-      "request" -> Await.result(reqFuture.map(req => Map(
+        "url" -> url,
-        "headers" -> _headers(req.getAllHeaders),
+        "request" -> Await.result(
-        "payload" -> json
+          reqFuture
-      )).recover(toErrorMap), 20 seconds),
+            .map(
-      "response" -> Await.result(resFuture.map(res => Map(
+              req =>
-        "status"  -> res.getStatusLine(),
+                Map(
-        "body"    -> EntityUtils.toString(res.getEntity()),
+                  "headers" -> _headers(req.getAllHeaders),
-        "headers" -> _headers(res.getAllHeaders())
+                  "payload" -> json
-      )).recover(toErrorMap), 20 seconds)
+              )
-    ))
+            )
+            .recover(toErrorMap),
+          20 seconds
+        ),
+        "response" -> Await.result(
+          resFuture
+            .map(
+              res =>
+                Map(
+                  "status" -> res.getStatusLine(),
+                  "body" -> EntityUtils.toString(res.getEntity()),
+                  "headers" -> _headers(res.getAllHeaders())
+              )
+            )
+            .recover(toErrorMap),
+          20 seconds
+        )
+      )
+    )
   })
 
-  get("/register"){
+  get("/register") {
-    if(context.settings.allowAccountRegistration){
+    if (context.settings.allowAccountRegistration) {
-      if(context.loginAccount.isDefined){
+      if (context.loginAccount.isDefined) {
         redirect("/")
       } else {
         html.register()
@@ -436,10 +559,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     } else NotFound()
   }
 
-  post("/register", newForm){ form =>
+  post("/register", newForm) { form =>
-    if(context.settings.allowAccountRegistration){
+    if (context.settings.allowAccountRegistration) {
-      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.description, form.url)
+      createAccount(
+        form.userName,
+        pbkdf2_sha256(form.password),
+        form.fullName,
+        form.mailAddress,
+        false,
+        form.description,
+        form.url
+      )
       updateImage(form.userName, form.fileId, false)
+      updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != ""))
       redirect("/signin")
     } else NotFound()
   }
@@ -450,17 +582,23 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   post("/groups/new", newGroupForm)(usersOnly { form =>
     createGroup(form.groupName, form.description, form.url)
-    updateGroupMembers(form.groupName, form.members.split(",").map {
+    updateGroupMembers(
-      _.split(":") match {
+      form.groupName,
-        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      form.members
-      }
+        .split(",")
-    }.toList)
+        .map {
+          _.split(":") match {
+            case Array(userName, isManager) => (userName, isManager.toBoolean)
+          }
+        }
+        .toList
+    )
     updateImage(form.groupName, form.fileId, false)
     redirect(s"/${form.groupName}")
   })
 
   get("/:groupName/_editgroup")(managersOnly {
-    defining(params("groupName")){ groupName =>
+    defining(params("groupName")) { groupName =>
       getAccountByUserName(groupName, true).map { account =>
         html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
       } getOrElse NotFound()
@@ -468,13 +606,14 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   get("/:groupName/_deletegroup")(managersOnly {
-    defining(params("groupName")){ groupName =>
+    defining(params("groupName")) {
-      // Remove from GROUP_MEMBER
+      groupName =>
-      updateGroupMembers(groupName, Nil)
+        // Remove from GROUP_MEMBER
-      // Disable group
+        updateGroupMembers(groupName, Nil)
-      getAccountByUserName(groupName, false).foreach { account =>
+        // Disable group
-        updateGroup(groupName, account.description, account.url, true)
+        getAccountByUserName(groupName, false).foreach { account =>
-      }
+          updateGroup(groupName, account.description, account.url, true)
+        }
 //      // Remove repositories
 //      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
 //        deleteRepository(groupName, repositoryName)
@@ -487,16 +626,23 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   post("/:groupName/_editgroup", editGroupForm)(managersOnly { form =>
-    defining(params("groupName"), form.members.split(",").map {
+    defining(
-      _.split(":") match {
+      params("groupName"),
-        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      form.members
-      }
+        .split(",")
-    }.toList){ case (groupName, members) =>
+        .map {
-      getAccountByUserName(groupName, true).map { account =>
+          _.split(":") match {
-        updateGroup(groupName, form.description, form.url, false)
+            case Array(userName, isManager) => (userName, isManager.toBoolean)
+          }
+        }
+        .toList
+    ) {
+      case (groupName, members) =>
+        getAccountByUserName(groupName, true).map { account =>
+          updateGroup(groupName, form.description, form.url, false)
 
-        // Update GROUP_MEMBER
+          // Update GROUP_MEMBER
-        updateGroupMembers(form.groupName, members)
+          updateGroupMembers(form.groupName, members)
 //        // Update COLLABORATOR for group repositories
 //        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //          removeCollaborators(form.groupName, repositoryName)
@@ -505,12 +651,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //          }
 //        }
 
-        updateImage(form.groupName, form.fileId, form.clearImage)
+          updateImage(form.groupName, form.fileId, form.clearImage)
 
-        flash += "info" -> "Account information has been updated."
+          flash += "info" -> "Account information has been updated."
-        redirect(s"/${groupName}/_editgroup")
+          redirect(s"/${groupName}/_editgroup")
 
-      } getOrElse NotFound()
+        } getOrElse NotFound()
     }
   })
 
@@ -525,9 +671,17 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    * Create new repository.
    */
   post("/new", newRepositoryForm)(usersOnly { form =>
-    LockUtil.lock(s"${form.owner}/${form.name}"){
+    LockUtil.lock(s"${form.owner}/${form.name}") {
-      if(getRepository(form.owner, form.name).isEmpty){
+      if (getRepository(form.owner, form.name).isEmpty) {
-        createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.initOption, form.sourceUrl)
+        createRepository(
+          context.loginAccount.get,
+          form.owner,
+          form.name,
+          form.description,
+          form.isPrivate,
+          form.initOption,
+          form.sourceUrl
+        )
       }
     }
 
@@ -536,19 +690,24 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    if(repository.repository.options.allowFork){
+    if (repository.repository.options.allowFork) {
-      val loginAccount   = context.loginAccount.get
+      val loginAccount = context.loginAccount.get
-      val loginUserName  = loginAccount.userName
+      val loginUserName = loginAccount.userName
-      val groups         = getGroupsByUserName(loginUserName)
+      val groups = getGroupsByUserName(loginUserName)
       groups match {
         case _: List[String] =>
           val managerPermissions = groups.map { group =>
             val members = getGroupMembers(group)
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager })
+            context.loginAccount.exists(
+              x =>
+                members.exists { member =>
+                  member.userName == x.userName && member.isManager
+              }
+            )
           }
           helper.html.forkrepository(
             repository,
-            (groups zip managerPermissions).toMap
+            (groups zip managerPermissions).sortBy(_._1)
           )
         case _ => redirect(s"/${loginUserName}")
       }
@@ -556,13 +715,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   post("/:owner/:repository/fork", accountForm)(readableUsersOnly { (form, repository) =>
-    if(repository.repository.options.allowFork){
+    if (repository.repository.options.allowFork) {
-      val loginAccount  = context.loginAccount.get
+      val loginAccount = context.loginAccount.get
       val loginUserName = loginAccount.userName
-      val accountName   = form.accountName
+      val accountName = form.accountName
 
       if (getRepository(accountName, repository.name).isDefined ||
-        (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))) {
+          (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))) {
         // redirect to the repository if repository already exists
         redirect(s"/${accountName}/${repository.name}")
       } else {
@@ -574,42 +733,49 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     } else BadRequest()
   })
 
-  private def existsAccount: Constraint = new Constraint(){
+  private def existsAccount: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
+      if (getAccountByUserNameIgnoreCase(value).isEmpty) Some("User or group does not exist.") else None
   }
 
-  private def uniqueRepository: Constraint = new Constraint(){
+  private def uniqueRepository: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
+    override def validate(
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
       for {
         userName <- params.optionValue("owner")
-        _        <- getRepositoryNamesOfUser(userName).find(_ == value)
+        _ <- getRepositoryNamesOfUser(userName).find(_.equalsIgnoreCase(value))
       } yield {
         "Repository already exists."
       }
     }
   }
 
-  private def members: Constraint = new Constraint(){
+  private def members: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      if(value.split(",").exists {
+      if (value.split(",").exists {
-        _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+            _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
-      }) None else Some("Must select one manager at least.")
+          }) None
+      else Some("Must select one manager at least.")
     }
   }
 
-  private def validPublicKey: Constraint = new Constraint(){
+  private def validPublicKey: Constraint = new Constraint() {
-    override def validate(name: String, value: String, messages: Messages): Option[String] = SshUtil.str2PublicKey(value) match {
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
-     case Some(_) if !getAllKeys().exists(_.publicKey == value) => None
+      SshUtil.str2PublicKey(value) match {
-     case _ => Some("Key is invalid.")
+        case Some(_) if !getAllKeys().exists(_.publicKey == value) => None
-    }
+        case _                                                     => Some("Key is invalid.")
+      }
   }
 
-  private def validAccountName: Constraint = new Constraint(){
+  private def validAccountName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       getAccountByUserName(value) match {
         case Some(_) => None
-        case None => Some("Invalid Group/User Account.")
+        case None    => Some("Invalid Group/User Account.")
       }
     }
   }

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

@@ -1,52 +1,27 @@
 package gitbucket.core.controller
 
 import gitbucket.core.api._
-import gitbucket.core.model._
+import gitbucket.core.controller.api._
-import gitbucket.core.service.IssuesService.IssueSearchCondition
-import gitbucket.core.service.PullRequestService._
 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.view.helpers.{isRenderable, renderMarkup}
+import gitbucket.core.plugin.PluginRegistry
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.revwalk.RevWalk
-import org.scalatra.{Created, NoContent, UnprocessableEntity}
 
-import scala.collection.JavaConverters._
+class ApiController
-import scala.concurrent.Await
+    extends ApiControllerBase
-import scala.concurrent.duration.Duration
+    with ApiGitReferenceControllerBase
-
+    with ApiIssueCommentControllerBase
-class ApiController extends ApiControllerBase
+    with ApiIssueControllerBase
-  with RepositoryService
+    with ApiIssueLabelControllerBase
-  with AccountService
+    with ApiOrganizationControllerBase
-  with ProtectedBranchService
+    with ApiPullRequestControllerBase
-  with IssuesService
+    with ApiRepositoryBranchControllerBase
-  with LabelsService
+    with ApiRepositoryCollaboratorControllerBase
-  with MilestonesService
+    with ApiRepositoryCommitControllerBase
-  with PullRequestService
+    with ApiRepositoryControllerBase
-  with CommitsService
+    with ApiRepositoryStatusControllerBase
-  with CommitStatusService
+    with ApiUserControllerBase
-  with RepositoryCreationService
+    with RepositoryService
-  with IssueCreationService
-  with HandleCommentService
-  with WebHookService
-  with WebHookPullRequestService
-  with WebHookIssueCommentService
-  with WikiService
-  with ActivityService
-  with PrioritiesService
-  with OwnerAuthenticator
-  with UsersAuthenticator
-  with GroupManagerAuthenticator
-  with ReferrerAuthenticator
-  with ReadableUsersAuthenticator
-  with WritableUsersAuthenticator
-
-trait ApiControllerBase extends ControllerBase {
-  self: RepositoryService
     with AccountService
     with ProtectedBranchService
     with IssuesService
@@ -58,659 +33,64 @@ trait ApiControllerBase extends ControllerBase {
     with RepositoryCreationService
     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
     with ReferrerAuthenticator
     with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
+    with WritableUsersAuthenticator
+
+trait ApiControllerBase extends ControllerBase {
 
   /**
-    * 404 for non-implemented api
+   * 404 for non-implemented api
-    */
+   */
   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
+   * https://developer.github.com/v3/#root-endpoint
-    */
+   */
-  get("/api/v3/") {
+  get("/api/v3") {
     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/:repo/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/:repo/branches/*")(referrersOnly { repository =>
-    //import gitbucket.core.api._
-    (for{
-      branch <- params.get("splat") if repository.branchList.contains(branch)
-      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
-    } yield {
-      val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
-      JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), ApiBranchProtection(protection))(RepositoryName(repository)))
-    }) getOrElse NotFound()
-  })
-
-  /*
-   * https://developer.github.com/v3/repos/contents/#get-contents
-   */
-  get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
-    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))
-    }
-
-    val path = multiParams("splat").head match {
-      case s if s.isEmpty => "."
-      case s => s
-    }
-    val refStr = params.getOrElse("ref", repository.repository.defaultBranch)
-
-    using(Git.open(getRepositoryDir(params("owner"), params("repo")))){ 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/:repo/git/refs/*") (referrersOnly { repository =>
-    val revstr = multiParams("splat").head
-    using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { 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().getAllRefs().asScala
-          .collect { case (str, ref) if str.startsWith("refs/" + revstr) => ref }
-
-        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/:repo/collaborators") (referrersOnly { repository =>
-    // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
-    JsonFormat(getCollaboratorUserNames(params("owner"), params("repo")).map(u => ApiUser(getAccountByUserName(u).get)))
-  })
-
-  /**
-   * 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 = getRepository(owner, data.name).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 = 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/:repo/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.
    */
-  get("/api/v3/rate_limit"){
+  get("/api/v3/rate_limit") {
     contentType = formats("json")
     // this message is same as github enterprise...
     org.scalatra.NotFound(ApiError("Rate limiting is not enabled."))
   }
 
   /**
-    * https://developer.github.com/v3/issues/#list-issues-for-a-repository
+   * non-GitHub compatible API for listing plugins
-    */
-  get("/api/v3/repos/:owner/:repository/issues")(referrersOnly { repository =>
-    val page = IssueSearchCondition.page(request)
-    // TODO: more api spec condition
-    val condition = IssueSearchCondition(request)
-    val baseOwner = getAccountByUserName(repository.owner).get
-
-    val issues: List[(Issue, Account)] =
-      searchIssueByApi(
-        condition = condition,
-        offset    = (page - 1) * PullRequestLimit,
-        limit     = PullRequestLimit,
-        repos     = repository.owner -> repository.name
-      )
-
-    JsonFormat(issues.map { case (issue, issueUser) =>
-      ApiIssue(
-        issue          = issue,
-        repositoryName = RepositoryName(repository),
-        user           = ApiUser(issueUser)
-      )
-    })
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/#get-a-single-issue
    */
-  get("/api/v3/repos/:owner/:repository/issues/:id")(referrersOnly { repository =>
+  get("/api/v3/gitbucket/plugins") {
-    (for{
+    PluginRegistry().getPlugins().map { ApiPlugin(_) }
-      issueId  <- params("id").toIntOpt
-      issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      openedUser <- getAccountByUserName(issue.openedUserName)
-    } yield {
-      JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(openedUser)))
-    }) getOrElse NotFound()
-  })
-
-  /**
-    * https://developer.github.com/v3/issues/#create-an-issue
-    */
-  post("/api/v3/repos/:owner/:repository/issues")(readableUsersOnly { repository =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
-      (for{
-        data <- extractFromJsonBody[CreateAnIssue]
-        loginAccount <- context.loginAccount
-      } yield {
-        val milestone = data.milestone.flatMap(getMilestone(repository.owner, repository.name, _))
-        val issue = createIssue(
-          repository,
-          data.title,
-          data.body,
-          data.assignees.headOption,
-          milestone.map(_.milestoneId),
-          None,
-          data.labels,
-          loginAccount)
-        JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(loginAccount)))
-      }) getOrElse NotFound()
-    } else Unauthorized()
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
-   */
-  get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
-    (for{
-      issueId  <- params("id").toIntOpt
-      comments =  getCommentsForApi(repository.owner, repository.name, issueId)
-    } 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),
-        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),
-        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/:repo/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/:repo/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/:repo/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/:repo/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/:repo/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, Some(commitInfo.parents.head), 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/:repo/raw/*")(referrersOnly { repository =>
-    val (id, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      getPathObjectId(git, path, revCommit).map { objectId =>
-        responseRawFile(git, objectId, path, repository)
-      } getOrElse NotFound()
-    }
-  })
-
 }
-

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

@@ -1,8 +1,8 @@
 package gitbucket.core.controller
 
-import java.io.FileInputStream
+import java.io.{File, FileInputStream}
 
-import gitbucket.core.api.ApiError
+import gitbucket.core.api.{ApiError, JsonFormat}
 import gitbucket.core.model.Account
 import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
 import gitbucket.core.util.SyntaxSugars._
@@ -31,9 +31,14 @@ import org.slf4j.LoggerFactory
 /**
  * Provides generic features for controller implementations.
  */
-abstract class ControllerBase extends ScalatraFilter
+abstract class ControllerBase
-  with ValidationSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
+    extends ScalatraFilter
-  with SystemSettingsService {
+    with ValidationSupport
+    with JacksonJsonSupport
+    with I18nSupport
+    with FlashMapSupport
+    with Validations
+    with SystemSettingsService {
 
   private val logger = LoggerFactory.getLogger(getClass)
 
@@ -41,27 +46,35 @@ abstract class ControllerBase extends ScalatraFilter
 
   before("/api/v3/*") {
     contentType = formats("json")
+    request.setAttribute(Keys.Request.APIv3, true)
   }
 
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
+  override def requestPath(uri: String, idx: Int): String = {
-    val httpRequest = request.asInstanceOf[HttpServletRequest]
+    val path = super.requestPath(uri, idx)
-    val context     = request.getServletContext.getContextPath
+    if (path != "/" && path.endsWith("/")) {
-    val path        = httpRequest.getRequestURI.substring(context.length)
+      path.substring(0, path.length - 1)
-
-    if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
-      // Git repository
-      chain.doFilter(request, response)
     } else {
-      if(path.startsWith("/api/v3/")){
+      path
-        httpRequest.setAttribute(Keys.Request.APIv3, true)
-      }
-      // Scalatra actions
-      super.doFilter(request, response, chain)
     }
-  } finally {
-    contextCache.remove();
   }
 
+  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit =
+    try {
+      val httpRequest = request.asInstanceOf[HttpServletRequest]
+      val context = request.getServletContext.getContextPath
+      val path = httpRequest.getRequestURI.substring(context.length)
+
+      if (path.startsWith("/git/") || path.startsWith("/git-lfs/")) {
+        // Git repository
+        chain.doFilter(request, response)
+      } else {
+        // Scalatra actions
+        super.doFilter(request, response, chain)
+      }
+    } finally {
+      contextCache.remove()
+    }
+
   private val contextCache = new java.lang.ThreadLocal[Context]()
 
   /**
@@ -78,44 +91,45 @@ abstract class ControllerBase extends ScalatraFilter
     }
   }
 
-  private def LoginAccount: Option[Account] = request.getAs[Account](Keys.Session.LoginAccount).orElse(session.getAs[Account](Keys.Session.LoginAccount))
+  private def LoginAccount: Option[Account] =
+    request.getAs[Account](Keys.Session.LoginAccount).orElse(session.getAs[Account](Keys.Session.LoginAccount))
 
-  def ajaxGet(path : String)(action : => Any) : Route =
+  def ajaxGet(path: String)(action: => Any): Route =
-    super.get(path){
+    super.get(path) {
       request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
 
-  override def ajaxGet[T](path : String, form : ValueType[T])(action : T => Any) : Route =
+  override def ajaxGet[T](path: String, form: ValueType[T])(action: T => Any): Route =
-    super.ajaxGet(path, form){ form =>
+    super.ajaxGet(path, form) { form =>
       request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
 
-  def ajaxPost(path : String)(action : => Any) : Route =
+  def ajaxPost(path: String)(action: => Any): Route =
-    super.post(path){
+    super.post(path) {
       request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
 
-  override def ajaxPost[T](path : String, form : ValueType[T])(action : T => Any) : Route =
+  override def ajaxPost[T](path: String, form: ValueType[T])(action: T => Any): Route =
-    super.ajaxPost(path, form){ form =>
+    super.ajaxPost(path, form) { form =>
       request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
 
   protected def NotFound() =
-    if(request.hasAttribute(Keys.Request.Ajax)){
+    if (request.hasAttribute(Keys.Request.Ajax)) {
       org.scalatra.NotFound()
-    } else if(request.hasAttribute(Keys.Request.APIv3)){
+    } else if (request.hasAttribute(Keys.Request.APIv3)) {
       contentType = formats("json")
-      org.scalatra.NotFound(ApiError("Not Found"))
+      org.scalatra.NotFound(JsonFormat(ApiError("Not Found")))
     } else {
       org.scalatra.NotFound(gitbucket.core.html.error("Not Found"))
     }
 
   private def isBrowser(userAgent: String): Boolean = {
-    if(userAgent == null || userAgent.isEmpty){
+    if (userAgent == null || userAgent.isEmpty) {
       false
     } else {
       val data = Classifier.parse(userAgent)
@@ -125,67 +139,82 @@ abstract class ControllerBase extends ScalatraFilter
   }
 
   protected def Unauthorized()(implicit context: Context) =
-    if(request.hasAttribute(Keys.Request.Ajax)){
+    if (request.hasAttribute(Keys.Request.Ajax)) {
       org.scalatra.Unauthorized()
-    } else if(request.hasAttribute(Keys.Request.APIv3)){
+    } else if (request.hasAttribute(Keys.Request.APIv3)) {
       contentType = formats("json")
-      org.scalatra.Unauthorized(ApiError("Requires authentication"))
+      org.scalatra.Unauthorized(JsonFormat(ApiError("Requires authentication")))
-    } else if(!isBrowser(request.getHeader("USER-AGENT"))){
+    } else if (!isBrowser(request.getHeader("USER-AGENT"))) {
       org.scalatra.Unauthorized()
     } else {
-      if(context.loginAccount.isDefined){
+      if (context.loginAccount.isDefined) {
         org.scalatra.Unauthorized(redirect("/"))
       } else {
-        if(request.getMethod.toUpperCase == "POST"){
+        if (request.getMethod.toUpperCase == "POST") {
           org.scalatra.Unauthorized(redirect("/signin"))
         } else {
-          org.scalatra.Unauthorized(redirect("/signin?redirect=" + StringUtil.urlEncode(
+          org.scalatra.Unauthorized(
-            defining(request.getQueryString){ queryString =>
+            redirect(
-              request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "")
+              "/signin?redirect=" + StringUtil.urlEncode(
-            }
+                defining(request.getQueryString) { queryString =>
-          )))
+                  request.getRequestURI.substring(request.getContextPath.length) + (if (queryString != null)
+                                                                                      "?" + queryString
+                                                                                    else "")
+                }
+              )
+            )
+          )
         }
       }
     }
 
-  error{
+  error {
     case e => {
       logger.error(s"Catch unhandled error in request: ${request}", e)
-      if(request.hasAttribute(Keys.Request.Ajax)){
+      if (request.hasAttribute(Keys.Request.Ajax)) {
         org.scalatra.InternalServerError()
-      } else if(request.hasAttribute(Keys.Request.APIv3)){
+      } else if (request.hasAttribute(Keys.Request.APIv3)) {
         contentType = formats("json")
-        org.scalatra.InternalServerError(ApiError("Internal Server Error"))
+        org.scalatra.InternalServerError(JsonFormat(ApiError("Internal Server Error")))
       } else {
         org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
       }
     }
   }
 
-  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
+  override def url(
-                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
+    path: String,
-                   absolutize: Boolean = true, withSessionId: Boolean = true)
+    params: Iterable[(String, Any)] = Iterable.empty,
-                  (implicit request: HttpServletRequest, response: HttpServletResponse): String =
+    includeContextPath: Boolean = true,
+    includeServletPath: Boolean = true,
+    absolutize: Boolean = true,
+    withSessionId: Boolean = true
+  )(implicit request: HttpServletRequest, response: HttpServletResponse): String =
     if (path.startsWith("http")) path
     else baseUrl + super.url(path, params, false, false, false)
 
   /**
    * Extends scalatra-form's trim rule to eliminate CR and LF.
    */
-  protected def trim2[T](valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T](){
+  protected def trim2[T](valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T]() {
     def convert(value: String, messages: Messages): T = valueType.convert(trim(value), messages)
 
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
+    override def validate(
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Seq[(String, String)] =
       valueType.validate(name, trim(value), params, messages)
 
-    private def trim(value: String): String = if(value == null) null else value.replace("\r\n", "").trim
+    private def trim(value: String): String = if (value == null) null else value.replace("\r\n", "").trim
   }
 
   /**
    * Use this method to response the raw data against XSS.
    */
   protected def RawData[T](contentType: String, rawData: T): T = {
-    if(contentType.split(";").head.trim.toLowerCase.startsWith("text/html")){
+    if (contentType.split(";").head.trim.toLowerCase.startsWith("text/html")) {
       this.contentType = "text/plain"
     } else {
       this.contentType = contentType
@@ -195,35 +224,39 @@ abstract class ControllerBase extends ScalatraFilter
   }
 
   // jenkins send message as 'application/x-www-form-urlencoded' but scalatra already parsed as multi-part-request.
-  def extractFromJsonBody[A](implicit request:HttpServletRequest, mf:Manifest[A]): Option[A] = {
+  def extractFromJsonBody[A](implicit request: HttpServletRequest, mf: Manifest[A]): Option[A] = {
-    (request.contentType.map(_.split(";").head.toLowerCase) match{
+    (request.contentType.map(_.split(";").head.toLowerCase) match {
       case Some("application/x-www-form-urlencoded") => multiParams.keys.headOption.map(parse(_))
-      case Some("application/json") => Some(parsedBody)
+      case Some("application/json")                  => Some(parsedBody)
-      case _ => Some(parse(request.body))
+      case _                                         => Some(parse(request.body))
     }).filterNot(_ == JNothing).flatMap(j => Try(j.extract[A]).toOption)
   }
 
   protected def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
     @scala.annotation.tailrec
     def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true if (walk.getPathString == path) => Some(walk.getObjectId(0))
-      case true  => _getPathObjectId(path, walk)
+      case true                                 => _getPathObjectId(path, walk)
-      case false => None
+      case false                                => None
     }
 
-    using(new TreeWalk(git.getRepository)){ treeWalk =>
+    using(new TreeWalk(git.getRepository)) { treeWalk =>
       treeWalk.addTree(revCommit.getTree)
       treeWalk.setRecursive(true)
       _getPathObjectId(path, treeWalk)
     }
   }
 
-  protected def responseRawFile(git: Git, objectId: ObjectId, path: String,
+  protected def responseRawFile(
-                              repository: RepositoryService.RepositoryInfo): Unit = {
+    git: Git,
-    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+    objectId: ObjectId,
-      contentType = FileUtil.getMimeType(path)
+    path: String,
+    repository: RepositoryService.RepositoryInfo
+  ): Unit = {
+    JGitUtil.getObjectLoaderFromId(git, objectId) { loader =>
+      contentType = FileUtil.getSafeMimeType(path)
 
-      if(loader.isLarge){
+      if (loader.isLarge) {
         response.setContentLength(loader.getSize.toInt)
         loader.copyTo(response.outputStream)
       } else {
@@ -231,11 +264,11 @@ abstract class ControllerBase extends ScalatraFilter
         val text = new String(bytes, "UTF-8")
 
         val attrs = JGitUtil.getLfsObjects(text)
-        if(attrs.nonEmpty) {
+        if (attrs.nonEmpty) {
           response.setContentLength(attrs("size").toInt)
           val oid = attrs("oid").split(":")(1)
 
-          using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))){ in =>
+          using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in =>
             IOUtils.copy(in, response.getOutputStream)
           }
         } else {
@@ -250,17 +283,21 @@ abstract class ControllerBase extends ScalatraFilter
 /**
  * Context object for the current request.
  */
-case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
+case class Context(
+  settings: SystemSettingsService.SystemSettings,
+  loginAccount: Option[Account],
+  request: HttpServletRequest
+) {
   val path = settings.baseUrl.getOrElse(request.getContextPath)
   val currentPath = request.getRequestURI.substring(request.getContextPath.length)
   val baseUrl = settings.baseUrl(request)
   val host = new java.net.URL(baseUrl).getHost
   val platform = request.getHeader("User-Agent") match {
-    case null => null
+    case null                             => null
-    case agent if agent.contains("Mac") => "mac"
+    case agent if agent.contains("Mac")   => "mac"
     case agent if agent.contains("Linux") => "linux"
-    case agent if agent.contains("Win") => "windows"
+    case agent if agent.contains("Win")   => "windows"
-    case _ => null
+    case _                                => null
   }
   val sidebarCollapse = request.getSession.getAttribute("sidebar-collapse") != null
 
@@ -271,7 +308,7 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
    * Cached object are available during a request.
    */
   def cache[A](key: String)(action: => A): A =
-    defining(Keys.Request.Cache(key)){ cacheKey =>
+    defining(Keys.Request.Cache(key)) { cacheKey =>
       Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
         val newObject = action
         request.setAttribute(cacheKey, newObject)
@@ -285,48 +322,105 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
  * Base trait for controllers which manages account information.
  */
 trait AccountManagementControllerBase extends ControllerBase {
-  self: AccountService  =>
+  self: AccountService =>
 
   protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
-    if(clearImage){
+    if (clearImage) {
-      getAccountByUserName(userName).flatMap(_.image).map { image =>
+      getAccountByUserName(userName).flatMap(_.image).foreach { image =>
-        new java.io.File(getUserUploadDir(userName), image).delete()
+        new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete()
         updateAvatarImage(userName, None)
       }
     } else {
-      fileId.map { fileId =>
+      fileId.foreach { fileId =>
         val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
         val uploadDir = getUserUploadDir(userName)
-        if(!uploadDir.exists){
+        if (!uploadDir.exists) {
           uploadDir.mkdirs()
         }
-        Thumbnails.of(new java.io.File(getTemporaryDir(session.getId), fileId))
+        Thumbnails
+          .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
           .size(324, 324)
-          .toFile(new java.io.File(uploadDir, filename))
+          .toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
         updateAvatarImage(userName, Some(filename))
       }
     }
 
-  protected def uniqueUserName: Constraint = new Constraint(){
+  protected def uniqueUserName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value, true).map { _ => "User already exists." }
+      getAccountByUserNameIgnoreCase(value, true).map { _ =>
+        "User already exists."
+      }
   }
 
-  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
+  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
+    override def validate(
-      getAccountByMailAddress(value, true)
+      name: String,
-        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName) }
+      value: String,
-        .map    { _ => "Mail address is already registered." }
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
+      if (extraMailAddresses.exists {
+            case (k, v) =>
+              v.contains(value)
+          }) {
+        Some("These mail addresses are duplicated.")
+      } else {
+        getAccountByMailAddress(value, true)
+          .collect {
+            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
+              "Mail address is already registered."
+          }
+      }
     }
   }
 
-  val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets", "signin", "signout", "register", "activities.atom", "sidebar-collapse", "groups", "new")
+  protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() {
-  protected def reservedNames(): Constraint = new Constraint(){
+    override def validate(
-    override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){
+      name: String,
-      Some(s"${value} is reserved")
+      value: String,
-    } else {
+      params: Map[String, Seq[String]],
-      None
+      messages: Messages
+    ): Option[String] = {
+      val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
+      if (Some(value) == params.optionValue("mailAddress") || extraMailAddresses.count {
+            case (k, v) =>
+              v.contains(value)
+          } > 1) {
+        Some("These mail addresses are duplicated.")
+      } else {
+        getAccountByMailAddress(value, true)
+          .collect {
+            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
+              "Mail address is already registered."
+          }
+      }
     }
   }
 
+  val allReservedNames = Set(
+    "git",
+    "admin",
+    "upload",
+    "api",
+    "assets",
+    "plugin-assets",
+    "signin",
+    "signout",
+    "register",
+    "activities.atom",
+    "sidebar-collapse",
+    "groups",
+    "new"
+  )
+
+  protected def reservedNames(): Constraint = new Constraint() {
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if (allReservedNames.contains(value.toLowerCase)) {
+        Some(s"${value} is reserved")
+      } else {
+        None
+      }
+  }
+
 }

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

@@ -6,13 +6,29 @@ import gitbucket.core.util.{Keys, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
 import gitbucket.core.service.IssuesService._
 
-class DashboardController extends DashboardControllerBase
+class DashboardController
-  with IssuesService with PullRequestService with RepositoryService with AccountService with CommitsService
+    extends DashboardControllerBase
-  with LabelsService with PrioritiesService with MilestonesService with UsersAuthenticator
+    with IssuesService
+    with PullRequestService
+    with RepositoryService
+    with AccountService
+    with ActivityService
+    with CommitsService
+    with LabelsService
+    with PrioritiesService
+    with WebHookService
+    with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
+    with MilestonesService
+    with UsersAuthenticator
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with PullRequestService with RepositoryService with AccountService
+  self: IssuesService with PullRequestService with RepositoryService with AccountService with UsersAuthenticator =>
-    with UsersAuthenticator =>
+
+  get("/dashboard/repos")(usersOnly {
+    val repos = getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true)
+    html.repos(getGroupNames(context.loginAccount.get.userName), repos, repos)
+  })
 
   get("/dashboard/issues")(usersOnly {
     searchIssues("created_by")
@@ -59,51 +75,50 @@ trait DashboardControllerBase extends ControllerBase {
   private def searchIssues(filter: String) = {
     import IssuesService._
 
-    val userName  = context.loginAccount.get.userName
+    val userName = context.loginAccount.get.userName
     val condition = getOrCreateCondition(Keys.Session.DashboardIssues, filter, userName)
     val userRepos = getUserRepositories(userName, true).map(repo => repo.owner -> repo.name)
-    val page      = IssueSearchCondition.page(request)
+    val page = IssueSearchCondition.page(request)
 
     html.issues(
       searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
       page,
-      countIssue(condition.copy(state = "open"  ), false, userRepos: _*),
+      countIssue(condition.copy(state = "open"), false, userRepos: _*),
       countIssue(condition.copy(state = "closed"), false, userRepos: _*),
       filter match {
-        case "assigned"  => condition.copy(assigned  = Some(Some(userName)))
+        case "assigned"  => condition.copy(assigned = Some(Some(userName)))
         case "mentioned" => condition.copy(mentioned = Some(userName))
-        case _           => condition.copy(author    = Some(userName))
+        case _           => condition.copy(author = Some(userName))
       },
       filter,
       getGroupNames(userName),
-      Nil,
+      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true)
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+    )
   }
 
   private def searchPullRequests(filter: String) = {
     import IssuesService._
     import PullRequestService._
 
-    val userName  = context.loginAccount.get.userName
+    val userName = context.loginAccount.get.userName
     val condition = getOrCreateCondition(Keys.Session.DashboardPulls, filter, userName)
-    val allRepos  = getAllRepositories(userName)
+    val allRepos = getAllRepositories(userName)
-    val page      = IssueSearchCondition.page(request)
+    val page = IssueSearchCondition.page(request)
 
     html.pulls(
       searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
       page,
-      countIssue(condition.copy(state = "open"  ), true, allRepos: _*),
+      countIssue(condition.copy(state = "open"), true, allRepos: _*),
       countIssue(condition.copy(state = "closed"), true, allRepos: _*),
       filter match {
-        case "assigned"  => condition.copy(assigned  = Some(Some(userName)))
+        case "assigned"  => condition.copy(assigned = Some(Some(userName)))
         case "mentioned" => condition.copy(mentioned = Some(userName))
-        case _           => condition.copy(author    = Some(userName))
+        case _           => condition.copy(author = Some(userName))
       },
       filter,
       getGroupNames(userName),
-      Nil,
+      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true)
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+    )
   }
 
-
 }

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

@@ -1,7 +1,9 @@
 package gitbucket.core.controller
 
+import java.io.File
+
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, RepositoryService, ReleaseService}
+import gitbucket.core.service.{AccountService, ReleaseService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
 import gitbucket.core.util.SyntaxSugars._
@@ -19,95 +21,138 @@ import org.apache.commons.io.{FileUtils, IOUtils}
  *
  * This servlet saves uploaded file.
  */
-class FileUploadController extends ScalatraServlet
+class FileUploadController
-  with FileUploadSupport
+    extends ScalatraServlet
-  with RepositoryService
+    with FileUploadSupport
-  with AccountService
+    with RepositoryService
-  with ReleaseService{
+    with AccountService
+    with ReleaseService {
 
   configureMultipartHandling(MultipartConfig(maxFileSize = Some(FileUtil.MaxFileSize)))
 
-  post("/image"){
+  post("/image") {
-    execute({ (file, fileId) =>
+    execute(
-      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+      { (file, fileId) =>
-      session += Keys.Session.Upload(fileId) -> file.name
+        FileUtils
-    }, FileUtil.isImage)
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get)
+        session += Keys.Session.Upload(fileId) -> file.name
+      },
+      FileUtil.isImage
+    )
   }
 
-  post("/tmp"){
+  post("/tmp") {
-    execute({ (file, fileId) =>
+    execute(
-      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+      { (file, fileId) =>
-      session += Keys.Session.Upload(fileId) -> file.name
+        FileUtils
-    }, _ => true)
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get)
+        session += Keys.Session.Upload(fileId) -> file.name
+      },
+      _ => true
+    )
   }
 
-  post("/file/:owner/:repository"){
+  post("/file/:owner/:repository") {
-    execute({ (file, fileId) =>
+    execute(
-      FileUtils.writeByteArrayToFile(new java.io.File(
+      { (file, fileId) =>
-        getAttachedDir(params("owner"), params("repository")),
+        FileUtils.writeByteArrayToFile(
-        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
+          new File(
-    }, _ => true)
+            getAttachedDir(params("owner"), params("repository")),
+            FileUtil.checkFilename(fileId + "." + FileUtil.getExtension(file.getName))
+          ),
+          file.get
+        )
+      },
+      _ => true
+    )
   }
 
-  post("/wiki/:owner/:repository"){
+  post("/wiki/:owner/:repository") {
     // Don't accept not logged-in users
-    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account =>
+    session.get(Keys.Session.LoginAccount).collect {
-      val owner      = params("owner")
+      case loginAccount: Account =>
-      val repository = params("repository")
+        val owner = params("owner")
+        val repository = params("repository")
 
-      // Check whether logged-in user is collaborator
+        // Check whether logged-in user is collaborator
-      onlyWikiEditable(owner, repository, loginAccount){
+        onlyWikiEditable(owner, repository, loginAccount) {
-        execute({ (file, fileId) =>
+          execute(
-          val fileName = file.getName
+            { (file, fileId) =>
-          LockUtil.lock(s"${owner}/${repository}/wiki") {
+              val fileName = file.getName
-            using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
+              LockUtil.lock(s"${owner}/${repository}/wiki") {
-              val builder  = DirCache.newInCore.builder()
+                using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) {
-              val inserter = git.getRepository.newObjectInserter()
+                  git =>
-              val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+                    val builder = DirCache.newInCore.builder()
+                    val inserter = git.getRepository.newObjectInserter()
+                    val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
 
-              if(headId != null){
+                    if (headId != null) {
-                JGitUtil.processTree(git, headId){ (path, tree) =>
+                      JGitUtil.processTree(git, headId) { (path, tree) =>
-                  if(path != fileName){
+                        if (path != fileName) {
-                    builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+                          builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                  }
+                        }
+                      }
+                    }
+
+                    val bytes = IOUtils.toByteArray(file.getInputStream)
+                    builder.add(
+                      JGitUtil.createDirCacheEntry(
+                        fileName,
+                        FileMode.REGULAR_FILE,
+                        inserter.insert(Constants.OBJ_BLOB, bytes)
+                      )
+                    )
+                    builder.finish()
+
+                    val newHeadId = JGitUtil.createNewCommit(
+                      git,
+                      inserter,
+                      headId,
+                      builder.getDirCache.writeTree(inserter),
+                      Constants.HEAD,
+                      loginAccount.fullName,
+                      loginAccount.mailAddress,
+                      s"Uploaded ${fileName}"
+                    )
+
+                    fileName
                 }
               }
-
+            },
-              val bytes = IOUtils.toByteArray(file.getInputStream)
+            _ => true
-              builder.add(JGitUtil.createDirCacheEntry(fileName, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
+          )
-              builder.finish()
+        }
-
-              val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-                Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, s"Uploaded ${fileName}")
-
-              fileName
-            }
-          }
-        }, _ => true)
-      }
     } getOrElse BadRequest()
   }
 
-  post("/release/:owner/:repository/:tag"){
+  post("/release/:owner/:repository/:tag") {
-    session.get(Keys.Session.LoginAccount).collect { case _: Account =>
+    session
-      val owner = params("owner")
+      .get(Keys.Session.LoginAccount)
-      val repository = params("repository")
+      .collect {
-      val tag = params("tag")
+        case _: Account =>
-      execute({ (file, fileId) =>
+          val owner = params("owner")
-        FileUtils.writeByteArrayToFile(
+          val repository = params("repository")
-          new java.io.File(getReleaseFilesDir(owner, repository), tag + "/" + fileId),
+          val tag = params("tag")
-          file.get
+          execute(
-        )
+            { (file, fileId) =>
-      }, _ => true)
+              FileUtils.writeByteArrayToFile(
-    }.getOrElse(BadRequest())
+                new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)),
+                file.get
+              )
+            },
+            _ => true
+          )
+      }
+      .getOrElse(BadRequest())
   }
 
   post("/import") {
     import JDBCUtil._
-    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account if loginAccount.isAdmin =>
+    session.get(Keys.Session.LoginAccount).collect {
-      execute({ (file, fileId) =>
+      case loginAccount: Account if loginAccount.isAdmin =>
-        request2Session(request).conn.importAsSQL(file.getInputStream)
+        execute({ (file, fileId) =>
-      }, _ => true)
+          request2Session(request).conn.importAsSQL(file.getInputStream)
+        }, _ => true)
     }
     redirect("/admin/data")
   }
@@ -115,24 +160,26 @@ class FileUploadController extends ScalatraServlet
   private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
     implicit val session = Database.getSession(request)
     getRepository(owner, repository) match {
-      case Some(x) => x.repository.options.wikiOption match {
+      case Some(x) =>
-        case "ALL"     if !x.repository.isPrivate => action
+        x.repository.options.wikiOption match {
-        case "PUBLIC"  if hasGuestRole(owner, repository, Some(loginAccount)) => action
+          case "ALL" if !x.repository.isPrivate                                     => action
-        case "PRIVATE" if hasDeveloperRole(owner, repository, Some(loginAccount)) => action
+          case "PUBLIC" if hasGuestRole(owner, repository, Some(loginAccount))      => action
-        case _  => BadRequest()
+          case "PRIVATE" if hasDeveloperRole(owner, repository, Some(loginAccount)) => action
-      }
+          case _                                                                    => BadRequest()
+        }
       case None => BadRequest()
     }
   }
 
-  private def execute(f: (FileItem, String) => Unit , mimeTypeChcker: (String) => Boolean) = fileParams.get("file") match {
+  private def execute(f: (FileItem, String) => Unit, mimeTypeChcker: (String) => Boolean) =
-    case Some(file) if(mimeTypeChcker(file.name)) =>
+    fileParams.get("file") match {
-      defining(FileUtil.generateFileId){ fileId =>
+      case Some(file) if (mimeTypeChcker(file.name)) =>
-        f(file, fileId)
+        defining(FileUtil.generateFileId) { fileId =>
-        contentType = "text/plain"
+          f(file, fileId)
-        Ok(fileId)
+          contentType = "text/plain"
-      }
+          Ok(fileId)
-    case _ => BadRequest()
+        }
-  }
+      case _ => BadRequest()
+    }
 
 }

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

@@ -9,25 +9,25 @@ import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
+import gitbucket.core.util._
 import org.scalatra.Ok
 import org.scalatra.forms._
 
-
+class IndexController
-class IndexController extends IndexControllerBase
+    extends IndexControllerBase
-  with RepositoryService
+    with RepositoryService
-  with ActivityService
+    with ActivityService
-  with AccountService
+    with AccountService
-  with RepositorySearchService
+    with RepositorySearchService
-  with IssuesService
+    with IssuesService
-  with LabelsService
+    with LabelsService
-  with MilestonesService
+    with MilestonesService
-  with PrioritiesService
+    with PrioritiesService
-  with UsersAuthenticator
+    with UsersAuthenticator
-  with ReferrerAuthenticator
+    with ReferrerAuthenticator
-  with AccountFederationService
+    with AccessTokenService
-  with OpenIDConnectService
+    with AccountFederationService
-
+    with OpenIDConnectService
 
 trait IndexControllerBase extends ControllerBase {
   self: RepositoryService
@@ -36,6 +36,8 @@ trait IndexControllerBase extends ControllerBase {
     with RepositorySearchService
     with UsersAuthenticator
     with ReferrerAuthenticator
+    with AccessTokenService
+    with AccountFederationService
     with OpenIDConnectService =>
 
   case class SignInForm(userName: String, password: String, hash: Option[String])
@@ -56,29 +58,41 @@ trait IndexControllerBase extends ControllerBase {
 
   case class OidcContext(state: State, nonce: Nonce, redirectBackURI: String)
 
-  get("/"){
+  get("/") {
-    context.loginAccount.map { account =>
+    context.loginAccount
-      val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
+      .map { account =>
-      gitbucket.core.html.index(getRecentActivitiesByOwners(visibleOwnerSet), Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
+        val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
-    }.getOrElse {
+        gitbucket.core.html.index(
-      gitbucket.core.html.index(getRecentActivities(), getVisibleRepositories(None, withoutPhysicalInfo = true), Nil)
+          getRecentActivitiesByOwners(visibleOwnerSet),
-    }
+          getVisibleRepositories(Some(account), withoutPhysicalInfo = true),
+          showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
+            account.userName
+          )
+        )
+      }
+      .getOrElse {
+        gitbucket.core.html.index(
+          getRecentActivities(),
+          getVisibleRepositories(None, withoutPhysicalInfo = true),
+          showBannerToCreatePersonalAccessToken = false
+        )
+      }
   }
 
-  get("/signin"){
+  get("/signin") {
     val redirect = params.get("redirect")
-    if(redirect.isDefined && redirect.get.startsWith("/")){
+    if (redirect.isDefined && redirect.get.startsWith("/")) {
       flash += Keys.Flash.Redirect -> redirect.get
     }
     gitbucket.core.html.signin(flash.get("userName"), flash.get("password"), flash.get("error"))
   }
 
-  post("/signin", signinForm){ form =>
+  post("/signin", signinForm) { form =>
     authenticate(context.settings, form.userName, form.password) match {
       case Some(account) =>
         flash.get(Keys.Flash.Redirect) match {
           case Some(redirectUrl: String) => signin(account, redirectUrl + form.hash.getOrElse(""))
-          case _ => signin(account)
+          case _                         => signin(account)
         }
       case None =>
         flash += "userName" -> form.userName
@@ -89,17 +103,20 @@ trait IndexControllerBase extends ControllerBase {
   }
 
   /**
-    * Initiate an OpenID Connect authentication request.
+   * Initiate an OpenID Connect authentication request.
-    */
+   */
   post("/signin/oidc") {
     context.settings.oidc.map { oidc =>
       val redirectURI = new URI(s"$baseUrl/signin/oidc")
       val authenticationRequest = createOIDCAuthenticationRequest(oidc.issuer, oidc.clientID, redirectURI)
       val redirectBackURI = flash.get(Keys.Flash.Redirect) match {
         case Some(redirectBackURI: String) => redirectBackURI + params.getOrElse("hash", "")
-        case _ => "/"
+        case _                             => "/"
       }
-      session.setAttribute(Keys.Session.OidcContext, OidcContext(authenticationRequest.getState, authenticationRequest.getNonce, redirectBackURI))
+      session.setAttribute(
+        Keys.Session.OidcContext,
+        OidcContext(authenticationRequest.getState, authenticationRequest.getNonce, redirectBackURI)
+      )
       redirect(authenticationRequest.toURI.toString)
     } getOrElse {
       NotFound()
@@ -107,8 +124,8 @@ trait IndexControllerBase extends ControllerBase {
   }
 
   /**
-    * Handle an OpenID Connect authentication response.
+   * Handle an OpenID Connect authentication response.
-    */
+   */
   get("/signin/oidc") {
     context.settings.oidc.map { oidc =>
       val redirectURI = new URI(s"$baseUrl/signin/oidc")
@@ -131,33 +148,33 @@ trait IndexControllerBase extends ControllerBase {
     }
   }
 
-  get("/signout"){
+  get("/signout") {
     session.invalidate
     redirect("/")
   }
 
-  get("/activities.atom"){
+  get("/activities.atom") {
     contentType = "application/atom+xml; type=feed"
     xml.feed(getRecentActivities())
   }
 
-  post("/sidebar-collapse"){
+  post("/sidebar-collapse") {
-    if(params("collapse") == "true"){
+    if (params("collapse") == "true") {
       session.setAttribute("sidebar-collapse", "true")
-    }  else {
+    } else {
       session.setAttribute("sidebar-collapse", null)
     }
     Ok()
   }
 
   /**
-    * Set account information into HttpSession and redirect.
+   * Set account information into HttpSession and redirect.
-    */
+   */
   private def signin(account: Account, redirectUrl: String = "/") = {
     session.setAttribute(Keys.Session.LoginAccount, account)
     updateLastLoginDate(account.userName)
 
-    if(LDAPUtil.isDummyMailAddress(account)) {
+    if (LDAPUtil.isDummyMailAddress(account)) {
       redirect("/" + account.userName + "/_edit")
     }
 
@@ -173,23 +190,28 @@ trait IndexControllerBase extends ControllerBase {
    */
   get("/_user/proposals")(usersOnly {
     contentType = formats("json")
-    val user  = params("user").toBoolean
+    val user = params("user").toBoolean
     val group = params("group").toBoolean
     org.json4s.jackson.Serialization.write(
-      Map("options" -> (
+      Map(
-        getAllUsers(false)
+        "options" -> (
-          .withFilter { t => (user, group) match {
+          getAllUsers(false)
-            case (true, true) => true
+            .withFilter { t =>
-            case (true, false) => !t.isGroupAccount
+              (user, group) match {
-            case (false, true) => t.isGroupAccount
+                case (true, true)   => true
-            case (false, false) => false
+                case (true, false)  => !t.isGroupAccount
-          }}.map { t =>
+                case (false, true)  => t.isGroupAccount
-            Map(
+                case (false, false) => false
-              "label" -> s"<b>@${t.userName}</b> ${t.fullName}",
+              }
-              "value" -> t.userName
+            }
-            )
+            .map { t =>
-          }
+              Map(
-      ))
+                "label" -> s"<b>@${StringUtil.escapeHtml(t.userName)}</b> ${StringUtil.escapeHtml(t.fullName)}",
+                "value" -> t.userName
+              )
+            }
+        )
+      )
     )
   })
 
@@ -198,48 +220,68 @@ trait IndexControllerBase extends ControllerBase {
    * Returns a single string which is any of "group", "user" or "".
    */
   post("/_user/existence")(usersOnly {
-    getAccountByUserName(params("userName")).map { account =>
+    getAccountByUserNameIgnoreCase(params("userName")).map { account =>
-      if(account.isGroupAccount) "group" else "user"
+      if (account.isGroupAccount) "group" else "user"
     } getOrElse ""
   })
 
   // TODO Move to RepositoryViwerController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")){ case (query, target) =>
+    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")) {
-      val page = try {
+      case (query, target) =>
-        val i = params.getOrElse("page", "1").toInt
+        val page = try {
-        if(i <= 0) 1 else i
+          val i = params.getOrElse("page", "1").toInt
-      } catch {
+          if (i <= 0) 1 else i
-        case e: NumberFormatException => 1
+        } catch {
-      }
+          case e: NumberFormatException => 1
+        }
 
-      target.toLowerCase match {
+        target.toLowerCase match {
-        case "issue" => gitbucket.core.search.html.issues(
+          case "issues" =>
-          if(query.nonEmpty) searchIssues(repository.owner, repository.name, query) else Nil,
+            gitbucket.core.search.html.issues(
-          query, page, repository)
+              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
+              false,
+              query,
+              page,
+              repository
+            )
 
-        case "wiki" => gitbucket.core.search.html.wiki(
+          case "pulls" =>
-          if(query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
+            gitbucket.core.search.html.issues(
-          query, page, repository)
+              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
+              true,
+              query,
+              page,
+              repository
+            )
 
-        case _ => gitbucket.core.search.html.code(
+          case "wiki" =>
-          if(query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
+            gitbucket.core.search.html.wiki(
-          query, page, repository)
+              if (query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
-      }
+              query,
+              page,
+              repository
+            )
+
+          case _ =>
+            gitbucket.core.search.html.code(
+              if (query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
+              query,
+              page,
+              repository
+            )
+        }
     }
   })
 
-  get("/search"){
+  get("/search") {
     val query = params.getOrElse("query", "").trim.toLowerCase
-    val visibleRepositories = getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
+    val visibleRepositories =
+      getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
     val repositories = visibleRepositories.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }
-    context.loginAccount.map { account =>
+    gitbucket.core.search.html.repositories(query, repositories, visibleRepositories)
-      gitbucket.core.search.html.repositories(query, repositories, Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
-    }.getOrElse {
-      gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil)
-    }
   }
 
 }

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

@@ -11,23 +11,24 @@ import gitbucket.core.view.Markdown
 import org.scalatra.forms._
 import org.scalatra.{BadRequest, Ok}
 
-
+class IssuesController
-class IssuesController extends IssuesControllerBase
+    extends IssuesControllerBase
-  with IssuesService
+    with IssuesService
-  with RepositoryService
+    with RepositoryService
-  with AccountService
+    with AccountService
-  with LabelsService
+    with LabelsService
-  with MilestonesService
+    with MilestonesService
-  with ActivityService
+    with ActivityService
-  with HandleCommentService
+    with HandleCommentService
-  with IssueCreationService
+    with IssueCreationService
-  with ReadableUsersAuthenticator
+    with ReadableUsersAuthenticator
-  with ReferrerAuthenticator
+    with ReferrerAuthenticator
-  with WritableUsersAuthenticator
+    with WritableUsersAuthenticator
-  with PullRequestService
+    with PullRequestService
-  with WebHookIssueCommentService
+    with WebHookIssueCommentService
-  with CommitsService
+    with WebHookPullRequestReviewCommentService
-  with PrioritiesService
+    with CommitsService
+    with PrioritiesService
 
 trait IssuesControllerBase extends ControllerBase {
   self: IssuesService
@@ -45,40 +46,46 @@ trait IssuesControllerBase extends ControllerBase {
     with WebHookIssueCommentService
     with PrioritiesService =>
 
-  case class IssueCreateForm(title: String, content: Option[String],
+  case class IssueCreateForm(
-    assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Option[String])
+    title: String,
+    content: Option[String],
+    assignedUserName: Option[String],
+    milestoneId: Option[Int],
+    priorityId: Option[Int],
+    labelNames: Option[String]
+  )
   case class CommentForm(issueId: Int, content: String)
   case class IssueStateForm(issueId: Int, content: Option[String])
 
   val issueCreateForm = mapping(
-      "title"            -> trim(label("Title", text(required))),
+    "title" -> trim(label("Title", text(required))),
-      "content"          -> trim(optional(text())),
+    "content" -> trim(optional(text())),
-      "assignedUserName" -> trim(optional(text())),
+    "assignedUserName" -> trim(optional(text())),
-      "milestoneId"      -> trim(optional(number())),
+    "milestoneId" -> trim(optional(number())),
-      "priorityId"       -> trim(optional(number())),
+    "priorityId" -> trim(optional(number())),
-      "labelNames"       -> trim(optional(text()))
+    "labelNames" -> trim(optional(text()))
-    )(IssueCreateForm.apply)
+  )(IssueCreateForm.apply)
 
   val issueTitleEditForm = mapping(
     "title" -> trim(label("Title", text(required)))
-    )(x => x)
+  )(x => x)
   val issueEditForm = mapping(
     "content" -> trim(optional(text()))
-    )(x => x)
+  )(x => x)
 
   val commentForm = mapping(
-      "issueId" -> label("Issue Id", number()),
+    "issueId" -> label("Issue Id", number()),
-      "content" -> trim(label("Comment", text(required)))
+    "content" -> trim(label("Comment", text(required)))
-    )(CommentForm.apply)
+  )(CommentForm.apply)
 
   val issueStateForm = mapping(
-      "issueId" -> label("Issue Id", number()),
+    "issueId" -> label("Issue Id", number()),
-      "content" -> trim(optional(text()))
+    "content" -> trim(optional(text()))
-    )(IssueStateForm.apply)
+  )(IssueStateForm.apply)
 
   get("/:owner/:repository/issues")(referrersOnly { repository =>
     val q = request.getParameter("q")
-    if(Option(q).exists(_.contains("is:pr"))){
+    if (Option(q).exists(_.contains("is:pr"))) {
       redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
     } else {
       searchIssues(repository)
@@ -86,45 +93,50 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
+    defining(repository.owner, repository.name, params("id")) {
-      getIssue(owner, name, issueId) map { issue =>
+      case (owner, name, issueId) =>
-        if(issue.isPullRequest){
+        getIssue(owner, name, issueId) map {
-          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+          issue =>
-        } else {
+            if (issue.isPullRequest) {
-          html.issue(
+              redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-            issue,
+            } else {
-            getComments(owner, name, issueId.toInt),
+              html.issue(
-            getIssueLabels(owner, name, issueId.toInt),
+                issue,
-            getAssignableUserNames(owner, name),
+                getComments(owner, name, issueId.toInt),
-            getMilestonesWithIssueCount(owner, name),
+                getIssueLabels(owner, name, issueId.toInt),
-            getPriorities(owner, name),
+                getAssignableUserNames(owner, name),
-            getLabels(owner, name),
+                getMilestonesWithIssueCount(owner, name),
-            isIssueEditable(repository),
+                getPriorities(owner, name),
-            isIssueManageable(repository),
+                getLabels(owner, name),
-            repository)
+                isIssueEditable(repository),
-        }
+                isIssueManageable(repository),
-      } getOrElse NotFound()
+                repository
+              )
+            }
+        } getOrElse NotFound()
     }
   })
 
   get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
+    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-      defining(repository.owner, repository.name){ case (owner, name) =>
+      defining(repository.owner, repository.name) {
-        html.create(
+        case (owner, name) =>
-          getAssignableUserNames(owner, name),
+          html.create(
-          getMilestones(owner, name),
+            getAssignableUserNames(owner, name),
-          getPriorities(owner, name),
+            getMilestones(owner, name),
-          getDefaultPriority(owner, name),
+            getPriorities(owner, name),
-          getLabels(owner, name),
+            getDefaultPriority(owner, name),
-          isIssueManageable(repository),
+            getLabels(owner, name),
-          getContentTemplate(repository, "ISSUE_TEMPLATE"),
+            isIssueManageable(repository),
-          repository)
+            getContentTemplate(repository, "ISSUE_TEMPLATE"),
+            repository
+          )
       }
     } else Unauthorized()
   })
 
   post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
+    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
       val issue = createIssue(
         repository,
         form.title,
@@ -133,133 +145,158 @@ trait IssuesControllerBase extends ControllerBase {
         form.milestoneId,
         form.priorityId,
         form.labelNames.toArray.flatMap(_.split(",")),
-        context.loginAccount.get)
+        context.loginAccount.get
+      )
 
       redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
     } else Unauthorized()
   })
 
   ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
-      getIssue(owner, name, params("id")).map { issue =>
+      case (owner, name) =>
-        if(isEditableContent(owner, name, issue.openedUserName)){
+        getIssue(owner, name, params("id")).map {
-          // update issue
+          issue =>
-          updateIssue(owner, name, issue.issueId, title, issue.content)
+            if (isEditableContent(owner, name, issue.openedUserName)) {
-          // extract references and create refer comment
+              if (issue.title != title) {
-          createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
+                // update issue
-
+                updateIssue(owner, name, issue.issueId, title, issue.content)
-          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+                // extract references and create refer comment
-        } else Unauthorized()
+                createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
-      } getOrElse NotFound()
+                createComment(
+                  owner,
+                  name,
+                  context.loginAccount.get.userName,
+                  issue.issueId,
+                  issue.title + "\r\n" + title,
+                  "change_title"
+                )
+              }
+              redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+            } else Unauthorized()
+        } getOrElse NotFound()
     }
   })
 
   ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (content, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
-      getIssue(owner, name, params("id")).map { issue =>
+      case (owner, name) =>
-        if(isEditableContent(owner, name, issue.openedUserName)){
+        getIssue(owner, name, params("id")).map { issue =>
-          // update issue
+          if (isEditableContent(owner, name, issue.openedUserName)) {
-          updateIssue(owner, name, issue.issueId, issue.title, content)
+            // update issue
-          // extract references and create refer comment
+            updateIssue(owner, name, issue.issueId, issue.title, content)
-          createReferComment(owner, name, issue, content.getOrElse(""), context.loginAccount.get)
+            // extract references and create refer comment
+            createReferComment(owner, name, issue, content.getOrElse(""), context.loginAccount.get)
 
-          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+            redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
-        } else Unauthorized()
+          } else Unauthorized()
-      } getOrElse NotFound()
+        } getOrElse NotFound()
     }
   })
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
     getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-      val actionOpt = params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      val actionOpt =
-      handleComment(issue, Some(form.content), repository, actionOpt) map { case (issue, id) =>
+        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
-        redirect(s"/${repository.owner}/${repository.name}/${
+      handleComment(issue, Some(form.content), repository, actionOpt) map {
-          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+        case (issue, id) =>
+          redirect(
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+          )
       }
     } getOrElse NotFound()
   })
 
   post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
     getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-      val actionOpt = params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      val actionOpt =
-      handleComment(issue, form.content, repository, actionOpt) map { case (issue, id) =>
+        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
-        redirect(s"/${repository.owner}/${repository.name}/${
+      handleComment(issue, form.content, repository, actionOpt) map {
-          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+        case (issue, id) =>
+          redirect(
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+          )
       }
     } getOrElse NotFound()
   })
 
   ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
-      getComment(owner, name, params("id")).map { comment =>
+      case (owner, name) =>
-        if(isEditableContent(owner, name, comment.commentedUserName)){
+        getComment(owner, name, params("id")).map { comment =>
-          updateComment(comment.issueId, comment.commentId, form.content)
+          if (isEditableContent(owner, name, comment.commentedUserName)) {
-          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
+            updateComment(comment.issueId, comment.commentId, form.content)
-        } else Unauthorized()
+            redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
-      } getOrElse NotFound()
+          } else Unauthorized()
+        } getOrElse NotFound()
     }
   })
 
   ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
-      getComment(owner, name, params("id")).map { comment =>
+      case (owner, name) =>
-        if(isEditableContent(owner, name, comment.commentedUserName)){
+        getComment(owner, name, params("id")).map { comment =>
-          Ok(deleteComment(comment.issueId, comment.commentId))
+          if (isEditableContent(owner, name, comment.commentedUserName)) {
-        } else Unauthorized()
+            Ok(deleteComment(comment.issueId, comment.commentId))
-      } getOrElse NotFound()
+          } else Unauthorized()
+        } getOrElse NotFound()
     }
   })
 
   ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
-    getIssue(repository.owner, repository.name, params("id")) map { x =>
+    getIssue(repository.owner, repository.name, params("id")) map {
-      if(isEditableContent(x.userName, x.repositoryName, x.openedUserName)){
+      x =>
-        params.get("dataType") collect {
+        if (isEditableContent(x.userName, x.repositoryName, x.openedUserName)) {
-          case t if t == "html" => html.editissue(x.content, x.issueId, repository)
+          params.get("dataType") collect {
-        } getOrElse {
+            case t if t == "html" => html.editissue(x.content, x.issueId, repository)
-          contentType = formats("json")
+          } getOrElse {
-          org.json4s.jackson.Serialization.write(
+            contentType = formats("json")
-            Map(
+            org.json4s.jackson.Serialization.write(
-              "title"   -> x.title,
+              Map(
-              "content" -> Markdown.toHtml(
+                "title" -> x.title,
-                markdown = x.content getOrElse "No description given.",
+                "content" -> Markdown.toHtml(
-                repository = repository,
+                  markdown = x.content getOrElse "No description given.",
-                enableWikiLink = false,
+                  repository = repository,
-                enableRefsLink = true,
+                  branch = repository.repository.defaultBranch,
-                enableAnchor = true,
+                  enableWikiLink = false,
-                enableLineBreaks = true,
+                  enableRefsLink = true,
-                enableTaskList = true,
+                  enableAnchor = true,
-                hasWritePermission = true
+                  enableLineBreaks = true,
+                  enableTaskList = true,
+                  hasWritePermission = true
+                )
               )
             )
-          )
+          }
-        }
+        } else Unauthorized()
-      } else Unauthorized()
     } getOrElse NotFound()
   })
 
   ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
-    getComment(repository.owner, repository.name, params("id")) map { x =>
+    getComment(repository.owner, repository.name, params("id")) map {
-      if(isEditableContent(x.userName, x.repositoryName, x.commentedUserName)){
+      x =>
-        params.get("dataType") collect {
+        if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName)) {
-          case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+          params.get("dataType") collect {
-        } getOrElse {
+            case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
-          contentType = formats("json")
+          } getOrElse {
-          org.json4s.jackson.Serialization.write(
+            contentType = formats("json")
-            Map(
+            org.json4s.jackson.Serialization.write(
-              "content" -> view.Markdown.toHtml(
+              Map(
-                markdown = x.content,
+                "content" -> view.Markdown.toHtml(
-                repository = repository,
+                  markdown = x.content,
-                enableWikiLink = false,
+                  repository = repository,
-                enableRefsLink = true,
+                  branch = repository.repository.defaultBranch,
-                enableAnchor = true,
+                  enableWikiLink = false,
-                enableLineBreaks = true,
+                  enableRefsLink = true,
-                enableTaskList = true,
+                  enableAnchor = true,
-                hasWritePermission = true
+                  enableLineBreaks = true,
+                  enableTaskList = true,
+                  hasWritePermission = true
+                )
               )
             )
-          )
+          }
-        }
+        } else Unauthorized()
-      } else Unauthorized()
     } getOrElse NotFound()
   })
 
@@ -270,21 +307,27 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/new")(writableUsersOnly { repository =>
-    defining(params("id").toInt){ issueId =>
+    defining(params("id").toInt) { issueId =>
       registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
       html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
     }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/delete")(writableUsersOnly { repository =>
-    defining(params("id").toInt){ issueId =>
+    defining(params("id").toInt) { issueId =>
       deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
       html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
     }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/assign")(writableUsersOnly { repository =>
-    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"), true)
+    updateAssignedUserName(
+      repository.owner,
+      repository.name,
+      params("id").toInt,
+      assignedUserName("assignedUserName"),
+      true
+    )
     Ok("updated")
   })
 
@@ -292,9 +335,11 @@ trait IssuesControllerBase extends ControllerBase {
     updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"), true)
     milestoneId("milestoneId").map { milestoneId =>
       getMilestonesWithIssueCount(repository.owner, repository.name)
-          .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) =>
+        .find(_._1.milestoneId == milestoneId)
-        gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
+        .map {
-      } getOrElse NotFound()
+          case (_, openCount, closeCount) =>
+            gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
+        } getOrElse NotFound()
     } getOrElse Ok()
   })
 
@@ -305,25 +350,28 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
-    defining(params.get("value")){ action =>
+    defining(params.get("value")) {
-      action match {
+      action =>
-        case Some("open")  => executeBatch(repository) { issueId =>
+        action match {
-          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+          case Some("open") =>
-            handleComment(issue, None, repository, Some("reopen"))
+            executeBatch(repository) { issueId =>
-          }
+              getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                handleComment(issue, None, repository, Some("reopen"))
+              }
+            }
+          case Some("close") =>
+            executeBatch(repository) { issueId =>
+              getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                handleComment(issue, None, repository, Some("close"))
+              }
+            }
+          case _ => BadRequest()
         }
-        case Some("close") => executeBatch(repository) { issueId =>
-          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-            handleComment(issue, None, repository, Some("close"))
-          }
-        }
-        case _ => BadRequest()
-      }
     }
   })
 
   post("/:owner/:repository/issues/batchedit/label")(writableUsersOnly { repository =>
-    params("value").toIntOpt.map{ labelId =>
+    params("value").toIntOpt.map { labelId =>
       executeBatch(repository) { issueId =>
         getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
           registerIssueLabel(repository.owner, repository.name, issueId, labelId, true)
@@ -333,7 +381,7 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
-    defining(assignedUserName("value")){ value =>
+    defining(assignedUserName("value")) { value =>
       executeBatch(repository) {
         updateAssignedUserName(repository.owner, repository.name, _, value, true)
       }
@@ -341,7 +389,7 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
-    defining(milestoneId("value")){ value =>
+    defining(milestoneId("value")) { value =>
       executeBatch(repository) {
         updateMilestoneId(repository.owner, repository.name, _, value, true)
       }
@@ -349,7 +397,7 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
-    defining(priorityId("value")){ value =>
+    defining(priorityId("value")) { value =>
       executeBatch(repository) {
         updatePriorityId(repository.owner, repository.name, _, value, true)
       }
@@ -358,10 +406,10 @@ trait IssuesControllerBase extends ControllerBase {
 
   get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
     (Directory.getAttachedDir(repository.owner, repository.name) match {
-      case dir if(dir.exists && dir.isDirectory) =>
+      case dir if (dir.exists && dir.isDirectory) =>
         dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file =>
           response.setHeader("Content-Disposition", f"""inline; filename=${file.getName}""")
-          RawData(FileUtil.getMimeType(file.getName), file)
+          RawData(FileUtil.getSafeMimeType(file.getName), file)
         }
       case _ => None
     }) getOrElse NotFound()
@@ -372,7 +420,7 @@ trait IssuesControllerBase extends ControllerBase {
   val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
   private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
-    params("checked").split(',') map(_.toInt) foreach execute
+    params("checked").split(',') map (_.toInt) foreach execute
     params("from") match {
       case "issues" => redirect(s"/${repository.owner}/${repository.name}/issues")
       case "pulls"  => redirect(s"/${repository.owner}/${repository.name}/pulls")
@@ -380,13 +428,14 @@ trait IssuesControllerBase extends ControllerBase {
   }
 
   private def searchIssues(repository: RepositoryService.RepositoryInfo) = {
-    defining(repository.owner, repository.name){ case (owner, repoName) =>
+    defining(repository.owner, repository.name) {
-      val page = IssueSearchCondition.page(request)
+      case (owner, repoName) =>
+        val page = IssueSearchCondition.page(request)
 
-      // retrieve search condition
+        // retrieve search condition
-      val condition = IssueSearchCondition(request)
+        val condition = IssueSearchCondition(request)
 
-      html.list(
+        html.list(
           "issues",
           searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
           page,
@@ -394,19 +443,22 @@ trait IssuesControllerBase extends ControllerBase {
           getMilestones(owner, repoName),
           getPriorities(owner, repoName),
           getLabels(owner, repoName),
-          countIssue(condition.copy(state = "open"  ), false, owner -> repoName),
+          countIssue(condition.copy(state = "open"), false, owner -> repoName),
           countIssue(condition.copy(state = "closed"), false, owner -> repoName),
           condition,
           repository,
           isIssueEditable(repository),
-          isIssueManageable(repository))
+          isIssueManageable(repository)
+        )
     }
   }
 
   /**
    * Tests whether an issue or a comment is editable by a logged-in user.
    */
-  private def isEditableContent(owner: String, repository: String, author: String)(implicit context: Context): Boolean = {
+  private def isEditableContent(owner: String, repository: String, author: String)(
+    implicit context: Context
+  ): Boolean = {
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
   }
 }

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

@@ -1,7 +1,14 @@
 package gitbucket.core.controller
 
 import gitbucket.core.issues.labels.html
-import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService, MilestonesService, PrioritiesService}
+import gitbucket.core.service.{
+  RepositoryService,
+  AccountService,
+  IssuesService,
+  LabelsService,
+  MilestonesService,
+  PrioritiesService
+}
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
@@ -9,29 +16,38 @@ import org.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.scalatra.Ok
 
-class LabelsController extends LabelsControllerBase
+class LabelsController
-  with IssuesService with RepositoryService with AccountService
+    extends LabelsControllerBase
-  with LabelsService with PrioritiesService with MilestonesService
+    with IssuesService
-  with ReferrerAuthenticator with WritableUsersAuthenticator
+    with RepositoryService
+    with AccountService
+    with LabelsService
+    with PrioritiesService
+    with MilestonesService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
 
 trait LabelsControllerBase extends ControllerBase {
-  self: LabelsService with IssuesService with RepositoryService
+  self: LabelsService
-    with ReferrerAuthenticator with WritableUsersAuthenticator =>
+    with IssuesService
+    with RepositoryService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator =>
 
   case class LabelForm(labelName: String, color: String)
 
   val labelForm = mapping(
-    "labelName"  -> trim(label("Label name", text(required, labelName, uniqueLabelName, maxlength(100)))),
+    "labelName" -> trim(label("Label name", text(required, labelName, uniqueLabelName, maxlength(100)))),
-    "labelColor" -> trim(label("Color",      text(required, color)))
+    "labelColor" -> trim(label("Color", text(required, color)))
   )(LabelForm.apply)
 
-
   get("/:owner/:repository/issues/labels")(referrersOnly { repository =>
     html.list(
       getLabels(repository.owner, repository.name),
       countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxGet("/:owner/:repository/issues/labels/new")(writableUsersOnly { repository =>
@@ -45,7 +61,8 @@ trait LabelsControllerBase extends ControllerBase {
       // TODO futility
       countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxGet("/:owner/:repository/issues/labels/:labelId/edit")(writableUsersOnly { repository =>
@@ -61,7 +78,8 @@ trait LabelsControllerBase extends ControllerBase {
       // TODO futility
       countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxPost("/:owner/:repository/issues/labels/:labelId/delete")(writableUsersOnly { repository =>
@@ -72,26 +90,34 @@ trait LabelsControllerBase extends ControllerBase {
   /**
    * Constraint for the identifier such as user name, repository name or page name.
    */
-  private def labelName: Constraint = new Constraint(){
+  private def labelName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(value.contains(',')){
+      if (value.contains(',')) {
         Some(s"${name} contains invalid character.")
-      } else if(value.startsWith("_") || value.startsWith("-")){
+      } else if (value.startsWith("_") || value.startsWith("-")) {
         Some(s"${name} starts with invalid character.")
       } else {
         None
       }
   }
 
-  private def uniqueLabelName: Constraint = new Constraint(){
+  private def uniqueLabelName: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
+    override def validate(
-      val owner      = params.value("owner")
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      val owner = params.value("owner")
       val repository = params.value("repository")
-      params.optionValue("labelId").map { labelId =>
+      params
-        getLabel(owner, repository, value).filter(_.labelId != labelId.toInt).map(_ => "Name has already been taken.")
+        .optionValue("labelId")
-      }.getOrElse {
+        .map { labelId =>
-        getLabel(owner, repository, value).map(_ => "Name has already been taken.")
+          getLabel(owner, repository, value).filter(_.labelId != labelId.toInt).map(_ => "Name has already been taken.")
-      }
+        }
+        .getOrElse {
+          getLabel(owner, repository, value).map(_ => "Name has already been taken.")
+        }
     }
   }
 

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

@@ -6,20 +6,23 @@ import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
 import org.scalatra.forms._
 
-class MilestonesController extends MilestonesControllerBase
+class MilestonesController
-  with MilestonesService with RepositoryService with AccountService
+    extends MilestonesControllerBase
-  with ReferrerAuthenticator with WritableUsersAuthenticator
+    with MilestonesService
+    with RepositoryService
+    with AccountService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
 
 trait MilestonesControllerBase extends ControllerBase {
-  self: MilestonesService with RepositoryService
+  self: MilestonesService with RepositoryService with ReferrerAuthenticator with WritableUsersAuthenticator =>
-    with ReferrerAuthenticator with WritableUsersAuthenticator  =>
 
   case class MilestoneForm(title: String, description: Option[String], dueDate: Option[java.util.Date])
 
   val milestoneForm = mapping(
-    "title"       -> trim(label("Title", text(required, maxlength(100)))),
+    "title" -> trim(label("Title", text(required, maxlength(100)))),
     "description" -> trim(label("Description", optional(text()))),
-    "dueDate"     -> trim(label("Due Date", optional(date())))
+    "dueDate" -> trim(label("Due Date", optional(date())))
   )(MilestoneForm.apply)
 
   get("/:owner/:repository/issues/milestones")(referrersOnly { repository =>
@@ -27,7 +30,8 @@ trait MilestonesControllerBase extends ControllerBase {
       params.getOrElse("state", "open"),
       getMilestonesWithIssueCount(repository.owner, repository.name),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   get("/:owner/:repository/issues/milestones/new")(writableUsersOnly {
@@ -40,22 +44,23 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/edit")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.map{ milestoneId =>
+    params("milestoneId").toIntOpt.map { milestoneId =>
       html.edit(getMilestone(repository.owner, repository.name, milestoneId), repository)
     } getOrElse NotFound()
   })
 
-  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableUsersOnly {
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    (form, repository) =>
-      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
+      params("milestoneId").toIntOpt.flatMap { milestoneId =>
-        updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
+        getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
-        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+          updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
-      }
+          redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
-    } getOrElse NotFound()
+        }
+      } getOrElse NotFound()
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/close")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    params("milestoneId").toIntOpt.flatMap { milestoneId =>
       getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
         closeMilestone(milestone)
         redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
@@ -64,7 +69,7 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/open")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    params("milestoneId").toIntOpt.flatMap { milestoneId =>
       getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
         openMilestone(milestone)
         redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
@@ -73,7 +78,7 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/delete")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    params("milestoneId").toIntOpt.flatMap { milestoneId =>
       getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
         deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
         redirect(s"/${repository.owner}/${repository.name}/issues/milestones")

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
@@ -7,20 +8,21 @@ class PreProcessController extends PreProcessControllerBase
 trait PreProcessControllerBase extends ControllerBase {
 
   /**
-   * Provides GitHub compatible URLs for Git client.
+   * Provides GitHub compatible URLs (e.g. http://localhost:8080/owner/repo.git) for Git client.
-   *
-   * <ul>
-   *   <li>git clone http://localhost:8080/owner/repo</li>
-   *   <li>git clone http://localhost:8080/owner/repo.git</li>
-   * </ul>
-   *
-   * @see https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols
    */
   get("/*/*/info/refs") {
     val query = Option(request.getQueryString).map("?" + _).getOrElse("")
     halt(MovedPermanently(baseUrl + "/git" + request.getRequestURI + query))
   }
 
+  /**
+   * Provides GitHub compatible URLs for GitLFS client.
+   */
+  post("/*/*/info/lfs/objects/batch") {
+    val dispatcher = request.getRequestDispatcher("/git" + request.getRequestURI)
+    dispatcher.forward(request, response)
+  }
+
   /**
    * Filter requests from anonymous users.
    *
@@ -28,13 +30,15 @@ trait PreProcessControllerBase extends ControllerBase {
    * But if it's not allowed, demands authentication except some paths.
    */
   get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
-    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
+    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/PrioritiesController.scala

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

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

@@ -1,6 +1,6 @@
 package gitbucket.core.controller
 
-import gitbucket.core.model.WebHook
+import gitbucket.core.model.{CommitComment, CommitComments, IssueComment, WebHook}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
@@ -15,44 +15,68 @@ 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
 
 import scala.collection.JavaConverters._
 
-
+class PullRequestsController
-class PullRequestsController extends PullRequestsControllerBase
+    extends PullRequestsControllerBase
-  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
+    with RepositoryService
-  with CommitsService with ActivityService with WebHookPullRequestService
+    with AccountService
-  with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
+    with IssuesService
-  with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService
+    with PullRequestService
-
+    with MilestonesService
+    with LabelsService
+    with CommitsService
+    with ActivityService
+    with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+    with CommitStatusService
+    with MergeService
+    with ProtectedBranchService
+    with PrioritiesService
 
 trait PullRequestsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
+  self: RepositoryService
-    with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService
+    with AccountService
-    with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
+    with IssuesService
-    with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService =>
+    with MilestonesService
+    with LabelsService
+    with CommitsService
+    with ActivityService
+    with PullRequestService
+    with WebHookPullRequestService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+    with CommitStatusService
+    with MergeService
+    with ProtectedBranchService
+    with PrioritiesService =>
 
   val pullRequestForm = mapping(
-    "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
+    "title" -> trim(label("Title", text(required, maxlength(100)))),
-    "content"               -> trim(label("Content", optional(text()))),
+    "content" -> trim(label("Content", optional(text()))),
-    "targetUserName"        -> trim(text(required, maxlength(100))),
+    "targetUserName" -> trim(text(required, maxlength(100))),
-    "targetBranch"          -> trim(text(required, maxlength(100))),
+    "targetBranch" -> trim(text(required, maxlength(100))),
-    "requestUserName"       -> trim(text(required, maxlength(100))),
+    "requestUserName" -> trim(text(required, maxlength(100))),
     "requestRepositoryName" -> trim(text(required, maxlength(100))),
-    "requestBranch"         -> trim(text(required, maxlength(100))),
+    "requestBranch" -> trim(text(required, maxlength(100))),
-    "commitIdFrom"          -> trim(text(required, maxlength(40))),
+    "commitIdFrom" -> trim(text(required, maxlength(40))),
-    "commitIdTo"            -> trim(text(required, maxlength(40))),
+    "commitIdTo" -> trim(text(required, maxlength(40))),
-    "assignedUserName"      -> trim(optional(text())),
+    "assignedUserName" -> trim(optional(text())),
-    "milestoneId"           -> trim(optional(number())),
+    "milestoneId" -> trim(optional(number())),
-    "priorityId"            -> trim(optional(number())),
+    "priorityId" -> trim(optional(number())),
-    "labelNames"            -> trim(optional(text()))
+    "labelNames" -> trim(optional(text()))
   )(PullRequestForm.apply)
 
   val mergeForm = mapping(
-    "message"  -> trim(label("Message", text(required))),
+    "message" -> trim(label("Message", text(required))),
     "strategy" -> trim(label("Strategy", text(required)))
   )(MergeForm.apply)
 
@@ -76,7 +100,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
   get("/:owner/:repository/pulls")(referrersOnly { repository =>
     val q = request.getParameter("q")
-    if(Option(q).exists(_.contains("is:issue"))){
+    if (Option(q).exists(_.contains("is:issue"))) {
       redirect(s"/${repository.owner}/${repository.name}/issues?q=" + StringUtil.urlEncode(q))
     } else {
       searchPullRequests(None, repository)
@@ -84,66 +108,149 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/pull/:id")(referrersOnly { repository =>
-    params("id").toIntOpt.flatMap{ issueId =>
+    params("id").toIntOpt.flatMap {
-      val owner = repository.owner
+      issueId =>
-      val name = repository.name
+        val owner = repository.owner
-      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+        val name = repository.name
-        using(Git.open(getRepositoryDir(owner, name))){ git =>
+        getPullRequest(owner, name, issueId) map {
-          val (commits, diffs) =
+          case (issue, pullreq) =>
-            getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+            val (commits, diffs) =
-          html.pullreq(
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
-            issue, pullreq,
+
-            (commits.flatten.map(commit => getCommitComments(owner, name, commit.id, true)).flatten.toList ::: getComments(owner, name, issueId))
+            html.conversation(
-              .sortWith((a, b) => a.registeredDate before b.registeredDate),
+              issue,
-            getIssueLabels(owner, name, issueId),
+              pullreq,
-            getAssignableUserNames(owner, name),
+              commits.flatten,
-            getMilestonesWithIssueCount(owner, name),
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
-            getPriorities(owner, name),
+              diffs.size,
-            getLabels(owner, name),
+              getIssueLabels(owner, name, issueId),
-            commits,
+              getAssignableUserNames(owner, name),
-            diffs,
+              getMilestonesWithIssueCount(owner, name),
-            isEditable(repository),
+              getPriorities(owner, name),
-            isManageable(repository),
+              getLabels(owner, name),
-            hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
+              isEditable(repository),
-            repository,
+              isManageable(repository),
-            getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
+              hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
-            flash.toMap.map(f => f._1 -> f._2.toString))
+              repository,
+              getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
+              flash.toMap.map(f => f._1 -> f._2.toString)
+            )
+
+//                html.pullreq(
+//                  issue,
+//                  pullreq,
+//                  comments,
+//                  getIssueLabels(owner, name, issueId),
+//                  getAssignableUserNames(owner, name),
+//                  getMilestonesWithIssueCount(owner, name),
+//                  getPriorities(owner, name),
+//                  getLabels(owner, name),
+//                  commits,
+//                  diffs,
+//                  isEditable(repository),
+//                  isManageable(repository),
+//                  hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
+//                  repository,
+//                  getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
+//                  flash.toMap.map(f => f._1 -> f._2.toString)
+//                )
+        }
+    } getOrElse NotFound()
+  })
+
+  get("/:owner/:repository/pull/:id/commits")(referrersOnly { repository =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
+          case (issue, pullreq) =>
+            val (commits, diffs) =
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+
+            html.commits(
+              issue,
+              pullreq,
+              commits,
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              diffs.size,
+              isManageable(repository),
+              repository
+            )
+        }
+    } getOrElse NotFound()
+  })
+
+  get("/:owner/:repository/pull/:id/files")(referrersOnly { repository =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
+          case (issue, pullreq) =>
+            val (commits, diffs) =
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+
+            html.files(
+              issue,
+              pullreq,
+              diffs,
+              commits.flatten,
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              isManageable(repository),
+              repository
+            )
         }
-      }
     } getOrElse NotFound()
   })
 
   ajaxGet("/:owner/:repository/pull/:id/mergeguide")(referrersOnly { repository =>
-    params("id").toIntOpt.flatMap{ issueId =>
+    params("id").toIntOpt.flatMap {
-      val owner = repository.owner
+      issueId =>
-      val name  = repository.name
+        val owner = repository.owner
-      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+        val name = repository.name
-        val conflictMessage = LockUtil.lock(s"${owner}/${name}"){
+        getPullRequest(owner, name, issueId) map {
-          checkConflict(owner, name, pullreq.branch, issueId)
+          case (issue, pullreq) =>
+            val conflictMessage = LockUtil.lock(s"${owner}/${name}") {
+              checkConflict(owner, name, pullreq.branch, issueId)
+            }
+            val hasMergePermission = hasDeveloperRole(owner, name, context.loginAccount)
+            val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
+            val mergeStatus = PullRequestService.MergeStatus(
+              conflictMessage = conflictMessage,
+              commitStatues = getCommitStatues(owner, name, pullreq.commitIdTo),
+              branchProtection = branchProtection,
+              branchIsOutOfDate = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
+              needStatusCheck = context.loginAccount
+                .map { u =>
+                  branchProtection.needStatusCheck(u.userName)
+                }
+                .getOrElse(true),
+              hasUpdatePermission = hasDeveloperRole(
+                pullreq.requestUserName,
+                pullreq.requestRepositoryName,
+                context.loginAccount
+              ) &&
+                context.loginAccount
+                  .map { u =>
+                    !getProtectedBranchInfo(
+                      pullreq.requestUserName,
+                      pullreq.requestRepositoryName,
+                      pullreq.requestBranch
+                    ).needStatusCheck(u.userName)
+                  }
+                  .getOrElse(false),
+              hasMergePermission = hasMergePermission,
+              commitIdTo = pullreq.commitIdTo
+            )
+            html.mergeguide(
+              mergeStatus,
+              issue,
+              pullreq,
+              repository,
+              getRepository(pullreq.requestUserName, pullreq.requestRepositoryName).get
+            )
         }
-        val hasMergePermission = hasDeveloperRole(owner, name, context.loginAccount)
-        val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
-        val mergeStatus = PullRequestService.MergeStatus(
-          conflictMessage      = conflictMessage,
-           commitStatues       = getCommitStatues(owner, name, pullreq.commitIdTo),
-           branchProtection    = branchProtection,
-           branchIsOutOfDate   = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
-           needStatusCheck     = context.loginAccount.map{ u =>
-                                   branchProtection.needStatusCheck(u.userName)
-                                 }.getOrElse(true),
-           hasUpdatePermission = hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount) &&
-                                   context.loginAccount.map{ u =>
-                                     !getProtectedBranchInfo(pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch).needStatusCheck(u.userName)
-                                   }.getOrElse(false),
-           hasMergePermission  = hasMergePermission,
-           commitIdTo          = pullreq.commitIdTo)
-        html.mergeguide(
-          mergeStatus,
-          issue,
-          pullreq,
-          repository,
-          getRepository(pullreq.requestUserName, pullreq.requestRepositoryName).get)
-      }
     } getOrElse NotFound()
   })
 
@@ -153,21 +260,28 @@ trait PullRequestsControllerBase extends ControllerBase {
       loginAccount <- context.loginAccount
       (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
       owner = pullreq.requestUserName
-      name  = pullreq.requestRepositoryName
+      name = pullreq.requestRepositoryName
       if hasDeveloperRole(owner, name, context.loginAccount)
     } yield {
       val repository = getRepository(owner, name).get
       val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
-      if(branchProtection.enabled){
+      if (branchProtection.enabled) {
         flash += "error" -> s"branch ${pullreq.requestBranch} is protected."
       } else {
-        if(repository.repository.defaultBranch != pullreq.requestBranch){
+        if (repository.repository.defaultBranch != pullreq.requestBranch) {
           val userName = context.loginAccount.get.userName
-          using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+          using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
             git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call()
             recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch)
           }
-          createComment(baseRepository.owner, baseRepository.name, userName, issueId, pullreq.requestBranch, "delete_branch")
+          createComment(
+            baseRepository.owner,
+            baseRepository.name,
+            userName,
+            issueId,
+            pullreq.requestBranch,
+            "delete_branch"
+          )
         } else {
           flash += "error" -> s"""Can't delete the default branch "${pullreq.requestBranch}"."""
         }
@@ -181,61 +295,40 @@ 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
+      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)){
+      if (branchProtection.needStatusCheck(loginAccount.userName)) {
         flash += "error" -> s"branch ${pullreq.requestBranch} is protected need status check."
       } else {
-        LockUtil.lock(s"${owner}/${name}"){
+        LockUtil.lock(s"${owner}/${name}") {
-          val alias = if(pullreq.repositoryName == pullreq.requestRepositoryName && pullreq.userName == pullreq.requestUserName){
+          val alias =
-            pullreq.branch
+            if (pullreq.repositoryName == pullreq.requestRepositoryName && pullreq.userName == pullreq.requestUserName) {
-          } else {
+              pullreq.branch
-            s"${pullreq.userName}:${pullreq.branch}"
+            } else {
-          }
+              s"${pullreq.userName}:${pullreq.branch}"
-          val existIds = using(Git.open(Directory.getRepositoryDir(owner, name))) { git => JGitUtil.getAllCommitIds(git) }.toSet
+            }
-          pullRemote(owner, name, pullreq.requestBranch, pullreq.userName, pullreq.repositoryName, pullreq.branch, loginAccount,
+          val existIds = using(Git.open(Directory.getRepositoryDir(owner, name))) { git =>
-                     s"Merge branch '${alias}' into ${pullreq.requestBranch}") match {
+            JGitUtil.getAllCommitIds(git)
+          }.toSet
+          pullRemote(
+            repository,
+            pullreq.requestBranch,
+            remoteRepository,
+            pullreq.branch,
+            loginAccount,
+            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)
+              updatePullRequests(owner, name, pullreq.requestBranch, loginAccount, "synchronize")
-
-              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.map { commit =>
-                    closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
-                  }
-                }
-
-                // 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)
-                  }
-                }
-              }
               flash += "info" -> s"Merge branch '${alias}' into ${pullreq.requestBranch}"
           }
         }
@@ -248,93 +341,43 @@ 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
+      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)
 
-              // record activity
+      mergePullRequest(repository, issueId, context.loginAccount.get, form.message, form.strategy) match {
-              recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
+        case Right(objectId) => redirect(s"/${owner}/${name}/pull/${issueId}")
-
+        case Left(message)   => Some(BadRequest())
-              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)
-                }
-                closeIssuesFromMessage(issue.title + " " + issue.content.getOrElse(""), loginAccount.userName, owner, name)
-                closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
-              }
-
-              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())
     } getOrElse NotFound()
   })
 
   get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
-    val headBranch:Option[String] = params.get("head")
+    val headBranch: Option[String] = params.get("head")
     (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
       case (Some(originUserName), Some(originRepositoryName)) => {
-        getRepository(originUserName, originRepositoryName).map { originRepository =>
+        getRepository(originUserName, originRepositoryName).map {
-          using(
+          originRepository =>
-            Git.open(getRepositoryDir(originUserName, originRepositoryName)),
+            using(
-            Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+              Git.open(getRepositoryDir(originUserName, originRepositoryName)),
-          ){ (oldGit, newGit) =>
+              Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
-            val newBranch = headBranch.getOrElse(JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2)
+            ) { (oldGit, newGit) =>
-            val oldBranch = originRepository.branchList.find( _ == newBranch).getOrElse(JGitUtil.getDefaultBranch(oldGit, originRepository).get._2)
+              val newBranch = headBranch.getOrElse(JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2)
+              val oldBranch = originRepository.branchList
+                .find(_ == newBranch)
+                .getOrElse(JGitUtil.getDefaultBranch(oldGit, originRepository).get._2)
 
-            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}")
+              redirect(
-          }
+                s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}"
+              )
+            }
         } getOrElse NotFound()
       }
       case _ => {
-        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
+        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))) { git =>
-          JGitUtil.getDefaultBranch(git, forkedRepository).map { case (_, defaultBranch) =>
+          JGitUtil.getDefaultBranch(git, forkedRepository).map {
-            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${headBranch.getOrElse(defaultBranch)}")
+            case (_, defaultBranch) =>
+              redirect(
+                s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${headBranch.getOrElse(defaultBranch)}"
+              )
           } getOrElse {
             redirect(s"/${forkedRepository.owner}/${forkedRepository.name}")
           }
@@ -348,91 +391,89 @@ trait PullRequestsControllerBase extends ControllerBase {
     val (originOwner, originId) = parseCompareIdentifier(origin, forkedRepository.owner)
     val (forkedOwner, forkedId) = parseCompareIdentifier(forked, forkedRepository.owner)
 
-    (for(
+    (for (originRepositoryName <- if (originOwner == forkedOwner) {
-      originRepositoryName <- if(originOwner == forkedOwner) {
+            // Self repository
-        // Self repository
+            Some(forkedRepository.name)
-        Some(forkedRepository.name)
+          } else if (forkedRepository.repository.originUserName.isEmpty) {
-      } else if(forkedRepository.repository.originUserName.isEmpty){
+            // when ForkedRepository is the original repository
-        // when ForkedRepository is the original repository
+            getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-        getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_.userName == originOwner).map(_.repositoryName)
+              .find(_.userName == originOwner)
-      } else if(Some(originOwner) == forkedRepository.repository.originUserName){
+              .map(_.repositoryName)
-        // Original repository
+          } else if (Some(originOwner) == forkedRepository.repository.originUserName) {
-        forkedRepository.repository.originRepositoryName
+            // Original repository
-      } else {
+            forkedRepository.repository.originRepositoryName
-        // Sibling repository
-        getUserRepositories(originOwner).find { x =>
-          x.repository.originUserName == forkedRepository.repository.originUserName &&
-            x.repository.originRepositoryName == forkedRepository.repository.originRepositoryName
-        }.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 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)
+            // Sibling repository
-            val forkedId2 = forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
+            getUserRepositories(originOwner)
+              .find { x =>
+                x.repository.originUserName == forkedRepository.repository.originUserName &&
+                x.repository.originRepositoryName == forkedRepository.repository.originRepositoryName
+              }
+              .map(_.repository.repositoryName)
+          };
+          originRepository <- getRepository(originOwner, originRepositoryName)) yield {
+      val (oldId, newId) =
+        getPullRequestCommitFromTo(originRepository, forkedRepository, originId, 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)
           }
 
-        (oldId, newId) match {
+          html.compare(
-          case (Some(oldId), Some(newId)) => {
+            title,
-            val (commits, diffs) = getRequestCompareInfo(
+            commits,
-              originRepository.owner, originRepository.name, oldId.getName,
+            diffs,
-              forkedRepository.owner, forkedRepository.name, newId.getName)
+            ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
-
+              case (Some(userName), Some(repositoryName)) =>
-            val title = if(commits.flatten.length == 1){
+                getRepository(userName, repositoryName) match {
-              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)
+              case _ =>
-              }).map { repository => (repository.userName, repository.repositoryName) },
+                forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-              commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList,
+            }).map { repository =>
-              originId,
+              (repository.userName, repository.repositoryName, repository.defaultBranch)
-              forkedId,
+            },
-              oldId.getName,
+            commits.flatten
-              newId.getName,
+              .map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false))
-              getContentTemplate(originRepository, "PULL_REQUEST_TEMPLATE"),
+              .flatten
-              forkedRepository,
+              .toList,
-              originRepository,
+            originId,
-              forkedRepository,
+            forkedId,
-              hasDeveloperRole(originRepository.owner, originRepository.name, context.loginAccount),
+            oldId.getName,
-              getAssignableUserNames(originRepository.owner, originRepository.name),
+            newId.getName,
-              getMilestones(originRepository.owner, originRepository.name),
+            getContentTemplate(originRepository, "PULL_REQUEST_TEMPLATE"),
-              getPriorities(originRepository.owner, originRepository.name),
+            forkedRepository,
-              getLabels(originRepository.owner, originRepository.name)
+            originRepository,
-            )
+            forkedRepository,
-          }
+            hasDeveloperRole(originRepository.owner, originRepository.name, context.loginAccount),
-          case (oldId, newId) =>
+            getAssignableUserNames(originRepository.owner, originRepository.name),
-            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/" +
+            getMilestones(originRepository.owner, originRepository.name),
-                     s"${originOwner}:${oldId.map(_ => originId).getOrElse(originRepository.repository.defaultBranch)}..." +
+            getPriorities(originRepository.owner, originRepository.name),
-                     s"${forkedOwner}:${newId.map(_ => forkedId).getOrElse(forkedRepository.repository.defaultBranch)}")
+            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()
   })
@@ -442,102 +483,129 @@ trait PullRequestsControllerBase extends ControllerBase {
     val (originOwner, tmpOriginBranch) = parseCompareIdentifier(origin, forkedRepository.owner)
     val (forkedOwner, tmpForkedBranch) = parseCompareIdentifier(forked, forkedRepository.owner)
 
-    (for(
+    (for (originRepositoryName <- if (originOwner == forkedOwner) {
-      originRepositoryName <- if(originOwner == forkedOwner){
+            Some(forkedRepository.name)
-        Some(forkedRepository.name)
+          } else {
-      } else {
+            forkedRepository.repository.originRepositoryName.orElse {
-        forkedRepository.repository.originRepositoryName.orElse {
+              getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_.userName == originOwner).map(_.repositoryName)
+                .find(_.userName == originOwner)
-        }
+                .map(_.repositoryName)
-      };
+            }
-      originRepository <- getRepository(originOwner, originRepositoryName)
+          };
-    ) yield {
+          originRepository <- getRepository(originOwner, originRepositoryName)) yield {
       using(
         Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
         Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
-      ){ case (oldGit, newGit) =>
+      ) {
-        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+        case (oldGit, newGit) =>
-        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+          val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
-        val conflict = LockUtil.lock(s"${originRepository.owner}/${originRepository.name}"){
+          val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
-          checkConflict(originRepository.owner, originRepository.name, originBranch,
+          val conflict = LockUtil.lock(s"${originRepository.owner}/${originRepository.name}") {
-                        forkedRepository.owner, forkedRepository.name, forkedBranch)
+            checkConflict(
-        }
+              originRepository.owner,
-        html.mergecheck(conflict.isDefined)
+              originRepository.name,
+              originBranch,
+              forkedRepository.owner,
+              forkedRepository.name,
+              forkedBranch
+            )
+          }
+          html.mergecheck(conflict.isDefined)
       }
     }) getOrElse NotFound()
   })
 
   post("/:owner/:repository/pulls/new", pullRequestForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
-      val manageable = isManageable(repository)
+      case (owner, name) =>
-      val loginUserName = context.loginAccount.get.userName
+        val manageable = isManageable(repository)
+        val loginUserName = context.loginAccount.get.userName
 
-      val issueId = insertIssue(
+        val issueId = insertIssue(
-        owner = repository.owner,
+          owner = repository.owner,
-        repository = repository.name,
+          repository = repository.name,
-        loginUser = loginUserName,
+          loginUser = loginUserName,
-        title = form.title,
+          title = form.title,
-        content = form.content,
+          content = form.content,
-        assignedUserName = if (manageable) form.assignedUserName else None,
+          assignedUserName = if (manageable) form.assignedUserName else None,
-        milestoneId = if (manageable) form.milestoneId else None,
+          milestoneId = if (manageable) form.milestoneId else None,
-        priorityId = if (manageable) form.priorityId else None,
+          priorityId = if (manageable) form.priorityId else None,
-        isPullRequest = true)
+          isPullRequest = true
+        )
 
-      createPullRequest(
+        createPullRequest(
-        originUserName = repository.owner,
+          originUserName = repository.owner,
-        originRepositoryName = repository.name,
+          originRepositoryName = repository.name,
-        issueId = issueId,
+          issueId = issueId,
-        originBranch = form.targetBranch,
+          originBranch = form.targetBranch,
-        requestUserName = form.requestUserName,
+          requestUserName = form.requestUserName,
-        requestRepositoryName = form.requestRepositoryName,
+          requestRepositoryName = form.requestRepositoryName,
-        requestBranch = form.requestBranch,
+          requestBranch = form.requestBranch,
-        commitIdFrom = form.commitIdFrom,
+          commitIdFrom = form.commitIdFrom,
-        commitIdTo = form.commitIdTo)
+          commitIdTo = form.commitIdTo
+        )
 
-      // insert labels
+        // insert labels
-      if (manageable) {
+        if (manageable) {
-        form.labelNames.map { value =>
+          form.labelNames.foreach { value =>
-          val labels = getLabels(owner, name)
+            val labels = getLabels(owner, name)
-          value.split(",").foreach { labelName =>
+            value.split(",").foreach { labelName =>
-            labels.find(_.labelName == labelName).map { label =>
+              labels.find(_.labelName == labelName).map { label =>
-              registerIssueLabel(repository.owner, repository.name, issueId, label.labelId)
+                registerIssueLabel(repository.owner, repository.name, issueId, label.labelId)
+              }
             }
           }
         }
-      }
 
-      // fetch requested branch
+        // fetch requested branch
-      fetchAsPullRequest(owner, name, form.requestUserName, form.requestRepositoryName, form.requestBranch, issueId)
+        fetchAsPullRequest(owner, name, form.requestUserName, form.requestRepositoryName, form.requestBranch, issueId)
 
-      // record activity
+        // record activity
-      recordPullRequestActivity(owner, name, loginUserName, issueId, form.title)
+        recordPullRequestActivity(owner, name, loginUserName, issueId, form.title)
 
-      // call web hook
+        // call web hook
-      callPullRequestWebHook("opened", repository, issueId, context.baseUrl, context.loginAccount.get)
+        callPullRequestWebHook("opened", repository, issueId, context.loginAccount.get)
 
-      getIssue(owner, name, issueId.toString) foreach { issue =>
+        getIssue(owner, name, issueId.toString) foreach { issue =>
-        // extract references and create refer comment
+          // extract references and create refer comment
-        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)
+          createReferComment(
+            owner,
+            name,
+            issue,
+            form.title + " " + form.content.getOrElse(""),
+            context.loginAccount.get
+          )
 
-        // call hooks
+          // call hooks
-        PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
+          PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
-      }
+        }
 
-      redirect(s"/${owner}/${name}/pull/${issueId}")
+        redirect(s"/${owner}/${name}/pull/${issueId}")
     }
   })
 
   ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository =>
-    val branches = JGitUtil.getBranches(
+    val thresholdTime = System.currentTimeMillis() - (1000 * 60 * 60)
-      owner         = repository.owner,
+    val mailAddresses =
-      name          = repository.name,
+      context.loginAccount.map(x => Seq(x.mailAddress) ++ getAccountExtraMailAddresses(x.userName)).getOrElse(Nil)
-      defaultBranch = repository.repository.defaultBranch,
+
-      origin        = repository.repository.originUserName.isEmpty
+    val branches = JGitUtil
-    )
+      .getBranches(
-    .filter(x => x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0)
+        owner = repository.owner,
-    .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+        name = repository.name,
-    .map(_.name)
+        defaultBranch = repository.repository.defaultBranch,
-    .reverse
+        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
 
     val targetRepository = (for {
       parentUserName <- repository.repository.parentUserName
@@ -556,41 +624,29 @@ 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) =>
+    defining(repository.owner, repository.name) {
-      val page = IssueSearchCondition.page(request)
+      case (owner, repoName) =>
+        val page = IssueSearchCondition.page(request)
 
-      // retrieve search condition
+        // retrieve search condition
-      val condition = IssueSearchCondition(request)
+        val condition = IssueSearchCondition(request)
 
-      gitbucket.core.issues.html.list(
+        gitbucket.core.issues.html.list(
-        "pulls",
+          "pulls",
-        searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
+          searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
-        page,
+          page,
-        getAssignableUserNames(owner, repoName),
+          getAssignableUserNames(owner, repoName),
-        getMilestones(owner, repoName),
+          getMilestones(owner, repoName),
-        getPriorities(owner, repoName),
+          getPriorities(owner, repoName),
-        getLabels(owner, repoName),
+          getLabels(owner, repoName),
-        countIssue(condition.copy(state = "open"  ), true, owner -> repoName),
+          countIssue(condition.copy(state = "open"), true, owner -> repoName),
-        countIssue(condition.copy(state = "closed"), true, owner -> repoName),
+          countIssue(condition.copy(state = "closed"), true, owner -> repoName),
-        condition,
+          condition,
-        repository,
+          repository,
-        isEditable(repository),
+          isEditable(repository),
-        isManageable(repository))
+          isManageable(repository)
+        )
     }
 
   /**

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

@@ -3,22 +3,24 @@ 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
+class ReleaseController
-  with RepositoryService
+    extends ReleaseControllerBase
-  with AccountService
+    with RepositoryService
-  with ReleaseService
+    with AccountService
-  with ActivityService
+    with ReleaseService
-  with ReadableUsersAuthenticator
+    with ActivityService
-  with ReferrerAuthenticator
+    with ReadableUsersAuthenticator
-  with WritableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
 
 trait ReleaseControllerBase extends ControllerBase {
   self: RepositoryService
@@ -35,116 +37,181 @@ trait ReleaseControllerBase extends ControllerBase {
   )
 
   val releaseForm = mapping(
-    "name"    -> trim(text(required)),
+    "name" -> trim(text(required)),
     "content" -> trim(optional(text()))
   )(ReleaseForm.apply)
 
-  get("/:owner/:repository/releases")(referrersOnly {repository =>
+  get("/:owner/:repository/releases")(referrersOnly { repository =>
     val releases = getReleases(repository.owner, repository.name)
     val assets = getReleaseAssetsMap(repository.owner, repository.name)
 
     html.list(
       repository,
       repository.tags.reverse.map { tag =>
-        (tag, releases.find(_.tag == tag.name).map { release => (release, assets(release)) })
+        (tag, releases.find(_.tag == tag.name).map { release =>
+          (release, assets(release))
+        })
       },
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   get("/:owner/:repository/releases/:tag")(referrersOnly { repository =>
-    val tag = params("tag")
+    val tagName = params("tag")
-    getRelease(repository.owner, repository.name, tag).map { release =>
+    getRelease(repository.owner, repository.name, tagName)
-      html.release(release, getReleaseAssets(repository.owner, repository.name, tag), hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
+      .map { release =>
-    }.getOrElse(NotFound())
+        html.release(
+          release,
+          getReleaseAssets(repository.owner, repository.name, tagName),
+          hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+          repository
+        )
+      }
+      .getOrElse(NotFound())
   })
 
-  get("/:owner/:repository/releases/:tag/assets/:fileId")(referrersOnly {repository =>
+  get("/:owner/:repository/releases/:tag/assets/:fileId")(referrersOnly { repository =>
-    val tag = params("tag")
+    val tagName = params("tag")
     val fileId = params("fileId")
     (for {
-      _     <- repository.tags.find(_.name == tag)
+      _ <- repository.tags.find(_.name == tagName)
-      _     <- getRelease(repository.owner, repository.name, tag)
+      _ <- getRelease(repository.owner, repository.name, tagName)
-      asset <- getReleaseAsset(repository.owner, repository.name, tag, fileId)
+      asset <- getReleaseAsset(repository.owner, repository.name, tagName, fileId)
     } yield {
       response.setHeader("Content-Disposition", s"attachment; filename=${asset.label}")
       RawData(
-        FileUtil.getMimeType(asset.label),
+        FileUtil.getSafeMimeType(asset.label),
-        new File(getReleaseFilesDir(repository.owner, repository.name), tag + "/" + fileId)
+        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(tagName + "/" + fileId))
       )
     }).getOrElse(NotFound())
   })
 
-  get("/:owner/:repository/releases/:tag/create")(writableUsersOnly {repository =>
+  get("/:owner/:repository/releases/:tag/create")(writableUsersOnly { repository =>
-    html.form(repository, params("tag"), None)
+    val tagName = params("tag")
+    val previousTags = repository.tags.takeWhile(_.name != tagName).reverse
+
+    repository.tags
+      .find(_.name == tagName)
+      .map { tag =>
+        html.form(repository, tag, previousTags.map(_.name), tag.message, None)
+      }
+      .getOrElse(NotFound())
   })
 
   post("/:owner/:repository/releases/:tag/create", releaseForm)(writableUsersOnly { (form, repository) =>
-    val tag = params("tag")
+    val tagName = params("tag")
     val loginAccount = context.loginAccount.get
 
     // Insert into RELEASE
-    createRelease(repository.owner, repository.name, form.name, form.content, tag, loginAccount)
+    createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
 
     // Insert into RELEASE_ASSET
-    request.getParameterNames.asScala.filter(_.startsWith("file:")).foreach { paramName =>
+    val files = params.collect {
-      val Array(_, fileId) = paramName.split(":")
+      case (name, value) if name.startsWith("file:") =>
-      val fileName = params(paramName)
+        val Array(_, fileId) = name.split(":")
-      val size = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tag + "/" + fileId).length
+        (fileId, value)
-
+    }
-      createReleaseAsset(repository.owner, repository.name, tag, fileId, fileName, size, loginAccount)
+    files.foreach {
+      case (fileId, fileName) =>
+        val size =
+          new File(
+            getReleaseFilesDir(repository.owner, repository.name),
+            FileUtil.checkFilename(tagName + "/" + fileId)
+          ).length
+        createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
     }
 
     recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name)
 
-    redirect(s"/${repository.owner}/${repository.name}/releases/${tag}")
+    redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
   })
 
-  get("/:owner/:repository/releases/:tag/edit")(writableUsersOnly {repository =>
+  get("/:owner/:repository/changelog/*...*")(writableUsersOnly { repository =>
-    val tag = params("tag")
+    val Seq(previousTag, currentTag) = multiParams("splat")
+    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")
 
-    getRelease(repository.owner, repository.name, tag).map { release =>
+    val commitLog = using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      html.form(repository, release.tag, Some(release, getReleaseAssets(repository.owner, repository.name, tag)))
+      val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
-    }.getOrElse(NotFound())
+      commits
-  })
+        .map { commit =>
-
+          s"- ${commit.shortMessage} ${commit.id}"
-  post("/:owner/:repository/releases/:tag/edit", releaseForm)(writableUsersOnly { (form, repository) =>
-    val tag = params("tag")
-    val loginAccount = context.loginAccount.get
-
-    getRelease(repository.owner, repository.name, tag).map { release =>
-      // Update RELEASE
-      updateRelease(repository.owner, repository.name, tag, form.name, form.content)
-
-      // Delete and Insert RELEASE_ASSET
-      val assets = getReleaseAssets(repository.owner, repository.name, tag)
-      deleteReleaseAssets(repository.owner, repository.name, tag)
-
-      val fileIds = request.getParameterNames.asScala.filter(_.startsWith("file:")).map { paramName =>
-        val Array(_, fileId) = paramName.split(":")
-        val fileName = params(paramName)
-        val size = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), release.tag + "/" + fileId).length
-
-        createReleaseAsset(repository.owner, repository.name, tag, fileId, fileName, size, loginAccount)
-        fileId
-      }
-
-      assets.foreach { asset =>
-        if(!fileIds.contains(asset.fileName)){
-          val file = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), release.tag + "/" + asset.fileName)
-          FileUtils.forceDelete(file)
         }
-      }
+        .mkString("\n")
+    }
 
-      redirect(s"/${release.userName}/${release.repositoryName}/releases/${tag}")
+    commitLog
-    }.getOrElse(NotFound())
+  })
+
+  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,
+        previousTags.map(_.name),
+        release.content.getOrElse(""),
+        Some(release, getReleaseAssets(repository.owner, repository.name, tagName))
+      )
+    }).getOrElse(NotFound())
+  })
+
+  post("/:owner/:repository/releases/:tag/edit", releaseForm)(writableUsersOnly {
+    (form, repository) =>
+      val tagName = params("tag")
+      val loginAccount = context.loginAccount.get
+
+      getRelease(repository.owner, repository.name, tagName)
+        .map { release =>
+          // Update RELEASE
+          updateRelease(repository.owner, repository.name, tagName, form.name, form.content)
+
+          // Delete and Insert RELEASE_ASSET
+          val assets = getReleaseAssets(repository.owner, repository.name, tagName)
+          deleteReleaseAssets(repository.owner, repository.name, tagName)
+
+          val files = params.collect {
+            case (name, value) if name.startsWith("file:") =>
+              val Array(_, fileId) = name.split(":")
+              (fileId, value)
+          }
+          files.foreach {
+            case (fileId, fileName) =>
+              val size =
+                new File(
+                  getReleaseFilesDir(repository.owner, repository.name),
+                  FileUtil.checkFilename(tagName + "/" + fileId)
+                ).length
+              createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+          }
+
+          assets.foreach { asset =>
+            if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
+              val file = new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(release.tag + "/" + asset.fileName)
+              )
+              FileUtils.forceDelete(file)
+            }
+          }
+
+          redirect(s"/${release.userName}/${release.repositoryName}/releases/${tagName}")
+        }
+        .getOrElse(NotFound())
   })
 
   post("/:owner/:repository/releases/:tag/delete")(writableUsersOnly { repository =>
-    val tag = params("tag")
+    val tagName = params("tag")
-    getRelease(repository.owner, repository.name, tag).foreach { release =>
+    getRelease(repository.owner, repository.name, tagName).foreach { release =>
-      FileUtils.deleteDirectory(new File(getReleaseFilesDir(repository.owner, repository.name), release.tag))
+      FileUtils.deleteDirectory(
+        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(release.tag))
+      )
     }
-    deleteRelease(repository.owner, repository.name, tag)
+    deleteRelease(repository.owner, repository.name, tagName)
     redirect(s"/${repository.owner}/${repository.name}/releases")
   })
 

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

@@ -13,22 +13,32 @@ 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
-class RepositorySettingsController extends RepositorySettingsControllerBase
+    extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
+    with RepositoryService
-  with OwnerAuthenticator with UsersAuthenticator
+    with AccountService
+    with WebHookService
+    with ProtectedBranchService
+    with CommitStatusService
+    with DeployKeyService
+    with OwnerAuthenticator
+    with UsersAuthenticator
 
 trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
+  self: RepositoryService
-    with OwnerAuthenticator with UsersAuthenticator =>
+    with AccountService
+    with WebHookService
+    with ProtectedBranchService
+    with CommitStatusService
+    with DeployKeyService
+    with OwnerAuthenticator
+    with UsersAuthenticator =>
 
   // for repository options
   case class OptionsForm(
@@ -45,18 +55,20 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   )
 
   val optionsForm = mapping(
-    "repositoryName"     -> trim(label("Repository Name"    , text(required, maxlength(100), repository, renameRepositoryName))),
+    "repositoryName" -> trim(
-    "description"        -> trim(label("Description"        , optional(text()))),
+      label("Repository Name", text(required, maxlength(100), repository, renameRepositoryName))
-    "isPrivate"          -> trim(label("Repository Type"    , boolean())),
+    ),
-    "issuesOption"       -> trim(label("Issues Option"      , text(required, featureOption))),
+    "description" -> trim(label("Description", optional(text()))),
-    "externalIssuesUrl"  -> trim(label("External Issues URL", optional(text(maxlength(200))))),
+    "isPrivate" -> trim(label("Repository Type", boolean())),
-    "wikiOption"         -> trim(label("Wiki Option"        , text(required, featureOption))),
+    "issuesOption" -> trim(label("Issues Option", text(required, featureOption))),
-    "externalWikiUrl"    -> trim(label("External Wiki URL"  , optional(text(maxlength(200))))),
+    "externalIssuesUrl" -> trim(label("External Issues URL", optional(text(maxlength(200))))),
-    "allowFork"          -> trim(label("Allow Forking"      , boolean())),
+    "wikiOption" -> trim(label("Wiki Option", text(required, featureOption))),
-    "mergeOptions"       -> mergeOptions,
+    "externalWikiUrl" -> trim(label("External Wiki URL", optional(text(maxlength(200))))),
+    "allowFork" -> trim(label("Allow Forking", boolean())),
+    "mergeOptions" -> mergeOptions,
     "defaultMergeOption" -> trim(label("Default merge strategy", text(required)))
   )(OptionsForm.apply).verifying { form =>
-    if(!form.mergeOptions.contains(form.defaultMergeOption)){
+    if (!form.mergeOptions.contains(form.defaultMergeOption)) {
       Seq("defaultMergeOption" -> s"This merge strategy isn't enabled.")
     } else Nil
   }
@@ -65,30 +77,30 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   case class DefaultBranchForm(defaultBranch: String)
 
   val defaultBranchForm = mapping(
-    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100))))
+    "defaultBranch" -> trim(label("Default Branch", text(required, maxlength(100))))
   )(DefaultBranchForm.apply)
 
-
   // for deploy key
   case class DeployKeyForm(title: String, publicKey: String, allowWrite: Boolean)
 
   val deployKeyForm = mapping(
-    "title"      -> trim(label("Title", text(required, maxlength(100)))),
+    "title" -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey"  -> trim2(label("Key" , text(required))), // TODO duplication check in the repository?
+    "publicKey" -> trim2(label("Key", text(required))), // TODO duplication check in the repository?
-    "allowWrite" -> trim(label("Key"  , boolean()))
+    "allowWrite" -> trim(label("Key", boolean()))
   )(DeployKeyForm.apply)
 
   // for web hook url addition
   case class WebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
 
-  def webHookForm(update:Boolean) = mapping(
+  def webHookForm(update: Boolean) =
-    "url"    -> trim(label("url", text(required, webHook(update)))),
+    mapping(
-    "events" -> webhookEvents,
+      "url" -> trim(label("url", text(required, webHook(update)))),
-    "ctype" -> label("ctype", text()),
+      "events" -> webhookEvents,
-    "token" -> optional(trim(label("token", text(maxlength(100)))))
+      "ctype" -> label("ctype", text()),
-  )(
+      "token" -> optional(trim(label("token", text(maxlength(100)))))
-    (url, events, ctype, token) => WebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+    )(
-  )
+      (url, events, ctype, token) => WebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+    )
 
   // for transfer ownership
   case class TransferOwnerShipForm(newOwner: String)
@@ -131,32 +143,9 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       form.defaultMergeOption
     )
     // Change repository name
-    if(repository.name != form.repositoryName){
+    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")
@@ -170,7 +159,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
 
   /** Update default branch */
   post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) =>
-    if(!repository.branchList.contains(form.defaultBranch)){
+    if (!repository.branchList.contains(form.defaultBranch)) {
       redirect(s"/${repository.owner}/${repository.name}/settings/options")
     } else {
       saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch)
@@ -187,12 +176,15 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository =>
     import gitbucket.core.api._
     val branch = params("branch")
-    if(!repository.branchList.contains(branch)){
+    if (!repository.branchList.contains(branch)) {
       redirect(s"/${repository.owner}/${repository.name}/settings/branches")
     } else {
       val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch))
-      val lastWeeks = getRecentStatuesContexts(repository.owner, repository.name,
+      val lastWeeks = getRecentStatuesContexts(
-        Date.from(LocalDateTime.now.minusWeeks(1).toInstant(ZoneOffset.UTC))).toSet
+        repository.owner,
+        repository.name,
+        Date.from(LocalDateTime.now.minusWeeks(1).toInstant(ZoneOffset.UTC))
+      ).toSet
       val knownContexts = (lastWeeks ++ protection.status.contexts).toSeq.sortBy(identity)
       html.branchprotection(repository, branch, protection, knownContexts, flash.get("info"))
     }
@@ -205,13 +197,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     html.collaborators(
       getCollaborators(repository.owner, repository.name),
       getAccountByUserName(repository.owner).get.isGroupAccount,
-      repository)
+      repository
+    )
   })
 
   post("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
     val collaborators = params("collaborators")
     removeCollaborators(repository.owner, repository.name)
-    collaborators.split(",").withFilter(_.nonEmpty).map { collaborator =>
+    collaborators.split(",").withFilter(_.nonEmpty).foreach { collaborator =>
       val userName :: role :: Nil = collaborator.split(":").toList
       addCollaborator(repository.owner, repository.name, userName, role)
     }
@@ -255,62 +248,90 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Send the test request to registered web hook URLs.
    */
   ajaxPost("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
-    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h => Array(h.getName, h.getValue) }
+    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h =>
+      Array(h.getName, h.getValue)
+    }
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
-      import scala.collection.JavaConverters._
+      git =>
-      import scala.concurrent.duration._
+        import scala.collection.JavaConverters._
-      import scala.concurrent._
+        import scala.concurrent.duration._
-      import scala.util.control.NonFatal
+        import scala.concurrent._
-      import org.apache.http.util.EntityUtils
+        import scala.util.control.NonFatal
-      import scala.concurrent.ExecutionContext.Implicits.global
+        import org.apache.http.util.EntityUtils
+        import scala.concurrent.ExecutionContext.Implicits.global
 
-      val url = params("url")
+        val url = params("url")
-      val token = Some(params("token"))
+        val token = Some(params("token"))
-      val ctype = WebHookContentType.valueOf(params("ctype"))
+        val ctype = WebHookContentType.valueOf(params("ctype"))
-      val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
+        val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
-      val dummyPayload = {
+        val dummyPayload = {
-        val ownerAccount = getAccountByUserName(repository.owner).get
+          val ownerAccount = getAccountByUserName(repository.owner).get
-        val commits = if(JGitUtil.isEmpty(git)) List.empty else git.log
+          val commits =
-          .add(git.getRepository.resolve(repository.repository.defaultBranch))
+            if (JGitUtil.isEmpty(git)) List.empty
-          .setMaxCount(4)
+            else
-          .call.iterator.asScala.map(new CommitInfo(_)).toList
+              git.log
-        val pushedCommit = commits.drop(1)
+                .add(git.getRepository.resolve(repository.repository.defaultBranch))
+                .setMaxCount(4)
+                .call
+                .iterator
+                .asScala
+                .map(new CommitInfo(_))
+                .toList
+          val pushedCommit = commits.drop(1)
 
-        WebHookPushPayload(
+          WebHookPushPayload(
-          git = git,
+            git = git,
-          sender = ownerAccount,
+            sender = ownerAccount,
-          refName = "refs/heads/" + repository.repository.defaultBranch,
+            refName = "refs/heads/" + repository.repository.defaultBranch,
-          repositoryInfo = repository,
+            repositoryInfo = repository,
-          commits = pushedCommit,
+            commits = pushedCommit,
-          repositoryOwner = ownerAccount,
+            repositoryOwner = ownerAccount,
-          oldId = commits.lastOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId()),
+            oldId = commits.lastOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId()),
-          newId = commits.headOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId())
+            newId = commits.headOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId())
+          )
+        }
+
+        val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
+
+        val toErrorMap: PartialFunction[Throwable, Map[String, String]] = {
+          case e: java.net.UnknownHostException                  => Map("error" -> ("Unknown host " + e.getMessage))
+          case e: java.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
+          case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
+          case NonFatal(e)                                       => Map("error" -> (e.getClass + " " + e.getMessage))
+        }
+
+        contentType = formats("json")
+        org.json4s.jackson.Serialization.write(
+          Map(
+            "url" -> url,
+            "request" -> Await.result(
+              reqFuture
+                .map(
+                  req =>
+                    Map(
+                      "headers" -> _headers(req.getAllHeaders),
+                      "payload" -> json
+                  )
+                )
+                .recover(toErrorMap),
+              20 seconds
+            ),
+            "response" -> Await.result(
+              resFuture
+                .map(
+                  res =>
+                    Map(
+                      "status" -> res.getStatusLine(),
+                      "body" -> EntityUtils.toString(res.getEntity()),
+                      "headers" -> _headers(res.getAllHeaders())
+                  )
+                )
+                .recover(toErrorMap),
+              20 seconds
+            )
+          )
         )
-      }
-
-      val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
-
-      val toErrorMap: PartialFunction[Throwable, Map[String,String]] = {
-        case e: java.net.UnknownHostException => Map("error"-> ("Unknown host " + e.getMessage))
-        case e: java.lang.IllegalArgumentException => Map("error"-> ("invalid url"))
-        case e: org.apache.http.client.ClientProtocolException => Map("error"-> ("invalid url"))
-        case NonFatal(e) => Map("error"-> (e.getClass + " "+ e.getMessage))
-      }
-
-      contentType = formats("json")
-      org.json4s.jackson.Serialization.write(Map(
-        "url" -> url,
-        "request" -> Await.result(reqFuture.map(req => Map(
-          "headers" -> _headers(req.getAllHeaders),
-          "payload" -> json
-        )).recover(toErrorMap), 20 seconds),
-        "response" -> Await.result(resFuture.map(res => Map(
-          "status"  -> res.getStatusLine(),
-          "body"    -> EntityUtils.toString(res.getEntity()),
-          "headers" -> _headers(res.getAllHeaders())
-        )).recover(toErrorMap), 20 seconds)
-      ))
     }
   })
 
@@ -318,8 +339,9 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Display the web hook edit page.
    */
   get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
-    getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
+    getWebHook(repository.owner, repository.name, params("url")).map {
-      html.edithook(webhook, events, repository, false)
+      case (webhook, events) =>
+        html.edithook(webhook, events, repository, false)
     } getOrElse NotFound()
   })
 
@@ -344,32 +366,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
     // Change repository owner
-    if(repository.owner != form.newOwner){
+    if (repository.owner != form.newOwner) {
-      LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      renameRepository(repository.owner, repository.name, form.newOwner, 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))
-      }
     }
     redirect(s"/${form.newOwner}/${repository.name}")
   })
@@ -378,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
-      // Delete the repository and related files
+    deleteRepository(repository.repository)
-      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))
-    }
-
     redirect(s"/${repository.owner}")
   })
 
@@ -428,10 +415,10 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    * Provides duplication check for web hook url.
    */
-  private def webHook(needExists: Boolean): Constraint = new Constraint(){
+  private def webHook(needExists: Boolean): Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(getWebHook(params("owner"), params("repository"), value).isDefined != needExists){
+      if (getWebHook(params("owner"), params("repository"), value).isDefined != needExists) {
-        Some(if(needExists){
+        Some(if (needExists) {
           "URL had not been registered yet."
         } else {
           "URL had been registered already."
@@ -441,17 +428,18 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       }
   }
 
-  private def webhookEvents = new ValueType[Set[WebHook.Event]]{
+  private def webhookEvents = new ValueType[Set[WebHook.Event]] {
     def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
       WebHook.Event.values.flatMap { t =>
         params.get(name + "." + t.name).map(_ => t)
       }.toSet
     }
-    def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+    def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
-      Seq(name -> messages("error.required").format(name))
+      if (convert(name, params, messages).isEmpty) {
-    } else {
+        Seq(name -> messages("error.required").format(name))
-      Nil
+      } else {
-    }
+        Nil
+      }
   }
 
 //  /**
@@ -472,12 +460,17 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    * Duplicate check for the rename repository name.
    */
-  private def renameRepositoryName: Constraint = new Constraint(){
+  private def renameRepositoryName: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
+    override def validate(
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
       for {
         repoName <- params.optionValue("repository") if repoName != value
         userName <- params.optionValue("owner")
-        _        <- getRepositoryNamesOfUser(userName).find(_ == value)
+        _ <- getRepositoryNamesOfUser(userName).find(_ == value)
       } yield {
         "Repository already exists."
       }
@@ -487,38 +480,45 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    *
    */
-  private def featureOption: Constraint = new Constraint(){
+  private def featureOption: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] =
+    override def validate(
-      if(Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] =
+      if (Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
   }
 
-
   /**
    * Provides Constraint to validate the repository transfer user.
    */
-  private def transferUser: Constraint = new Constraint(){
+  private def transferUser: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       getAccountByUserName(value) match {
-        case None    => Some("User does not exist.")
+        case None => Some("User does not exist.")
-        case Some(x) => if(x.userName == params("owner")){
+        case Some(x) =>
-          Some("This is current repository owner.")
+          if (x.userName == params("owner")) {
-        } else {
+            Some("This is current repository owner.")
-          params.get("repository").flatMap { repositoryName =>
+          } else {
-            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
+            params.get("repository").flatMap { repositoryName =>
+              getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map { _ =>
+                "User already has same repository."
+              }
+            }
           }
-        }
       }
   }
 
-  private def mergeOptions = new ValueType[Seq[String]]{
+  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){
+      if (mergeOptions.isEmpty) {
         Seq("mergeOptions" -> "At least one option must be enabled.")
-      } else if(!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))){
+      } else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) {
         Seq("mergeOptions" -> "mergeOptions are invalid.")
       } else {
         Nil

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

@@ -15,6 +15,7 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.{AdminAuthenticator, Mailer}
 import org.apache.commons.io.IOUtils
+import org.apache.commons.mail.EmailException
 import org.json4s.jackson.Serialization
 import org.scalatra._
 import org.scalatra.forms._
@@ -23,8 +24,11 @@ import org.scalatra.i18n.Messages
 import scala.collection.JavaConverters._
 import scala.collection.mutable.ListBuffer
 
-class SystemSettingsController extends SystemSettingsControllerBase
+class SystemSettingsController
-  with AccountService with RepositoryService with AdminAuthenticator
+    extends SystemSettingsControllerBase
+    with AccountService
+    with RepositoryService
+    with AdminAuthenticator
 
 case class Table(name: String, columns: Seq[Column])
 case class Column(name: String, primaryKey: Boolean)
@@ -33,72 +37,94 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with AdminAuthenticator =>
 
   private val form = mapping(
-    "baseUrl"                  -> trim(label("Base URL", optional(text()))),
+    "baseUrl" -> trim(label("Base URL", optional(text()))),
-    "information"              -> trim(label("Information", optional(text()))),
+    "information" -> trim(label("Information", optional(text()))),
     "allowAccountRegistration" -> trim(label("Account registration", boolean())),
-    "allowAnonymousAccess"     -> trim(label("Anonymous access", boolean())),
+    "allowAnonymousAccess" -> trim(label("Anonymous access", boolean())),
     "isCreateRepoOptionPublic" -> trim(label("Default option to create a new repository", boolean())),
-    "gravatar"                 -> trim(label("Gravatar", boolean())),
+    "gravatar" -> trim(label("Gravatar", boolean())),
-    "notification"             -> trim(label("Notification", boolean())),
+    "notification" -> trim(label("Notification", boolean())),
-    "activityLogLimit"         -> trim(label("Limit of activity logs", optional(number()))),
+    "activityLogLimit" -> trim(label("Limit of activity logs", optional(number()))),
-    "ssh"                      -> trim(label("SSH access", boolean())),
+    "ssh" -> mapping(
-    "sshHost"                  -> trim(label("SSH host", optional(text()))),
+      "enabled" -> trim(label("SSH access", boolean())),
-    "sshPort"                  -> trim(label("SSH port", optional(number()))),
+      "host" -> trim(label("SSH host", optional(text()))),
-    "useSMTP"                  -> trim(label("SMTP", boolean())),
+      "port" -> trim(label("SSH port", optional(number()))),
-    "smtp"                     -> optionalIfNotChecked("useSMTP", mapping(
+    )(Ssh.apply),
-        "host"                     -> trim(label("SMTP Host", text(required))),
+    "useSMTP" -> trim(label("SMTP", boolean())),
-        "port"                     -> trim(label("SMTP Port", optional(number()))),
+    "smtp" -> optionalIfNotChecked(
-        "user"                     -> trim(label("SMTP User", optional(text()))),
+      "useSMTP",
-        "password"                 -> trim(label("SMTP Password", optional(text()))),
+      mapping(
-        "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
+        "host" -> trim(label("SMTP Host", text(required))),
-        "starttls"                 -> trim(label("Enable STARTTLS", optional(boolean()))),
+        "port" -> trim(label("SMTP Port", optional(number()))),
-        "fromAddress"              -> trim(label("FROM Address", optional(text()))),
+        "user" -> trim(label("SMTP User", optional(text()))),
-        "fromName"                 -> trim(label("FROM Name", optional(text())))
+        "password" -> trim(label("SMTP Password", optional(text()))),
-    )(Smtp.apply)),
+        "ssl" -> trim(label("Enable SSL", optional(boolean()))),
-    "ldapAuthentication"       -> trim(label("LDAP", boolean())),
+        "starttls" -> trim(label("Enable STARTTLS", optional(boolean()))),
-    "ldap"                     -> optionalIfNotChecked("ldapAuthentication", mapping(
+        "fromAddress" -> trim(label("FROM Address", optional(text()))),
-        "host"                     -> trim(label("LDAP host", text(required))),
+        "fromName" -> trim(label("FROM Name", optional(text())))
-        "port"                     -> trim(label("LDAP port", optional(number()))),
+      )(Smtp.apply)
-        "bindDN"                   -> trim(label("Bind DN", optional(text()))),
+    ),
-        "bindPassword"             -> trim(label("Bind Password", optional(text()))),
+    "ldapAuthentication" -> trim(label("LDAP", boolean())),
-        "baseDN"                   -> trim(label("Base DN", text(required))),
+    "ldap" -> optionalIfNotChecked(
-        "userNameAttribute"        -> trim(label("User name attribute", text(required))),
+      "ldapAuthentication",
-        "additionalFilterCondition"-> trim(label("Additional filter condition", optional(text()))),
+      mapping(
-        "fullNameAttribute"        -> trim(label("Full name attribute", optional(text()))),
+        "host" -> trim(label("LDAP host", text(required))),
-        "mailAttribute"            -> trim(label("Mail address attribute", optional(text()))),
+        "port" -> trim(label("LDAP port", optional(number()))),
-        "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
+        "bindDN" -> trim(label("Bind DN", optional(text()))),
-        "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
+        "bindPassword" -> trim(label("Bind Password", optional(text()))),
-        "keystore"                 -> trim(label("Keystore", optional(text())))
+        "baseDN" -> trim(label("Base DN", text(required))),
-    )(Ldap.apply)),
+        "userNameAttribute" -> trim(label("User name attribute", text(required))),
-    "oidcAuthentication"       -> trim(label("OIDC", boolean())),
+        "additionalFilterCondition" -> trim(label("Additional filter condition", optional(text()))),
-    "oidc"                     -> optionalIfNotChecked("oidcAuthentication", mapping(
+        "fullNameAttribute" -> trim(label("Full name attribute", optional(text()))),
-        "issuer"                   -> trim(label("Issuer", text(required))),
+        "mailAttribute" -> trim(label("Mail address attribute", optional(text()))),
-        "clientID"                 -> trim(label("Client ID", text(required))),
+        "tls" -> trim(label("Enable TLS", optional(boolean()))),
-        "clientSecret"             -> trim(label("Client secret", text(required))),
+        "ssl" -> trim(label("Enable SSL", optional(boolean()))),
-        "jwsAlgorithm"             -> trim(label("Signature algorithm", optional(text())))
+        "keystore" -> trim(label("Keystore", optional(text())))
-    )(OIDC.apply)),
+      )(Ldap.apply)
-    "skinName" -> trim(label("AdminLTE skin name", text(required)))
+    ),
+    "oidcAuthentication" -> trim(label("OIDC", boolean())),
+    "oidc" -> optionalIfNotChecked(
+      "oidcAuthentication",
+      mapping(
+        "issuer" -> trim(label("Issuer", text(required))),
+        "clientID" -> trim(label("Client ID", text(required))),
+        "clientSecret" -> trim(label("Client secret", text(required))),
+        "jwsAlgorithm" -> trim(label("Signature algorithm", optional(text())))
+      )(OIDC.apply)
+    ),
+    "skinName" -> trim(label("AdminLTE skin name", text(required))),
+    "showMailAddress" -> trim(label("Show mail address", boolean())),
+    "pluginNetworkInstall" -> trim(label("Network plugin installation", boolean())),
+    "proxy" -> optionalIfNotChecked(
+      "useProxy",
+      mapping(
+        "host" -> trim(label("Proxy host", text(required))),
+        "port" -> trim(label("Proxy port", number())),
+        "user" -> trim(label("Keystore", optional(text()))),
+        "password" -> trim(label("Keystore", optional(text())))
+      )(Proxy.apply)
+    )
   )(SystemSettings.apply).verifying { settings =>
     Vector(
-      if(settings.ssh && settings.baseUrl.isEmpty){
+      if (settings.ssh.enabled && settings.baseUrl.isEmpty) {
         Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
       } else None,
-      if(settings.ssh && settings.sshHost.isEmpty){
+      if (settings.ssh.enabled && settings.ssh.sshHost.isEmpty) {
         Some("sshHost" -> "SSH host is required if SSH access is enabled.")
       } else None
     ).flatten
   }
 
   private val sendMailForm = mapping(
-    "smtp"        -> mapping(
+    "smtp" -> mapping(
-      "host"        -> trim(label("SMTP Host", text(required))),
+      "host" -> trim(label("SMTP Host", text(required))),
-      "port"        -> trim(label("SMTP Port", optional(number()))),
+      "port" -> trim(label("SMTP Port", optional(number()))),
-      "user"        -> trim(label("SMTP User", optional(text()))),
+      "user" -> trim(label("SMTP User", optional(text()))),
-      "password"    -> trim(label("SMTP Password", optional(text()))),
+      "password" -> trim(label("SMTP Password", optional(text()))),
-      "ssl"         -> trim(label("Enable SSL", optional(boolean()))),
+      "ssl" -> trim(label("Enable SSL", optional(boolean()))),
-      "starttls"    -> trim(label("Enable STARTTLS", optional(boolean()))),
+      "starttls" -> trim(label("Enable STARTTLS", optional(boolean()))),
       "fromAddress" -> trim(label("FROM Address", optional(text()))),
-      "fromName"    -> trim(label("FROM Name", optional(text())))
+      "fromName" -> trim(label("FROM Name", optional(text())))
     )(Smtp.apply),
     "testAddress" -> trim(label("", text(required)))
   )(SendMailForm.apply)
@@ -107,126 +133,164 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   case class DataExportForm(tableNames: List[String])
 
-  case class NewUserForm(userName: String, password: String, fullName: String,
+  case class NewUserForm(
-                         mailAddress: String, isAdmin: Boolean,
+    userName: String,
-                         description: Option[String], url: Option[String], fileId: Option[String])
+    password: String,
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    isAdmin: Boolean,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String]
+  )
 
-  case class EditUserForm(userName: String, password: Option[String], fullName: String,
+  case class EditUserForm(
-                          mailAddress: String, isAdmin: Boolean, description: Option[String], url: Option[String],
+    userName: String,
-                          fileId: Option[String], clearImage: Boolean, isRemoved: Boolean)
+    password: Option[String],
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    isAdmin: Boolean,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    clearImage: Boolean,
+    isRemoved: Boolean
+  )
 
-  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
+  case class NewGroupForm(
-                          members: String)
+    groupName: String,
-
+    description: Option[String],
-  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
+    url: Option[String],
-                           members: String, clearImage: Boolean, isRemoved: Boolean)
+    fileId: Option[String],
+    members: String
+  )
 
+  case class EditGroupForm(
+    groupName: String,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    members: String,
+    clearImage: Boolean,
+    isRemoved: Boolean
+  )
 
   val newUserForm = mapping(
-    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "userName" -> trim(label("Username", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     ,text(required, maxlength(20), password))),
+    "password" -> trim(label("Password", text(required, maxlength(20), password))),
-    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
-    "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "extraMailAddresses" -> list(
-    "description" -> trim(label("bio"          ,optional(text()))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
-    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    ),
-    "fileId"      -> trim(label("File ID"      ,optional(text())))
+    "isAdmin" -> trim(label("User Type", boolean())),
+    "description" -> trim(label("bio", optional(text()))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text())))
   )(NewUserForm.apply)
 
   val editUserForm = mapping(
-    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier))),
+    "userName" -> trim(label("Username", text(required, maxlength(100), identifier))),
-    "password"    -> trim(label("Password"     ,optional(text(maxlength(20), password)))),
+    "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
-    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "extraMailAddresses" -> list(
-    "description" -> trim(label("bio"          ,optional(text()))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
-    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    ),
-    "fileId"      -> trim(label("File ID"      ,optional(text()))),
+    "isAdmin" -> trim(label("User Type", boolean())),
-    "clearImage"  -> trim(label("Clear image"  ,boolean())),
+    "description" -> trim(label("bio", optional(text()))),
-    "removed"     -> trim(label("Disable"      ,boolean(disableByNotYourself("userName"))))
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text()))),
+    "clearImage" -> trim(label("Clear image", boolean())),
+    "removed" -> trim(label("Disable", boolean(disableByNotYourself("userName"))))
   )(EditUserForm.apply)
 
   val newGroupForm = mapping(
-    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"    -> trim(label("File ID"    ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"   -> trim(label("Members"    ,text(required, members)))
+    "members" -> trim(label("Members", text(required, members)))
   )(NewGroupForm.apply)
 
   val editGroupForm = mapping(
-    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"     -> trim(label("File ID"     ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"    -> trim(label("Members"     ,text(required, members))),
+    "members" -> trim(label("Members", text(required, members))),
-    "clearImage" -> trim(label("Clear image" ,boolean())),
+    "clearImage" -> trim(label("Clear image", boolean())),
-    "removed"    -> trim(label("Disable"     ,boolean()))
+    "removed" -> trim(label("Disable", boolean()))
   )(EditGroupForm.apply)
 
-
   get("/admin/dbviewer")(adminOnly {
     val conn = request2Session(request).conn
     val meta = conn.getMetaData
     val tables = ListBuffer[Table]()
-    using(meta.getTables(null, "%", "%", Array("TABLE", "VIEW"))){ rs =>
+    using(meta.getTables(null, "%", "%", Array("TABLE", "VIEW"))) {
-      while(rs.next()){
+      rs =>
-        val tableName = rs.getString("TABLE_NAME")
+        while (rs.next()) {
+          val tableName = rs.getString("TABLE_NAME")
 
-        val pkColumns = ListBuffer[String]()
+          val pkColumns = ListBuffer[String]()
-        using(meta.getPrimaryKeys(null, null, tableName)){ rs =>
+          using(meta.getPrimaryKeys(null, null, tableName)) { rs =>
-          while(rs.next()){
+            while (rs.next()) {
-            pkColumns += rs.getString("COLUMN_NAME").toUpperCase
+              pkColumns += rs.getString("COLUMN_NAME").toUpperCase
+            }
           }
-        }
 
-        val columns = ListBuffer[Column]()
+          val columns = ListBuffer[Column]()
-        using(meta.getColumns(null, "%", tableName, "%")){ rs =>
+          using(meta.getColumns(null, "%", tableName, "%")) { rs =>
-          while(rs.next()){
+            while (rs.next()) {
-            val columnName = rs.getString("COLUMN_NAME").toUpperCase
+              val columnName = rs.getString("COLUMN_NAME").toUpperCase
-            columns += Column(columnName, pkColumns.contains(columnName))
+              columns += Column(columnName, pkColumns.contains(columnName))
+            }
           }
-        }
 
-        tables += Table(tableName.toUpperCase, columns)
+          tables += Table(tableName.toUpperCase, columns)
-      }
+        }
     }
     html.dbviewer(tables)
   })
 
   post("/admin/dbviewer/_query")(adminOnly {
     contentType = formats("json")
-    params.get("query").collectFirst { case query if query.trim.nonEmpty =>
+    params.get("query").collectFirst {
-      val trimmedQuery = query.trim
+      case query if query.trim.nonEmpty =>
-      if(trimmedQuery.nonEmpty){
+        val trimmedQuery = query.trim
-        try {
+        if (trimmedQuery.nonEmpty) {
-          val conn = request2Session(request).conn
+          try {
-          using(conn.prepareStatement(query)){ stmt =>
+            val conn = request2Session(request).conn
-            if(trimmedQuery.toUpperCase.startsWith("SELECT")){
+            using(conn.prepareStatement(query)) {
-              using(stmt.executeQuery()){ rs =>
+              stmt =>
-                val meta = rs.getMetaData
+                if (trimmedQuery.toUpperCase.startsWith("SELECT")) {
-                val columns = for(i <- 1 to meta.getColumnCount) yield {
+                  using(stmt.executeQuery()) {
-                  meta.getColumnName(i)
+                    rs =>
+                      val meta = rs.getMetaData
+                      val columns = for (i <- 1 to meta.getColumnCount) yield {
+                        meta.getColumnName(i)
+                      }
+                      val result = ListBuffer[Map[String, String]]()
+                      while (rs.next()) {
+                        val row = columns.map { columnName =>
+                          columnName -> Option(rs.getObject(columnName)).map(_.toString).getOrElse("<NULL>")
+                        }.toMap
+                        result += row
+                      }
+                      Ok(Serialization.write(Map("type" -> "query", "columns" -> columns, "rows" -> result)))
+                  }
+                } else {
+                  val rows = stmt.executeUpdate()
+                  Ok(Serialization.write(Map("type" -> "update", "rows" -> rows)))
                 }
-                val result = ListBuffer[Map[String, String]]()
-                while(rs.next()){
-                  val row = columns.map { columnName =>
-                    columnName -> Option(rs.getObject(columnName)).map(_.toString).getOrElse("<NULL>")
-                  }.toMap
-                  result += row
-                }
-                Ok(Serialization.write(Map("type" -> "query", "columns" -> columns, "rows" -> result)))
-              }
-            } else {
-              val rows = stmt.executeUpdate()
-              Ok(Serialization.write(Map("type" -> "update", "rows" -> rows)))
             }
+          } catch {
+            case e: Exception =>
+              Ok(Serialization.write(Map("type" -> "error", "message" -> e.toString)))
           }
-        } catch {
-          case e: Exception =>
-            Ok(Serialization.write(Map("type" -> "error", "message" -> e.toString)))
         }
-      }
     } getOrElse Ok(Serialization.write(Map("type" -> "error", "message" -> "query is empty")))
   })
 
@@ -239,11 +303,10 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
     if (form.sshAddress != context.settings.sshAddress) {
       SshServer.stop()
-       for {
+      for {
-         sshAddress <- form.sshAddress
+        sshAddress <- form.sshAddress
-         baseUrl    <- form.baseUrl
+        baseUrl <- form.baseUrl
-       }
+      } SshServer.start(sshAddress, baseUrl)
-       SshServer.start(sshAddress, baseUrl)
     }
 
     flash += "info" -> "System settings has been updated."
@@ -253,45 +316,72 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
     try {
       new Mailer(context.settings.copy(smtp = Some(form.smtp), notification = true)).send(
-        to           = form.testAddress,
+        to = form.testAddress,
-        subject      = "Test message from GitBucket",
+        subject = "Test message from GitBucket",
-        textMsg      = "This is a test message from GitBucket.",
+        textMsg = "This is a test message from GitBucket.",
-        htmlMsg      = None,
+        htmlMsg = None,
         loginAccount = context.loginAccount
       )
 
       "Test mail has been sent to: " + form.testAddress
 
     } catch {
-      case e: Exception => "[Error] " + e.toString
+      case e: EmailException => s"[Error] ${e.getCause}"
+      case e: Exception      => s"[Error] ${e.toString}"
     }
   })
 
   get("/admin/plugins")(adminOnly {
     // Installed plugins
     val enabledPlugins = PluginRegistry().getPlugins()
+    val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
+    val gitbucketSemver = Semver.valueOf(gitbucketVersion)
 
-    val gitbucketVersion = Semver.valueOf(GitBucketCoreModule.getVersions.asScala.last.getVersion)
+    // Plugins in the remote repository
-
+    val repositoryPlugins = if (context.settings.pluginNetworkInstall) {
-    // Plugins in the local repository
+      PluginRepository
-    val repositoryPlugins = PluginRepository.getPlugins()
+        .getPlugins()
-      .filterNot { meta =>
+        .map {
-        enabledPlugins.exists { plugin => plugin.pluginId == meta.id &&
+          meta =>
-          Semver.valueOf(plugin.pluginVersion).greaterThanOrEqualTo(Semver.valueOf(meta.latestVersion.version))
+            (meta, meta.versions.reverse.find {
+              version =>
+                val semver = Semver.valueOf(version.version)
+                gitbucketVersion == version.gitbucketVersion && !enabledPlugins.exists { plugin =>
+                  if (plugin.pluginId == meta.id) {
+                    Semver.valueOf(plugin.pluginVersion) match {
+                      case x if x.greaterThan(semver) => true
+                      case x if x.equals(semver) =>
+                        plugin.gitbucketVersion match {
+                          case None    => true
+                          case Some(x) => Semver.valueOf(x).greaterThanOrEqualTo(gitbucketSemver)
+                        }
+                      case _ => false
+                    }
+                  } else false
+                }
+            })
         }
-      }.map { meta =>
+        .collect {
-        (meta, meta.versions.reverse.find { version => gitbucketVersion.satisfies(version.range) })
+          case (meta, Some(version)) =>
-      }.collect { case (meta, Some(version)) =>
+            new PluginInfoBase(
-        new PluginInfoBase(
+              pluginId = meta.id,
-          pluginId      = meta.id,
+              pluginName = meta.name,
-          pluginName    = meta.name,
+              pluginVersion = version.version,
-          pluginVersion = version.version,
+              gitbucketVersion = Some(version.gitbucketVersion),
-          description   = meta.description
+              description = meta.description
-        )
+            )
-      }
+        }
+    } else Nil
 
     // Merge
-    val plugins = enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false))
+    val plugins = (enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false)))
+      .groupBy(_._1.pluginId)
+      .map {
+        case (pluginId, plugins) =>
+          val (plugin, enabled) = plugins.head
+          (plugin, enabled, if (plugins.length > 1) plugins.last._1.pluginVersion else "")
+      }
+      .toList
 
     html.plugins(plugins, flash.get("info"))
   })
@@ -302,101 +392,125 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     redirect("/admin/plugins")
   })
 
-  post("/admin/plugins/:pluginId/:version/_uninstall")(adminOnly {
+  post("/admin/plugins/:pluginId/_uninstall")(adminOnly {
     val pluginId = params("pluginId")
-    val version  = params("version")
+
-    PluginRegistry().getPlugins()
+    if (PluginRegistry().getPlugins().exists(_.pluginId == pluginId)) {
-      .collect { case plugin if (plugin.pluginId == pluginId && plugin.pluginVersion == version) => plugin }
+      PluginRegistry
-      .foreach { _ =>
+        .uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
-        PluginRegistry.uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
+      flash += "info" -> s"${pluginId} was uninstalled."
-        flash += "info" -> s"${pluginId} was uninstalled."
+    }
-      }
+
     redirect("/admin/plugins")
   })
 
   post("/admin/plugins/:pluginId/:version/_install")(adminOnly {
-    val pluginId = params("pluginId")
+    if (context.settings.pluginNetworkInstall) {
-    val version  = params("version")
+      val pluginId = params("pluginId")
-    /// TODO!!!!
+      val version = params("version")
-    PluginRepository.getPlugins()
+      val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
-      .collect { case meta if meta.id == pluginId => (meta, meta.versions.find(_.version == version) )}
+
-      .foreach { case (meta, version) =>
+      PluginRepository
-        version.foreach { version =>
+        .getPlugins()
-          // TODO Install version!
+        .collectFirst {
-          PluginRegistry.install(
+          case meta if meta.id == pluginId =>
-            new java.io.File(PluginHome, s".repository/${version.file}"),
+            (meta, meta.versions.find(x => x.gitbucketVersion == gitbucketVersion && x.version == version))
-            request.getServletContext,
-            loadSystemSettings(),
-            request2Session(request).conn
-          )
-          flash += "info" -> s"${pluginId} was installed."
         }
-      }
+        .foreach {
+          case (meta, version) =>
+            version.foreach { version =>
+              PluginRegistry.install(
+                pluginId,
+                new java.net.URL(version.url),
+                request.getServletContext,
+                loadSystemSettings(),
+                request2Session(request).conn
+              )
+              flash += "info" -> s"${pluginId}:${version.version} was installed."
+            }
+        }
+    }
+
     redirect("/admin/plugins")
   })
 
-
   get("/admin/users")(adminOnly {
     val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
     val includeGroups = params.get("includeGroups").map(_.toBoolean).getOrElse(false)
-    val users          = getAllUsers(includeRemoved, includeGroups)
+    val users = getAllUsers(includeRemoved, includeGroups)
-    val members        = users.collect { case account if(account.isGroupAccount) =>
+    val members = users.collect {
-      account.userName -> getGroupMembers(account.userName).map(_.userName)
+      case account if (account.isGroupAccount) =>
+        account.userName -> getGroupMembers(account.userName).map(_.userName)
     }.toMap
 
     html.userlist(users, members, includeRemoved, includeGroups)
   })
 
   get("/admin/users/_newuser")(adminOnly {
-    html.user(None)
+    html.user(None, Nil)
   })
 
   post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
-    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.description, form.url)
+    createAccount(
+      form.userName,
+      pbkdf2_sha256(form.password),
+      form.fullName,
+      form.mailAddress,
+      form.isAdmin,
+      form.description,
+      form.url
+    )
     updateImage(form.userName, form.fileId, false)
+    updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != ""))
     redirect("/admin/users")
   })
 
   get("/admin/users/:userName/_edituser")(adminOnly {
     val userName = params("userName")
-    html.user(getAccountByUserName(userName, true), flash.get("error"))
+    val extraMails = getAccountExtraMailAddresses(userName)
+    html.user(getAccountByUserName(userName, true), extraMails, flash.get("error"))
   })
 
   post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName, true).map { account =>
+    getAccountByUserName(userName, true).map {
-      if(account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)){
+      account =>
-        flash += "error" -> "Account can't be turned off because this is last one administrator."
+        if (account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)) {
-        redirect(s"/admin/users/${userName}/_edituser")
+          flash += "error" -> "Account can't be turned off because this is last one administrator."
-      } else {
+          redirect(s"/admin/users/${userName}/_edituser")
-        if(form.isRemoved){
+        } else {
-          // Remove repositories
+          if (form.isRemoved) {
-          //        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
+            // Remove repositories
-          //          deleteRepository(userName, repositoryName)
+            //        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
-          //          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
+            //          deleteRepository(userName, repositoryName)
-          //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
+            //          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
-          //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
+            //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
-          //        }
+            //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
-          // Remove from GROUP_MEMBER and COLLABORATOR
+            //        }
-          removeUserRelatedData(userName)
+            // Remove from GROUP_MEMBER and COLLABORATOR
+            removeUserRelatedData(userName)
+          }
+
+          updateAccount(
+            account.copy(
+              password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
+              fullName = form.fullName,
+              mailAddress = form.mailAddress,
+              isAdmin = form.isAdmin,
+              description = form.description,
+              url = form.url,
+              isRemoved = form.isRemoved
+            )
+          )
+
+          updateImage(userName, form.fileId, form.clearImage)
+          updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
+
+          // call hooks
+          if (form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
+          redirect("/admin/users")
         }
-
-        updateAccount(account.copy(
-          password     = form.password.map(sha1).getOrElse(account.password),
-          fullName     = form.fullName,
-          mailAddress  = form.mailAddress,
-          isAdmin      = form.isAdmin,
-          description  = form.description,
-          url          = form.url,
-          isRemoved    = form.isRemoved))
-
-        updateImage(userName, form.fileId, form.clearImage)
-
-        // call hooks
-        if(form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
-
-        redirect("/admin/users")
-      }
     } getOrElse NotFound()
   })
 
@@ -406,33 +520,47 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   post("/admin/users/_newgroup", newGroupForm)(adminOnly { form =>
     createGroup(form.groupName, form.description, form.url)
-    updateGroupMembers(form.groupName, form.members.split(",").map {
+    updateGroupMembers(
-      _.split(":") match {
+      form.groupName,
-        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      form.members
-      }
+        .split(",")
-    }.toList)
+        .map {
+          _.split(":") match {
+            case Array(userName, isManager) => (userName, isManager.toBoolean)
+          }
+        }
+        .toList
+    )
     updateImage(form.groupName, form.fileId, false)
     redirect("/admin/users")
   })
 
   get("/admin/users/:groupName/_editgroup")(adminOnly {
-    defining(params("groupName")){ groupName =>
+    defining(params("groupName")) { groupName =>
       html.usergroup(getAccountByUserName(groupName, true), getGroupMembers(groupName))
     }
   })
 
   post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    defining(params("groupName"), form.members.split(",").map {
+    defining(
-      _.split(":") match {
+      params("groupName"),
-        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      form.members
-      }
+        .split(",")
-    }.toList){ case (groupName, members) =>
+        .map {
-      getAccountByUserName(groupName, true).map { account =>
+          _.split(":") match {
-        updateGroup(groupName, form.description, form.url, form.isRemoved)
+            case Array(userName, isManager) => (userName, isManager.toBoolean)
+          }
+        }
+        .toList
+    ) {
+      case (groupName, members) =>
+        getAccountByUserName(groupName, true).map {
+          account =>
+            updateGroup(groupName, form.description, form.url, form.isRemoved)
 
-        if(form.isRemoved){
+            if (form.isRemoved) {
-          // Remove from GROUP_MEMBER
+              // Remove from GROUP_MEMBER
-          updateGroupMembers(form.groupName, Nil)
+              updateGroupMembers(form.groupName, Nil)
 //          // Remove repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            deleteRepository(groupName, repositoryName)
@@ -440,9 +568,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
 //            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
 //          }
-        } else {
+            } else {
-          // Update GROUP_MEMBER
+              // Update GROUP_MEMBER
-          updateGroupMembers(form.groupName, members)
+              updateGroupMembers(form.groupName, members)
 //          // Update COLLABORATOR for group repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            removeCollaborators(form.groupName, repositoryName)
@@ -450,12 +578,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //              addCollaborator(form.groupName, repositoryName, userName)
 //            }
 //          }
-        }
+            }
 
-        updateImage(form.groupName, form.fileId, form.clearImage)
+            updateImage(form.groupName, form.fileId, form.clearImage)
-        redirect("/admin/users")
+            redirect("/admin/users")
 
-      } getOrElse NotFound()
+        } getOrElse NotFound()
     }
   })
 
@@ -473,25 +601,26 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     response.setHeader("Content-Disposition", "attachment; filename=" + file.getName)
     response.setContentLength(file.length.toInt)
 
-    using(new FileInputStream(file)){ in =>
+    using(new FileInputStream(file)) { in =>
       IOUtils.copy(in, response.outputStream)
     }
 
     ()
   })
 
-  private def members: Constraint = new Constraint(){
+  private def members: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      if(value.split(",").exists {
+      if (value.split(",").exists {
-        _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+            _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
-      }) None else Some("Must select one manager at least.")
+          }) None
+      else Some("Must select one manager at least.")
     }
   }
 
   protected def disableByNotYourself(paramName: String): Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       params.get(paramName).flatMap { userName =>
-        if(userName == context.loginAccount.get.userName && params.get("removed") == Some("true"))
+        if (userName == context.loginAccount.get.userName && params.get("removed") == Some("true"))
           Some("You can't disable your account yourself")
         else
           None

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

@@ -14,58 +14,58 @@ trait ValidationSupport extends FormSupport { self: ServletBase with JacksonJson
 
   def get[T](path: String, form: ValueType[T])(action: T => Any): Route = {
     registerValidate(path, form)
-    get(path){
+    get(path) {
       validate(form)(errors => BadRequest(), form => action(form))
     }
   }
 
   def post[T](path: String, form: ValueType[T])(action: T => Any): Route = {
     registerValidate(path, form)
-    post(path){
+    post(path) {
       validate(form)(errors => BadRequest(), form => action(form))
     }
   }
 
   def put[T](path: String, form: ValueType[T])(action: T => Any): Route = {
     registerValidate(path, form)
-    put(path){
+    put(path) {
       validate(form)(errors => BadRequest(), form => action(form))
     }
   }
 
   def delete[T](path: String, form: ValueType[T])(action: T => Any): Route = {
     registerValidate(path, form)
-    delete(path){
+    delete(path) {
       validate(form)(errors => BadRequest(), form => action(form))
     }
   }
 
   def ajaxGet[T](path: String, form: ValueType[T])(action: T => Any): Route = {
-    get(path){
+    get(path) {
       validate(form)(errors => ajaxError(errors), form => action(form))
     }
   }
 
   def ajaxPost[T](path: String, form: ValueType[T])(action: T => Any): Route = {
-    post(path){
+    post(path) {
       validate(form)(errors => ajaxError(errors), form => action(form))
     }
   }
 
   def ajaxDelete[T](path: String, form: ValueType[T])(action: T => Any): Route = {
-    delete(path){
+    delete(path) {
       validate(form)(errors => ajaxError(errors), form => action(form))
     }
   }
 
   def ajaxPut[T](path: String, form: ValueType[T])(action: T => Any): Route = {
-    put(path){
+    put(path) {
       validate(form)(errors => ajaxError(errors), form => action(form))
     }
   }
 
   private def registerValidate[T](path: String, form: ValueType[T]) = {
-    post(path.replaceFirst("/$", "") + "/validate"){
+    post(path.replaceFirst("/$", "") + "/validate") {
       contentType = "application/json"
       toJson(form.validate("", multiParams, messages))
     }
@@ -84,8 +84,9 @@ trait ValidationSupport extends FormSupport { self: ServletBase with JacksonJson
    * Converts errors to JSON.
    */
   private def toJson(errors: Seq[(String, String)]): JObject =
-    JObject(errors.map { case (key, value) =>
+    JObject(errors.map {
-      JField(key, JString(value))
+      case (key, value) =>
+        JField(key, JString(value))
     }.toList)
 
 }

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

@@ -14,38 +14,60 @@ import org.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
 
-class WikiController extends WikiControllerBase
+class WikiController
-  with WikiService with RepositoryService with AccountService with ActivityService with WebHookService
+    extends WikiControllerBase
-  with ReadableUsersAuthenticator with ReferrerAuthenticator
+    with WikiService
+    with RepositoryService
+    with AccountService
+    with ActivityService
+    with WebHookService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with AccountService with ActivityService with WebHookService
+  self: WikiService
-    with ReadableUsersAuthenticator with ReferrerAuthenticator =>
+    with RepositoryService
+    with AccountService
+    with ActivityService
+    with WebHookService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator =>
 
-  case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
+  case class WikiPageEditForm(
+    pageName: String,
+    content: String,
+    message: Option[String],
+    currentPageName: String,
+    id: String
+  )
 
   val newForm = mapping(
-    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename, unique))),
+    "pageName" -> trim(label("Page name", text(required, maxlength(40), pagename, unique))),
-    "content"         -> trim(label("Content"           , text(required, conflictForNew))),
+    "content" -> trim(label("Content", text(required, conflictForNew))),
-    "message"         -> trim(label("Message"           , optional(text()))),
+    "message" -> trim(label("Message", optional(text()))),
-    "currentPageName" -> trim(label("Current page name" , text())),
+    "currentPageName" -> trim(label("Current page name", text())),
-    "id"              -> trim(label("Latest commit id"  , text()))
+    "id" -> trim(label("Latest commit id", text()))
   )(WikiPageEditForm.apply)
 
   val editForm = mapping(
-    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename))),
+    "pageName" -> trim(label("Page name", text(required, maxlength(40), pagename))),
-    "content"         -> trim(label("Content"           , text(required, conflictForEdit))),
+    "content" -> trim(label("Content", text(required, conflictForEdit))),
-    "message"         -> trim(label("Message"           , optional(text()))),
+    "message" -> trim(label("Message", optional(text()))),
-    "currentPageName" -> trim(label("Current page name" , text(required))),
+    "currentPageName" -> trim(label("Current page name", text(required))),
-    "id"              -> trim(label("Latest commit id"  , text(required)))
+    "id" -> trim(label("Latest commit id", text(required)))
   )(WikiPageEditForm.apply)
 
   get("/:owner/:repository/wiki")(referrersOnly { repository =>
     getWikiPage(repository.owner, repository.name, "Home").map { page =>
-      html.page("Home", page, getWikiPageList(repository.owner, repository.name),
+      html.page(
-        repository, isEditable(repository),
+        "Home",
+        page,
+        getWikiPageList(repository.owner, repository.name),
+        repository,
+        isEditable(repository),
         getWikiPage(repository.owner, repository.name, "_Sidebar"),
-        getWikiPage(repository.owner, repository.name, "_Footer"))
+        getWikiPage(repository.owner, repository.name, "_Footer")
+      )
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
   })
 
@@ -53,20 +75,25 @@ trait WikiControllerBase extends ControllerBase {
     val pageName = StringUtil.urlDecode(params("page"))
 
     getWikiPage(repository.owner, repository.name, pageName).map { page =>
-      html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
+      html.page(
-        repository, isEditable(repository),
+        pageName,
+        page,
+        getWikiPageList(repository.owner, repository.name),
+        repository,
+        isEditable(repository),
         getWikiPage(repository.owner, repository.name, "_Sidebar"),
-        getWikiPage(repository.owner, repository.name, "_Footer"))
+        getWikiPage(repository.owner, repository.name, "_Footer")
+      )
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
   })
 
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
         case Right((logs, hasNext)) => html.history(Some(pageName), logs, repository, isEditable(repository))
-        case Left(_) => NotFound()
+        case Left(_)                => NotFound()
       }
     }
   })
@@ -75,41 +102,57 @@ trait WikiControllerBase extends ControllerBase {
     val pageName = StringUtil.urlDecode(params("page"))
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
-      html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, Some(from), to, true, false).filter(_.newPath == pageName + ".md"), repository,
+      html.compare(
-        isEditable(repository), flash.get("info"))
+        Some(pageName),
+        from,
+        to,
+        JGitUtil.getDiffs(git, Some(from), to, true, false).filter(_.newPath == pageName + ".md"),
+        repository,
+        isEditable(repository),
+        flash.get("info")
+      )
     }
   })
 
   get("/:owner/:repository/wiki/_compare/:commitId")(referrersOnly { repository =>
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
-      html.compare(None, from, to, JGitUtil.getDiffs(git, Some(from), to, true, false), repository,
+      html.compare(
-        isEditable(repository), flash.get("info"))
+        None,
+        from,
+        to,
+        JGitUtil.getDiffs(git, Some(from), to, true, false),
+        repository,
+        isEditable(repository),
+        flash.get("info")
+      )
     }
   })
 
   get("/:owner/:repository/wiki/:page/_revert/:commitId")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val pageName = StringUtil.urlDecode(params("page"))
       val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-      if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))){
+      if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))) {
         redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
       } else {
         flash += "info" -> "This patch was not able to be reversed."
-        redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}")
+        redirect(
+          s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
+        )
       }
     } else Unauthorized()
   })
 
   get("/:owner/:repository/wiki/_revert/:commitId")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-      if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)){
+      if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)) {
-        redirect(s"/${repository.owner}/${repository.name}/wiki/")
+        redirect(s"/${repository.owner}/${repository.name}/wiki")
       } else {
         flash += "info" -> "This patch was not able to be reversed."
         redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
@@ -118,85 +161,102 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/:page/_edit")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val pageName = StringUtil.urlDecode(params("page"))
       html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
     } else Unauthorized()
   })
 
   post("/:owner/:repository/wiki/_edit", editForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
-      defining(context.loginAccount.get){ loginAccount =>
+      defining(context.loginAccount.get) {
-        saveWikiPage(
+        loginAccount =>
-          repository.owner,
+          saveWikiPage(
-          repository.name,
+            repository.owner,
-          form.currentPageName,
+            repository.name,
-          form.pageName,
+            form.currentPageName,
-          appendNewLine(convertLineSeparator(form.content, "LF"), "LF"),
+            form.pageName,
-          loginAccount,
+            appendNewLine(convertLineSeparator(form.content, "LF"), "LF"),
-          form.message.getOrElse(""),
+            loginAccount,
-          Some(form.id)
+            form.message.getOrElse(""),
-        ).map { commitId =>
+            Some(form.id)
-          updateLastActivityDate(repository.owner, repository.name)
+          ).foreach {
-          recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+            commitId =>
-          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+              updateLastActivityDate(repository.owner, repository.name)
-            getAccountByUserName(repository.owner).map { repositoryUser =>
+              recordEditWikiPageActivity(
-              WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
+                repository.owner,
-            }
+                repository.name,
+                loginAccount.userName,
+                form.pageName,
+                commitId
+              )
+              callWebHookOf(repository.owner, repository.name, WebHook.Gollum) {
+                getAccountByUserName(repository.owner).map { repositoryUser =>
+                  WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
+                }
+              }
+          }
+          if (notReservedPageName(form.pageName)) {
+            redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+          } else {
+            redirect(s"/${repository.owner}/${repository.name}/wiki")
           }
-        }
-        if(notReservedPageName(form.pageName)) {
-          redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-        } else {
-          redirect(s"/${repository.owner}/${repository.name}/wiki")
-        }
       }
     } else Unauthorized()
   })
 
   get("/:owner/:repository/wiki/_new")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       html.edit("", None, repository)
     } else Unauthorized()
   })
 
   post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
-      defining(context.loginAccount.get){ loginAccount =>
+      defining(context.loginAccount.get) {
-        saveWikiPage(
+        loginAccount =>
-          repository.owner,
+          saveWikiPage(
-          repository.name,
+            repository.owner,
-          form.currentPageName,
+            repository.name,
-          form.pageName,
+            form.currentPageName,
-          form.content,
+            form.pageName,
-          loginAccount,
+            form.content,
-          form.message.getOrElse(""),
+            loginAccount,
-          None
+            form.message.getOrElse(""),
-        ).map { commitId =>
+            None
-          updateLastActivityDate(repository.owner, repository.name)
+          ).foreach {
-          recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+            commitId =>
-          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+              updateLastActivityDate(repository.owner, repository.name)
-            getAccountByUserName(repository.owner).map { repositoryUser =>
+              recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
-              WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
+              callWebHookOf(repository.owner, repository.name, WebHook.Gollum) {
-            }
+                getAccountByUserName(repository.owner).map { repositoryUser =>
+                  WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
+                }
+              }
           }
-        }
 
-        if(notReservedPageName(form.pageName)) {
+          if (notReservedPageName(form.pageName)) {
-          redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+            redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-        } else {
+          } else {
-          redirect(s"/${repository.owner}/${repository.name}/wiki")
+            redirect(s"/${repository.owner}/${repository.name}/wiki")
-        }
+          }
       }
     } else Unauthorized()
   })
 
   get("/:owner/:repository/wiki/:page/_delete")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val pageName = StringUtil.urlDecode(params("page"))
 
-      defining(context.loginAccount.get){ loginAccount =>
+      defining(context.loginAccount.get) { loginAccount =>
-        deleteWikiPage(repository.owner, repository.name, pageName, loginAccount.fullName, loginAccount.mailAddress, s"Destroyed ${pageName}")
+        deleteWikiPage(
+          repository.owner,
+          repository.name,
+          pageName,
+          loginAccount.fullName,
+          loginAccount.mailAddress,
+          s"Destroyed ${pageName}"
+        )
         updateLastActivityDate(repository.owner, repository.name)
 
         redirect(s"/${repository.owner}/${repository.name}/wiki")
@@ -209,17 +269,17 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.getCommitLog(git, "master") match {
         case Right((logs, hasNext)) => html.history(None, logs, repository, isEditable(repository))
-        case Left(_) => NotFound()
+        case Left(_)                => NotFound()
       }
     }
   })
 
   get("/:owner/:repository/wiki/_blob/*")(referrersOnly { repository =>
     val path = multiParams("splat").head
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve("master"))
 
       getPathObjectId(git, path, revCommit).map { objectId =>
@@ -228,25 +288,32 @@ trait WikiControllerBase extends ControllerBase {
     }
   })
 
-  private def unique: Constraint = new Constraint(){
+  private def unique: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] =
+    override def validate(
-      getWikiPageList(params.value("owner"), params.value("repository")).find(_ == value).map(_ => "Page already exists.")
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] =
+      getWikiPageList(params.value("owner"), params.value("repository"))
+        .find(_ == value)
+        .map(_ => "Page already exists.")
   }
 
-  private def pagename: Constraint = new Constraint(){
+  private def pagename: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(value.exists("\\/:*?\"<>|".contains(_))){
+      if (value.exists("\\/:*?\"<>|".contains(_))) {
         Some(s"${name} contains invalid character.")
-      } else if(notReservedPageName(value) && (value.startsWith("_") || value.startsWith("-"))){
+      } else if (notReservedPageName(value) && (value.startsWith("_") || value.startsWith("-"))) {
         Some(s"${name} starts with invalid character.")
       } else {
         None
       }
   }
 
-  private def notReservedPageName(value: String) = ! (Array[String]("_Sidebar","_Footer") contains value)
+  private def notReservedPageName(value: String) = !(Array[String]("_Sidebar", "_Footer") contains value)
 
-  private def conflictForNew: Constraint = new Constraint(){
+  private def conflictForNew: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       targetWikiPage.map { _ =>
         "Someone has created the wiki since you started. Please reload this page and re-apply your changes."
@@ -254,9 +321,9 @@ trait WikiControllerBase extends ControllerBase {
     }
   }
 
-  private def conflictForEdit: Constraint = new Constraint(){
+  private def conflictForEdit: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      targetWikiPage.filter(_.id != params("id")).map{ _ =>
+      targetWikiPage.filter(_.id != params("id")).map { _ =>
         "Someone has edited the wiki since you started. Please reload this page and re-apply your changes."
       }
     }

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,63 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiGroup, ApiRepository, ApiUser, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, RepositoryService}
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.UsersAuthenticator
+
+trait ApiOrganizationControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService 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
+   */
+
+  /*
+   * 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(
+                      originUserName = repository.owner,
+                      originRepositoryName = repository.name,
+                      issueId = issueId,
+                      originBranch = createPullReq.base,
+                      requestUserName = reqOwner,
+                      requestRepositoryName = repository.name,
+                      requestBranch = reqBranch,
+                      commitIdFrom = commitIdFrom.getName,
+                      commitIdTo = commitIdTo.getName
+                    )
+                    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(
+                      originUserName = repository.owner,
+                      originRepositoryName = repository.name,
+                      issueId = createPullReqAlt.issue,
+                      originBranch = createPullReqAlt.base,
+                      requestUserName = reqOwner,
+                      requestRepositoryName = repository.name,
+                      requestBranch = reqBranch,
+                      commitIdFrom = commitIdFrom.getName,
+                      commitIdTo = commitIdTo.getName
+                    )
+                    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/ApiRepositoryBranchControllerBase.scala

@@ -0,0 +1,236 @@
+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.Implicits._
+import gitbucket.core.util.JGitUtil.getBranches
+
+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 =>
+    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))
+        }
+    )
+  })
+
+  /**
+   * ii. Get branch
+   * 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()
+  })
+
+  /*
+   * 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._
+    (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()
+  })
+}

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,126 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api.{ApiContents, JsonFormat}
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.{AccountService, ProtectedBranchService, 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 =>
+
+  /*
+   * 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
+   * https://developer.github.com/v3/repos/contents/#create-a-file
+   * requested #2112
+   */
+
+  /*
+   * iv. Update a file
+   * https://developer.github.com/v3/repos/contents/#update-a-file
+   * requested #2112
+   */
+
+  /*
+   * 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/AccessToken.scala

@@ -1,6 +1,5 @@
 package gitbucket.core.model
 
-
 trait AccessTokenComponent { self: Profile =>
   import profile.api._
 

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

@@ -20,7 +20,22 @@ trait AccountComponent { self: Profile =>
     val groupAccount = column[Boolean]("GROUP_ACCOUNT")
     val removed = column[Boolean]("REMOVED")
     val description = column[String]("DESCRIPTION")
-    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed, description.?) <> (Account.tupled, Account.unapply)
+    def * =
+      (
+        userName,
+        fullName,
+        mailAddress,
+        password,
+        isAdmin,
+        url.?,
+        registeredDate,
+        updatedDate,
+        lastLoginDate.?,
+        image.?,
+        groupAccount,
+        removed,
+        description.?
+      ) <> (Account.tupled, Account.unapply)
   }
 }
 

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

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

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

@@ -3,7 +3,8 @@ package gitbucket.core.model
 trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
   import profile.api._
 
-  private implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+  private implicit val whContentTypeColumnType =
+    MappedColumnType.base[WebHookContentType, String](whct => whct.code, code => WebHookContentType.valueOf(code))
 
   lazy val AccountWebHooks = TableQuery[AccountWebHooks]
 

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

@@ -8,11 +8,13 @@ trait AccountWebHookEventComponent extends TemplateComponent {
 
   lazy val AccountWebHookEvents = TableQuery[AccountWebHookEvents]
 
-  class AccountWebHookEvents(tag: Tag) extends Table[AccountWebHookEvent](tag, "ACCOUNT_WEB_HOOK_EVENT") with BasicTemplate {
+  class AccountWebHookEvents(tag: Tag)
+      extends Table[AccountWebHookEvent](tag, "ACCOUNT_WEB_HOOK_EVENT")
+      with BasicTemplate {
     val url = column[String]("URL")
     val event = column[WebHook.Event]("EVENT")
 
-    def * = (userName, url, event)  <> ((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)
+    def * = (userName, url, event) <> ((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)
 
     def byAccountWebHook(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
 
@@ -28,7 +30,7 @@ trait AccountWebHookEventComponent extends TemplateComponent {
 }
 
 case class AccountWebHookEvent(
-                         userName: String,
+  userName: String,
-                         url: String,
+  url: String,
-                         event: WebHook.Event
+  event: WebHook.Event
-                       )
+)

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

@@ -13,7 +13,8 @@ trait ActivityComponent extends TemplateComponent { self: Profile =>
     val message = column[String]("MESSAGE")
     val additionalInfo = column[String]("ADDITIONAL_INFO")
     val activityDate = column[java.util.Date]("ACTIVITY_DATE")
-    def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
+    def * =
+      (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
   }
 }
 

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

@@ -76,9 +76,11 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(userName, repositoryName) && (this.commitId === commitId)
   }
 
-  trait BranchTemplate extends BasicTemplate{ self: Table[_] =>
+  trait BranchTemplate extends BasicTemplate { self: Table[_] =>
     val branch = column[String]("BRANCH")
-    def byBranch(owner: String, repository: String, branchName: String) = byRepository(owner, repository) && (branch === branchName.bind)
+    def byBranch(owner: String, repository: String, branchName: String) =
-    def byBranch(owner: Rep[String], repository: Rep[String], branchName: Rep[String]) = byRepository(owner, repository) && (this.branch === branchName)
+      byRepository(owner, repository) && (branch === branchName.bind)
+    def byBranch(owner: Rep[String], repository: Rep[String], branchName: Rep[String]) =
+      byRepository(owner, repository) && (this.branch === branchName)
   }
 }

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

@@ -1,6 +1,7 @@
 package gitbucket.core.model
+import java.util.Date
 
-trait Comment {
+sealed trait Comment {
   val commentedUserName: String
   val registeredDate: java.util.Date
 }
@@ -18,13 +19,14 @@ trait IssueCommentComponent extends TemplateComponent { self: Profile =>
     val content = column[String]("CONTENT")
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
-    def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
+    def * =
+      (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
 }
 
-case class IssueComment (
+case class IssueComment(
   userName: String,
   repositoryName: String,
   issueId: Int,
@@ -52,7 +54,27 @@ trait CommitCommentComponent extends TemplateComponent { self: Profile =>
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     val issueId = column[Option[Int]]("ISSUE_ID")
-    def * = (userName, repositoryName, commitId, commentId, commentedUserName, content, fileName, oldLine, newLine, registeredDate, updatedDate, issueId) <> (CommitComment.tupled, CommitComment.unapply)
+    val originalCommitId = column[String]("ORIGINAL_COMMIT_ID")
+    val originalOldLine = column[Option[Int]]("ORIGINAL_OLD_LINE")
+    val originalNewLine = column[Option[Int]]("ORIGINAL_NEW_LINE")
+    def * =
+      (
+        userName,
+        repositoryName,
+        commitId,
+        commentId,
+        commentedUserName,
+        content,
+        fileName,
+        oldLine,
+        newLine,
+        registeredDate,
+        updatedDate,
+        issueId,
+        originalCommitId,
+        originalOldLine,
+        originalNewLine
+      ) <> (CommitComment.tupled, CommitComment.unapply)
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
@@ -70,5 +92,16 @@ case class CommitComment(
   newLine: Option[Int],
   registeredDate: java.util.Date,
   updatedDate: java.util.Date,
-  issueId: Option[Int]
+  issueId: Option[Int],
- ) extends Comment
+  originalCommitId: String,
+  originalOldLine: Option[Int],
+  originalNewLine: Option[Int]
+) extends Comment
+
+case class CommitComments(
+  fileName: String,
+  commentedUserName: String,
+  registeredDate: Date,
+  comments: Seq[CommitComment],
+  diff: Option[String]
+) extends Comment

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

@@ -4,7 +4,7 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
   import profile.api._
   import self._
 
-  implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name , i => CommitState(i))
+  implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name, i => CommitState(i))
 
   lazy val CommitStatuses = TableQuery[CommitStatuses]
   class CommitStatuses(tag: Tag) extends Table[CommitStatus](tag, "COMMIT_STATUS") with CommitTemplate {
@@ -16,12 +16,24 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
     val creator = column[String]("CREATOR")
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
-    def * = (commitStatusId, userName, repositoryName, commitId, context, state, targetUrl, description, creator, registeredDate, updatedDate) <> ((CommitStatus.apply _).tupled, CommitStatus.unapply)
+    def * =
+      (
+        commitStatusId,
+        userName,
+        repositoryName,
+        commitId,
+        context,
+        state,
+        targetUrl,
+        description,
+        creator,
+        registeredDate,
+        updatedDate
+      ) <> ((CommitStatus.apply _).tupled, CommitStatus.unapply)
     def byPrimaryKey(id: Int) = commitStatusId === id.bind
   }
 }
 
-
 case class CommitStatus(
   commitStatusId: Int = 0,
   userName: String,
@@ -36,23 +48,24 @@ case class CommitStatus(
   updatedDate: java.util.Date
 )
 object CommitStatus {
-  def pending(owner: String, repository: String, context: String) = CommitStatus(
+  def pending(owner: String, repository: String, context: String) =
-    commitStatusId = 0,
+    CommitStatus(
-    userName = owner,
+      commitStatusId = 0,
-    repositoryName = repository,
+      userName = owner,
-    commitId = "",
+      repositoryName = repository,
-    context = context,
+      commitId = "",
-    state = CommitState.PENDING,
+      context = context,
-    targetUrl = None,
+      state = CommitState.PENDING,
-    description = Some("Waiting for status to be reported"),
+      targetUrl = None,
-    creator = "",
+      description = Some("Waiting for status to be reported"),
-    registeredDate = new java.util.Date(),
+      creator = "",
-    updatedDate = new java.util.Date())
+      registeredDate = new java.util.Date(),
+      updatedDate = new java.util.Date()
+    )
 }
 
 sealed abstract class CommitState(val name: String)
 
-
 object CommitState {
   object ERROR extends CommitState("error")
 
@@ -76,11 +89,11 @@ object CommitState {
    * success if the latest status for all contexts is success
    */
   def combine(statuses: Set[CommitState]): CommitState = {
-    if(statuses.isEmpty){
+    if (statuses.isEmpty) {
       PENDING
-    } else if(statuses.contains(CommitState.ERROR) || statuses.contains(CommitState.FAILURE)) {
+    } else if (statuses.contains(CommitState.ERROR) || statuses.contains(CommitState.FAILURE)) {
       FAILURE
-    } else if(statuses.contains(CommitState.PENDING)) {
+    } else if (statuses.contains(CommitState.PENDING)) {
       PENDING
     } else {
       SUCCESS
@@ -88,4 +101,3 @@ object CommitState {
   }
 
 }
-

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

@@ -10,7 +10,8 @@ trait DeployKeyComponent extends TemplateComponent { self: Profile =>
     val title = column[String]("TITLE")
     val publicKey = column[String]("PUBLIC_KEY")
     val allowWrite = column[Boolean]("ALLOW_WRITE")
-    def * = (userName, repositoryName, deployKeyId, title, publicKey, allowWrite) <> (DeployKey.tupled, DeployKey.unapply)
+    def * =
+      (userName, repositoryName, deployKeyId, title, publicKey, allowWrite) <> (DeployKey.tupled, DeployKey.unapply)
 
     def byPrimaryKey(userName: String, repositoryName: String, deployKeyId: Int) =
       (this.userName === userName.bind) && (this.repositoryName === repositoryName.bind) && (this.deployKeyId === deployKeyId.bind)

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

@@ -13,13 +13,19 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
   }
 
-  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
+  class IssueOutline(tag: Tag)
+      extends Table[(String, String, Int, Int, Int)](tag, "ISSUE_OUTLINE_VIEW")
+      with IssueTemplate {
     val commentCount = column[Int]("COMMENT_COUNT")
     val priority = column[Int]("PRIORITY")
     def * = (userName, repositoryName, issueId, commentCount, priority)
   }
 
-  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate with PriorityTemplate {
+  class Issues(tag: Tag)
+      extends Table[Issue](tag, "ISSUE")
+      with IssueTemplate
+      with MilestoneTemplate
+      with PriorityTemplate {
     val openedUserName = column[String]("OPENED_USER_NAME")
     val assignedUserName = column[String]("ASSIGNED_USER_NAME")
     val title = column[String]("TITLE")
@@ -28,7 +34,22 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     val pullRequest = column[Boolean]("PULL_REQUEST")
-    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, priorityId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
+    def * =
+      (
+        userName,
+        repositoryName,
+        issueId,
+        openedUserName,
+        milestoneId.?,
+        priorityId.?,
+        assignedUserName.?,
+        title,
+        content.?,
+        closed,
+        registeredDate,
+        updatedDate,
+        pullRequest
+      ) <> (Issue.tupled, Issue.unapply)
 
     def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
   }

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

@@ -12,23 +12,19 @@ trait LabelComponent extends TemplateComponent { self: Profile =>
     def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
 
     def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) = byLabel(userName, repositoryName, labelId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) =
+      byLabel(userName, repositoryName, labelId)
   }
 }
 
-case class Label(
+case class Label(userName: String, repositoryName: String, labelId: Int = 0, labelName: String, color: String) {
-  userName: String,
-  repositoryName: String,
-  labelId: Int = 0,
-  labelName: String,
-  color: String){
 
   val fontColor = {
     val r = color.substring(0, 2)
     val g = color.substring(2, 4)
     val b = color.substring(4, 6)
 
-    if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
+    if (Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408) {
       "000000"
     } else {
       "ffffff"

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

@@ -12,10 +12,12 @@ trait MilestoneComponent extends TemplateComponent { self: Profile =>
     val description = column[Option[String]]("DESCRIPTION")
     val dueDate = column[Option[java.util.Date]]("DUE_DATE")
     val closedDate = column[Option[java.util.Date]]("CLOSED_DATE")
-    def * = (userName, repositoryName, milestoneId, title, description, dueDate, closedDate) <> (Milestone.tupled, Milestone.unapply)
+    def * =
+      (userName, repositoryName, milestoneId, title, description, dueDate, closedDate) <> (Milestone.tupled, Milestone.unapply)
 
     def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) = byMilestone(userName, repositoryName, milestoneId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) =
+      byMilestone(userName, repositoryName, milestoneId)
   }
 }
 

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

@@ -12,14 +12,16 @@ trait PriorityComponent extends TemplateComponent { self: Profile =>
     val ordering = column[Int]("ORDERING")
     val isDefault = column[Boolean]("IS_DEFAULT")
     val color = column[String]("COLOR")
-    def * = (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply)
+    def * =
+      (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply)
 
     def byPrimaryKey(owner: String, repository: String, priorityId: Int) = byPriority(owner, repository, priorityId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) = byPriority(userName, repositoryName, priorityId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) =
+      byPriority(userName, repositoryName, priorityId)
   }
 }
 
-case class Priority (
+case class Priority(
   userName: String,
   repositoryName: String,
   priorityId: Int = 0,
@@ -27,14 +29,15 @@ case class Priority (
   description: Option[String],
   isDefault: Boolean,
   ordering: Int = 0,
-  color: String){
+  color: String
+) {
 
   val fontColor = {
     val r = color.substring(0, 2)
     val g = color.substring(2, 4)
     val b = color.substring(4, 6)
 
-    if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
+    if (Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408) {
       "000000"
     } else {
       "ffffff"

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

@@ -16,15 +16,15 @@ trait Profile {
   )
 
   /**
-    * WebHookBase.Event Column Types
+   * WebHookBase.Event Column Types
-    */
+   */
   implicit val eventColumnType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
 
   /**
    * Extends Column to add conditional condition
    */
-  implicit class RichColumn(c1: Rep[Boolean]){
+  implicit class RichColumn(c1: Rep[Boolean]) {
-    def &&(c2: => Rep[Boolean], guard: => Boolean): Rep[Boolean] = if(guard) c1 && c2 else c1
+    def &&(c2: => Rep[Boolean], guard: => Boolean): Rep[Boolean] = if (guard) c1 && c2 else c1
   }
 
   /**
@@ -40,31 +40,34 @@ trait ProfileProvider { self: Profile =>
 
 }
 
-trait CoreProfile extends ProfileProvider with Profile
+trait CoreProfile
-  with AccessTokenComponent
+    extends ProfileProvider
-  with AccountComponent
+    with Profile
-  with ActivityComponent
+    with AccessTokenComponent
-  with CollaboratorComponent
+    with AccountComponent
-  with CommitCommentComponent
+    with ActivityComponent
-  with CommitStatusComponent
+    with CollaboratorComponent
-  with GroupMemberComponent
+    with CommitCommentComponent
-  with IssueComponent
+    with CommitStatusComponent
-  with IssueCommentComponent
+    with GroupMemberComponent
-  with IssueLabelComponent
+    with IssueComponent
-  with LabelComponent
+    with IssueCommentComponent
-  with PriorityComponent
+    with IssueLabelComponent
-  with MilestoneComponent
+    with LabelComponent
-  with PullRequestComponent
+    with PriorityComponent
-  with RepositoryComponent
+    with MilestoneComponent
-  with SshKeyComponent
+    with PullRequestComponent
-  with RepositoryWebHookComponent
+    with RepositoryComponent
-  with RepositoryWebHookEventComponent
+    with SshKeyComponent
-  with AccountWebHookComponent
+    with RepositoryWebHookComponent
-  with AccountWebHookEventComponent
+    with RepositoryWebHookEventComponent
-  with AccountFederationComponent
+    with AccountWebHookComponent
-  with ProtectedBranchComponent
+    with AccountWebHookEventComponent
-  with DeployKeyComponent
+    with AccountFederationComponent
-  with ReleaseComponent
+    with ProtectedBranchComponent
-  with ReleaseAssetComponent
+    with DeployKeyComponent
+    with ReleaseTagComponent
+    with ReleaseAssetComponent
+    with AccountExtraMailAddressComponent
 
 object Profile extends CoreProfile

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

@@ -8,27 +8,22 @@ trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
   class ProtectedBranches(tag: Tag) extends Table[ProtectedBranch](tag, "PROTECTED_BRANCH") with BranchTemplate {
     val statusCheckAdmin = column[Boolean]("STATUS_CHECK_ADMIN")
     def * = (userName, repositoryName, branch, statusCheckAdmin) <> (ProtectedBranch.tupled, ProtectedBranch.unapply)
-    def byPrimaryKey(userName: String, repositoryName: String, branch: String) = byBranch(userName, repositoryName, branch)
+    def byPrimaryKey(userName: String, repositoryName: String, branch: String) =
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], branch: Rep[String]) = byBranch(userName, repositoryName, branch)
+      byBranch(userName, repositoryName, branch)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], branch: Rep[String]) =
+      byBranch(userName, repositoryName, branch)
   }
 
   lazy val ProtectedBranchContexts = TableQuery[ProtectedBranchContexts]
-  class ProtectedBranchContexts(tag: Tag) extends Table[ProtectedBranchContext](tag, "PROTECTED_BRANCH_REQUIRE_CONTEXT") with BranchTemplate {
+  class ProtectedBranchContexts(tag: Tag)
+      extends Table[ProtectedBranchContext](tag, "PROTECTED_BRANCH_REQUIRE_CONTEXT")
+      with BranchTemplate {
     val context = column[String]("CONTEXT")
-    def * = (userName, repositoryName, branch, context) <> (ProtectedBranchContext.tupled, ProtectedBranchContext.unapply)
+    def * =
+      (userName, repositoryName, branch, context) <> (ProtectedBranchContext.tupled, ProtectedBranchContext.unapply)
   }
 }
 
+case class ProtectedBranch(userName: String, repositoryName: String, branch: String, statusCheckAdmin: Boolean)
 
-case class ProtectedBranch(
+case class ProtectedBranchContext(userName: String, repositoryName: String, branch: String, context: String)
-  userName: String,
-  repositoryName: String,
-  branch: String,
-  statusCheckAdmin: Boolean)
-
-
-case class ProtectedBranchContext(
-  userName: String,
-  repositoryName: String,
-  branch: String,
-  context: String)

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

@@ -12,10 +12,23 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
     val requestBranch = column[String]("REQUEST_BRANCH")
     val commitIdFrom = column[String]("COMMIT_ID_FROM")
     val commitIdTo = column[String]("COMMIT_ID_TO")
-    def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)
+    def * =
+      (
+        userName,
+        repositoryName,
+        issueId,
+        branch,
+        requestUserName,
+        requestRepositoryName,
+        requestBranch,
+        commitIdFrom,
+        commitIdTo
+      ) <> (PullRequest.tupled, PullRequest.unapply)
 
-    def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) =
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) = byIssue(userName, repositoryName, issueId)
+      byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) =
+      byIssue(userName, repositoryName, issueId)
   }
 }