Optimize Get-Contents API

02a0cfa0a6/io/src/main/scala/sbt/io/IO.scala (L611-L630)

```
/home/runner/work/gitbucket/gitbucket/build.sbt:205: warning: method jar in object IO is deprecated (since 1.3.2): Please specify whether to use a static timestamp
  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest)
     ^
```

.editorconfig

@@ -5,6 +5,10 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 2
+end_of_line = lf
+
+[*.md]
+trim_trailing_whitespace = false
 
 [*.java]
 trim_trailing_whitespace = true

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+* @takezoe
+
+build.sbt @xuwei-k
+project/* @xuwei-k

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # The guidelines for contributing
 
 - At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
-- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before staring your work.
+- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before starting your work.
 - You can edit the GitBucket documentation on Wiki if you have a GitHub account. When you find any mistakes or lacks in the documentation, please update it directly.
 - All your contributions are handled as [Apache Software License, Version 2.0](https://github.com/gitbucket/gitbucket/blob/master/LICENSE). When you create a pull request or update the documentation, we assume you agreed this clause.

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,8 @@
 ### Before submitting an issue to GitBucket I have first:
 
-- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
+- [ ] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
-- [] searched for similar already existing issue
+- [ ] searched for similar already existing issue
-- [] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki) 
+- [ ] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki)
 
 *(if you have performed all the above, remove the paragraph and continue describing the issue with template below)*
 
@@ -12,7 +12,7 @@
 **Deployment mode**: *explain here how you use GitBucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
 
 **Problem description**:
-- *be as explicit has you can*
+- *be as explicit as you can*
 - *describe the problem and its symptoms*
 - *explain how to reproduce*
 - *attach whatever information that can help understanding the context (screen capture, log files)*

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      matrix:
+        java: [8, 11, 17]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache
+      uses: actions/cache@v2.1.6
+      env:
+        cache-name: cache-sbt-libs
+      with:
+        path: |
+          ~/.ivy2/cache
+          ~/.sbt
+          ~/.cache/coursier/v1
+        key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }}
+    - name: Set up JDK
+      uses: actions/setup-java@v2
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: adopt
+    - name: Run tests
+      run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
+    - name: Scala 3
+      run: sbt '++ 3.0.1!' update # TODO
+    - name: Build executable
+      run: sbt executable
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: gitbucket-java${{ matrix.java }}-${{ github.sha }}
+        path: ./target/executable/gitbucket.*

.gitignore

@@ -10,6 +10,7 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+.bsp/
 
 # Scala-IDE specific
 .scala_dependencies
@@ -24,3 +25,12 @@ project/plugins/project/
 .idea/
 .idea_modules/
 *.iml
+
+# Metals specific
+.metals
+.bloop
+**/metals.sbt
+
+# Visual Studio Code specific
+.vscode
+

.scala-steward.conf

@@ -0,0 +1,7 @@
+updates.limit = 3
+
+updates.includeScala = true
+
+updates.pin = [
+  { groupId = "org.eclipse.jetty", version = "9." }
+]

.scalafmt.conf

@@ -0,0 +1,12 @@
+version = "1.5.1"
+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

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

CHANGELOG.md

@@ -1,13 +1,164 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-### 4.21.2 - 27 Jan 2018
+### 4.36.2 - 16 Aug 2021
+- Escape user name in avatar image tag
+
+### 4.36.1 - 22 Jul 2021
+- Bump gitbucket-gist-plugin to 4.21.0
+
+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link issues/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection
+
+### 4.35.3 - 14 Jan 2021
+- Fix a bug that Wiki page cannot be deleted
+- Fix a deployment issue on Tomcat
+
+### 4.35.2 - 30 Dec 2020
+- Upgrade gitbucket-notifications-plugin to 1.10.0
+- Upgrade oauth2-oidc-sdk to 8.29.1 to solve dependency issue
+
+### 4.35.1 - 29 Dec 2020
+- Fix database migration issue which happens if webhook is configured
+- Call push webhook when pull request is merged
+- Show commit status at commits tab of pull request
+
+### 4.35.0 - 25 Dec 2020
+- Editor and source viewer color theme
+- Auto completion for issues and pull requests
+- Upload image from clipboard
+- Close multiple issues by commit comment
+- Create pull request from online editor
+- Milestone overview
+- Commit status at various places
+- WebAPI coverage improvements
+
+## 4.34.0 - 26 Jul 2020
+- Enhancement admin settings UI
+   - File upload settings
+   - Restrict repository operations
+   - User-defined CSS
+   - Limit the repository list in the sidebar
+- Improve MariaDB support
+- Improve activity logging
+- CLI option to persist session on disk in the standalone mode
+- Web API updates
+  - Add [list commits API](https://developer.github.com/v3/repos/commits/#list-commits)
+- Bundled plugins updates
+  - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin) 4.18.0 -> 4.19.0
+  - [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin) 1.8.0 -> 1.9.0
+
+## 4.33.0 - 31 Dec 2019
+- All CLI options are configurable by environment variables
+- Folding pull request files
+- WebHook security options
+- Add assignee and assignees properties to some Web APIs' response
+
+## 4.32.0 - 7 Aug 2019
+- Bump to Scala 2.13.0 and Scalatra 2.7.0
+- Draft pull request
+- Drop network installation of plugins
+- Compare view works for commit id
+- Apply default priority to pull requests
+- Focus title after clicking issue / pull request edit button
+
+## 4.31.2 - 7 Apr 2019
+- Bug and security fix
+
+## 4.31.1 - 17 Mar 2019
+- Bug fix
+
+## 4.31.0 - 17 Mar 2019
+- Docker support in CI plugin
+- Verify GPG key signed commit
+- OAuth2 Token (sent as a parameter) authentication support and new APIs in Web API
+- OGP (Open Graph protocol) support
+- Username completion with avatars
+
+## 4.30.1 - 22 Dec 2018
+- Bug fix for several WebHooks and Web API
+
+## 4.30.0 - 15 Dec 2018
+- Automatic ChangeLog Summary generation for new Releases
+- A lot of GitBucket Web API updates to increase compatibility with the GitHub API.
+- Display of checkboxes in Markdown files in Git repositories
+- A new extension point for plugins: anonymousAccessiblePaths
+- Group support in the Gist Plugin
+- Allow redirection to the Release Page from the Activity Timeline Page
+
+## 4.29.0 - 29 Sep 2018
+- Official Docker image has been available
+- Enhance file edit and delete buttons of the repository viewer
+- Fix Patch button to generate patches for all files in the commit
+- Display confirmation dialog for Transfer Ownership and Garbage collection
+- Fix wrong url encoding in "Compare & pull request"
+
+## 4.28.0 - 1 Sep 2018
+- 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

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](https://github.com/gitbucket/gitbucket/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket/actions?query=workflow%3Abuild+branch%3Amaster) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13) [![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:
@@ -8,6 +8,8 @@ GitBucket is a Git web platform powered by Scala offering:
 - High extensibility by plugins
 - API compatibility with GitHub
 
+![GitBucket](https://gitbucket.github.io/img/screenshots/screenshot-repository_viewer.png)
+
 You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/).
 
 Features
@@ -22,8 +24,6 @@ The current version of GitBucket provides many features such as:
 - Account and group management with LDAP integration
 - a Plug-in system
 
-If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
-
 Installation
 --------
 GitBucket requires **Java8**. You have to install it, if it is not already installed.
@@ -31,19 +31,6 @@ GitBucket requires **Java8**. You have to install it, if it is not already insta
 1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
 2. Go to `http://[hostname]:8080/` and log in with ID: **root** / Pass: **root**.
 
-You can specify following options:
-
-- `--port=[NUMBER]`
-- `--prefix=[CONTEXTPATH]`
-- `--host=[HOSTNAME]`
-- `--gitbucket.home=[DATA_DIR]`
-- `--temp_dir=[TEMP_DIR]`
-- `--max_file_size=[MAX_FILE_SIZE]`
-
-`TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home.
-
-`MAX_FILE_SIZE` is the max file size for upload files.
-
 You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
 
 For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
@@ -61,19 +48,31 @@ GitBucket has a plug-in system that allows extra functionality. Officially the f
 
 You can find more plugins made by the community at [GitBucket community plugins](https://gitbucket-plugins.github.io/).
 
+Building and Development
+-----------
+If you want to try the development version of GitBucket, or want to contribute to the project, please see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/readme.md).
+It provides instructions on building from source and on setting up an IDE for debugging. 
+It also contains documentation of the core concepts used within the project.
+
 Support
 --------
 
 - If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
-- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
+- If you can't find same question and report, send it to our [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.36.x
 -------------
-### 4.22.0 - 3 Mar 2018
+### 4.36.2 - 16 Aug 2021
-- Pull request merge strategy settings
+- Escape user name in avatar image tag
-- Create repository with an empty commit
+
-- Improve database viewer
+### 4.36.1 - 22 Jul 2021
-- Update maven-repository-plugin
+- Bump gitbucket-gist-plugin to 4.21.0
+
+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link issues/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection
 
 See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -1,115 +1,123 @@
 import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
-import com.typesafe.sbt.pgp.PgpKeys._
+import com.jsuereth.sbtpgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.22.0"
+val GitBucketVersion = "4.36.2"
-val ScalatraVersion = "2.6.1"
+val ScalatraVersion = "2.8.2"
-val JettyVersion = "9.4.7.v20170914"
+val JettyVersion = "9.4.44.v20210927"
+val JgitVersion = "5.13.0.202109080827-r"
 
-lazy val root = (project in file(".")).enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin).settings(
+lazy val root = (project in file("."))
-
+  .enablePlugins(SbtTwirl, ScalatraPlugin)
-)
 
 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.4"
+scalaVersion := "2.13.7"
+
+scalafmtOnCompile := true
+
+coverageExcludedPackages := ".*\\.html\\..*"
 
 // dependency settings
 resolvers ++= Seq(
   Classpaths.typesafeReleases,
   Resolver.jcenterRepo,
-  "amateras" at "http://amateras.sourceforge.jp/mvn/",
+  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
-  "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.archive"     % "4.10.0.201712302008-r",
-  "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-forms"               % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"               % "3.5.3",
-  "commons-io"                      %  "commons-io"                   % "2.6",
-  "io.github.gitbucket"             %  "solidbase"                    % "1.0.2",
-  "io.github.gitbucket"             %  "markedj"                      % "1.0.15",
-  "org.apache.commons"              %  "commons-compress"             % "1.15",
-  "org.apache.commons"              %  "commons-email"                % "1.5",
-  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.4",
-  "org.apache.sshd"                 %  "apache-sshd"                  % "1.6.0" exclude("org.slf4j","slf4j-jdk14"),
-  "org.apache.tika"                 %  "tika-core"                    % "1.17",
-  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.10",
-  "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
-  "com.h2database"                  %  "h2"                           % "1.4.196",
-  "org.mariadb.jdbc"                %  "mariadb-java-client"          % "2.2.2",
-  "org.postgresql"                  %  "postgresql"                   % "42.1.4",
-  "ch.qos.logback"                  %  "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      %  "HikariCP"                     % "2.7.4",
-  "com.typesafe"                    %  "config"                       % "1.3.2",
-  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.8",
-  "fr.brouillard.oss.security.xhub" %  "xhub4j-core"                  % "1.0.0",
-  "com.github.bkromhout"            %  "java-diff-utils"              % "2.1.1",
-  "org.cache2k"                     %  "cache2k-all"                  % "1.0.1.Final",
-  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.1-akka-2.5.x" exclude("c3p0","c3p0"),
-  "net.coobird"                     %  "thumbnailator"                % "0.4.8",
-  "com.github.zafarkhaja"           %  "java-semver"                  % "0.9.0",
-  "com.nimbusds"                    %  "oauth2-oidc-sdk"              % "5.45",
-  "org.eclipse.jetty"               %  "jetty-webapp"                 % JettyVersion     % "provided",
-  "javax.servlet"                   %  "javax.servlet-api"            % "3.1.0"          % "provided",
-  "junit"                           %  "junit"                        % "4.12"           % "test",
-  "org.scalatra"                    %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.mockito"                     %  "mockito-core"                 % "2.13.0"         % "test",
-  "com.wix"                         %  "wix-embedded-mysql"           % "3.0.0"          % "test",
-  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.6"            % "test",
-  "net.i2p.crypto"                  % "eddsa"                         % "0.2.0",
-  "is.tagomor.woothee"              % "woothee-java"                  % "1.7.0"
 )
 
+libraryDependencies ++= Seq(
+  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
+  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
+  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.json4s"                      %% "json4s-jackson"              % "4.0.3" cross CrossVersion.for3Use2_13,
+  "commons-io"                      % "commons-io"                   % "2.11.0",
+  "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
+  "io.github.gitbucket"             % "markedj"                      % "1.0.16",
+  "org.apache.commons"              % "commons-compress"             % "1.21",
+  "org.apache.commons"              % "commons-email"                % "1.5",
+  "commons-net"                     % "commons-net"                  % "3.8.0",
+  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.13",
+  "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"                    % "2.1.0",
+  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
+  "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
+  "com.h2database"                  % "h2"                           % "1.4.199",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.4",
+  "org.postgresql"                  % "postgresql"                   % "42.3.1",
+  "ch.qos.logback"                  % "logback-classic"              % "1.2.6",
+  "com.zaxxer"                      % "HikariCP"                     % "4.0.3" exclude ("org.slf4j", "slf4j-api"),
+  "com.typesafe"                    % "config"                       % "1.4.1",
+  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
+  "io.github.java-diff-utils"       % "java-diff-utils"              % "4.11",
+  "org.cache2k"                     % "cache2k-all"                  % "1.6.0.Final",
+  "net.coobird"                     % "thumbnailator"                % "0.4.14",
+  "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
+  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "9.19",
+  "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
+  "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
+  "junit"                           % "junit"                        % "4.13.2" % "test",
+  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
+  "org.mockito"                     % "mockito-core"                 % "4.0.0" % "test",
+  "com.dimafeng"                    %% "testcontainers-scala"        % "0.39.11" % "test",
+  "org.testcontainers"              % "mysql"                        % "1.16.2" % "test",
+  "org.testcontainers"              % "postgresql"                   % "1.16.2" % "test",
+  "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
+  "is.tagomor.woothee"              % "woothee-java"                 % "1.11.0",
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.3.0",
+  "org.kohsuke"                     % "github-api"                   % "1.135" % "test"
+)
+
+libraryDependencies ~= {
+  _.map {
+    case x if x.name == "twirl-api" =>
+      x cross CrossVersion.for3Use2_13
+    case x =>
+      x
+  }
+}
+
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
+scalacOptions := Seq(
-javacOptions in compile ++= Seq("-target", "8", "-source", "8")
+  "-deprecation",
-javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
+  "-language:postfixOps",
+  "-opt:l:method",
+  "-feature",
+  "-Wunused:imports",
+  "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s"
+)
+compile / javacOptions ++= Seq("-target", "8", "-source", "8")
+Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml"
 
 // Test settings
 //testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
-javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
+Test / javaOptions += "-Dgitbucket.home=target/gitbucket_home_for_test"
-testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
+Test / testOptions += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
-fork in Test := true
+Test / fork := true
 
 // Packaging options
 packageOptions += Package.MainClass("JettyLauncher")
 
 // Assembly settings
-test in assembly := {}
+assembly / test := {}
-assemblyMergeStrategy in assembly := {
+assembly / assemblyMergeStrategy := {
   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
@@ -127,37 +135,42 @@ libraryDependencies ++= Seq(
   "org.eclipse.jetty" % "jetty-util"         % JettyVersion % "executable"
 )
 
+// Run package task before test to generate target/webapp for integration test
+Test / test := {
+  _root_.sbt.Keys.`package`.value
+  (Test / test).value
+}
+
 val executableKey = TaskKey[File]("executable")
 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 = (Compile / Keys.classDirectory).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 +178,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://github.com/" +
+          s"gitbucket/gitbucket-${pluginId}-plugin/releases/download/${pluginVersion}/gitbucket-${pluginId}-plugin-${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, None)
 
   // 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 +220,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>
@@ -250,7 +272,21 @@ pomExtra := (
   </developers>
 )
 
-licenseOverrides := {
+Test / testOptions ++= {
-  case DepModuleInfo("com.github.bkromhout", "java-diff-utils", _) =>
+  if (scala.util.Properties.isWin) {
-    LicenseInfo(LicenseCategory.Apache, "Apache-2.0", "http://www.apache.org/licenses/LICENSE-2.0")
+    Seq(
+      Tests.Exclude(
+        Set(
+          "gitbucket.core.GitBucketCoreModuleSpec"
+        )
+      )
+    )
+  } else {
+    Nil
+  }
 }
+
+Jetty / javaOptions ++= Seq(
+  "-Xdebug",
+  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+)

doc/authenticator.md

@@ -2,7 +2,7 @@ Authentication in Controller
 ========
 GitBucket provides many [authenticators](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/util/Authenticator.scala) to access controlling in the controller.
 
-For example, in the case of `RepositoryViwerController`,
+For example, in the case of `RepositoryViewerController`,
 it references three authenticators: `ReadableUsersAuthenticator`, `ReferrerAuthenticator` and `CollaboratorsAuthenticator`.
 
 ```scala
@@ -19,13 +19,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ...
 ```
 
-Authenticators provides a method to add guard to actions in the controller:
+Authenticators provide a method to add guard to actions in the controller:
 
 - `ReadableUsersAuthenticator` provides `readableUsersOnly` method
 - `ReferrerAuthenticator` provides `referrersOnly` method
 - `CollaboratorsAuthenticator` provides `collaboratorsOnly` method
 
-These methods are available in each actions as below:
+These methods are available in each action as below:
 
 ```scala
 // Allows only the repository owner (or manager for group repository) and administrators.
@@ -38,7 +38,7 @@ get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
   ...
 })
 
-// Allows only signed in users which can access the repository.
+// Allows only signed-in users which can access the repository.
 post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
   ...
 })
@@ -50,11 +50,11 @@ Currently, GitBucket provides below authenticators:
 |--------------------------|-----------------|--------------------------------------------------------------------------------------|
 |OneselfAuthenticator      |oneselfOnly      |Allows only oneself and administrators.                                               |
 |OwnerAuthenticator        |ownerOnly        |Allows only the repository owner and administrators.                                  |
-|UsersAuthenticator        |usersOnly        |Allows only signed in users.                                                          |
+|UsersAuthenticator        |usersOnly        |Allows only signed-in users.                                                          |
 |AdminAuthenticator        |adminOnly        |Allows only administrators.                                                           |
 |CollaboratorsAuthenticator|collaboratorsOnly|Allows only collaborators and administrators.                                         |
 |ReferrerAuthenticator     |referrersOnly    |Allows only the repository owner (or manager for group repository) and administrators.|
-|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed in users which can access the repository.                          |
+|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed-in users which can access the repository.                          |
 |GroupManagerAuthenticator |managersOnly     |Allows only the group managers.                                                       |
 
-Of course, if you make a new plugin, you can define a your own authenticator according to requirement in your plugin.
+Of course, if you make a new plugin, you can implement your own authenticator according to requirement in your plugin.

doc/auto_update.md

@@ -2,7 +2,7 @@ Automatic Schema Updating
 ========
 GitBucket updates database schema automatically using [Solidbase](https://github.com/gitbucket/solidbase) in the first run after the upgrading.
 
-To release a new version of GitBucket, add the version definition to the [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.
+To release a new version of GitBucket, add the version definition to [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.
 
 ```scala
 object GitBucketCoreModule extends Module("gitbucket-core",
@@ -17,7 +17,7 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```
 
-Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filenane defined in `GitBucketCoreModule`.
+Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filename defined in `GitBucketCoreModule`.
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -31,9 +31,9 @@ Next, add a XML file which updates database schema into [/src/main/resources/upd
 </changeSet>
 ```
 
-Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version differs from the actual version, it executes differences between the stored version and the actual version.
+Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version different from the actual version, it executes differences between the stored version and the actual version.
 
-We can add the SQL file instead of the XML file using `SqlMigration`. It try to load a SQL file from classpath as following order:
+We can add the SQL file instead of the XML file using `SqlMigration`. It tries to load a SQL file from classpath in the following order:
 
 1. Specified path (if specified)
 2. `${moduleId}_${version}_${database}.sql`
@@ -51,4 +51,4 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```
 
-See more details [README of Solidbase](https://github.com/gitbucket/solidbase).
+See more details at [README of Solidbase](https://github.com/gitbucket/solidbase).

doc/build.md

@@ -0,0 +1,61 @@
+How to build and run from the source tree
+========
+
+First of all, Install [sbt](http://www.scala-sbt.org/index.html).
+
+```shell
+$ brew install sbt
+```
+
+Run for Development
+--------
+
+If you want to test GitBucket, type the following command in the root directory of the source tree.
+
+```shell
+$ sbt ~jetty:start
+```
+
+Then access `http://localhost:8080/` in your browser. The default administrator account is `root` and password is `root`.
+
+Source code modifications are detected and a reloading happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`.
+
+Build war file
+--------
+
+To build a war file, run the following command:
+
+```shell
+$ sbt package
+```
+
+`gitbucket_2.13-x.x.x.war` is generated into `target/scala-2.13`.
+
+To build an executable war file, run
+
+```shell
+$ sbt executable
+```
+
+at the top of the source tree. It generates executable `gitbucket.war` into `target/executable`. We release this war file as release artifact.
+
+Run tests spec
+---------
+Before running tests, you need to install docker.
+
+```shell
+$ brew cask install docker       # Install Docker
+$ open /Applications/Docker.app  # Start Docker
+```
+
+To run the full series of tests, run the following command:
+
+```shell
+$ sbt test
+```
+
+If you don't have docker, you can skip docker tests which require docker as follows:
+
+```shell
+$ sbt "testOnly * -- -l ExternalDBTest"
+```

doc/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/debug.md

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

doc/directory.md

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

doc/how_to_run.md

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

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/licenses.md

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

doc/readme.md

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

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

doc/validation.md

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

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.5.5

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,11 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.13")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt"       % "2.4.3")
-addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.5")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"          % "1.5.1")
-//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly"       % "1.1.0")
-//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"       % "1.0.4")
-addSbtPlugin("org.scalatra.sbt"     % "sbt-scalatra"      % "1.0.1")
+addSbtPlugin("com.github.sbt"   % "sbt-pgp"            % "2.1.2")
-addSbtPlugin("com.jsuereth"         % "sbt-pgp"           % "1.1.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
-addSbtCoursier
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"      % "1.9.2")
-addSbtPlugin("com.typesafe.sbt"     % "sbt-license-report" % "1.2.0")
+
+addDependencyTreePlugin

project/project/plugins.sbt

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

src/main/java/JettyLauncher.java

@@ -1,46 +1,102 @@
-import org.eclipse.jetty.server.ConnectionFactory;
+import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.SecuredRedirectHandler;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
+import org.eclipse.jetty.server.session.DefaultSessionCache;
+import org.eclipse.jetty.server.session.FileSessionDataStore;
+import org.eclipse.jetty.server.session.SessionCache;
+import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
+import java.net.InetAddress;
 import java.net.URL;
-import java.net.InetSocketAddress;
 import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toSet;
 
 public class JettyLauncher {
+
+    private interface Defaults {
+
+        String CONNECTORS = "http";
+        String HOST = "0.0.0.0";
+
+        int HTTP_PORT = 8080;
+        int HTTPS_PORT = 8443;
+
+        boolean REDIRECT_HTTPS = false;
+    }
+
+    private interface Connectors {
+
+        String HTTP = "http";
+        String HTTPS = "https";
+    }
+
     public static void main(String[] args) throws Exception {
         System.setProperty("java.awt.headless", "true");
 
-        String host = null;
+        String connectors = getEnvironmentVariable("gitbucket.connectors");
-        int port = 8080;
+        String host = getEnvironmentVariable("gitbucket.host");
-        InetSocketAddress address = null;
+        String port = getEnvironmentVariable("gitbucket.port");
-        String contextPath = "/";
+        String securePort = getEnvironmentVariable("gitbucket.securePort");
-        String tmpDirPath="";
+        String keyStorePath = getEnvironmentVariable("gitbucket.keyStorePath");
-        boolean forceHttps = false;
+        String keyStorePassword = getEnvironmentVariable("gitbucket.keyStorePassword");
+        String keyManagerPassword = getEnvironmentVariable("gitbucket.keyManagerPassword");
+        String redirectHttps = getEnvironmentVariable("gitbucket.redirectHttps");
+        String contextPath = getEnvironmentVariable("gitbucket.prefix");
+        String tmpDirPath = getEnvironmentVariable("gitbucket.tempDir");
+        boolean saveSessions = false;
 
         for(String arg: args) {
+            if(arg.equals("--save_sessions")) {
+                saveSessions = true;
+            }
             if(arg.startsWith("--") && arg.contains("=")) {
-                String[] dim = arg.split("=");
+                String[] dim = arg.split("=", 2);
-                if(dim.length >= 2) {
+                if(dim.length == 2) {
                     switch (dim[0]) {
+                        case "--connectors":
+                            connectors = dim[1];
+                            break;
                         case "--host":
                             host = dim[1];
                             break;
                         case "--port":
-                            port = Integer.parseInt(dim[1]);
+                            port = dim[1];
+                            break;
+                        case "--secure_port":
+                            securePort = dim[1];
+                            break;
+                        case "--key_store_path":
+                            keyStorePath = dim[1];
+                            break;
+                        case "--key_store_password":
+                            keyStorePassword = dim[1];
+                            break;
+                        case "--key_manager_password":
+                            keyManagerPassword = dim[1];
+                            break;
+                        case "--redirect_https":
+                            redirectHttps = dim[1];
                             break;
                         case "--prefix":
                             contextPath = dim[1];
-                            if (!contextPath.startsWith("/")) {
-                                contextPath = "/" + contextPath;
-                            }
-                            break;
-                        case "--max_file_size":
-                            System.setProperty("gitbucket.maxFileSize", dim[1]);
                             break;
                         case "--gitbucket.home":
                             System.setProperty("gitbucket.home", dim[1]);
@@ -51,47 +107,92 @@ public class JettyLauncher {
                         case "--plugin_dir":
                             System.setProperty("gitbucket.pluginDir", dim[1]);
                             break;
-                        case "--validate_password":
-                            System.setProperty("gitbucket.validate.password", dim[1]);
-                            break;
                     }
                 }
             }
         }
 
-        if(host != null) {
+        if (contextPath != null && !contextPath.startsWith("/")) {
-            address = new InetSocketAddress(host, port);
+            contextPath = "/" + contextPath;
-        } else {
-            address = new InetSocketAddress(port);
         }
 
-        Server server = new Server(address);
+        final String hostName = InetAddress.getByName(fallback(host, Defaults.HOST)).getHostName();
 
-//        SelectChannelConnector connector = new SelectChannelConnector();
+        final Server server = new Server();
-//        if(host != null) {
-//            connector.setHost(host);
-//        }
-//        connector.setMaxIdleTime(1000 * 60 * 60);
-//        connector.setSoLingerTime(-1);
-//        connector.setPort(port);
-//        server.addConnector(connector);
 
-        // Disabling Server header
+        final Set<String> connectorsSet = Stream.of(fallback(connectors, Defaults.CONNECTORS)
-        for (Connector connector : server.getConnectors()) {
+            .toLowerCase().split(",")).map(String::trim).collect(toSet());
-            for (ConnectionFactory factory : connector.getConnectionFactories()) {
+
-                if (factory instanceof HttpConnectionFactory) {
+        final List<ServerConnector> connectorInstances = new ArrayList<>();
-                    ((HttpConnectionFactory) factory).getHttpConfiguration().setSendServerVersion(false);
+
-                }
+        final HttpConfiguration httpConfig = new HttpConfiguration();
-            }
+        httpConfig.setSendServerVersion(false);
+        if (connectorsSet.contains(Connectors.HTTPS)) {
+            httpConfig.setSecurePort(fallback(securePort, Defaults.HTTPS_PORT, Integer::parseInt));
         }
 
+        if (connectorsSet.contains(Connectors.HTTP)) {
+            final ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
+            connector.setHost(hostName);
+            connector.setPort(fallback(port, Defaults.HTTP_PORT, Integer::parseInt));
+
+            connectorInstances.add(connector);
+        }
+
+        if (connectorsSet.contains(Connectors.HTTPS)) {
+            final SslContextFactory sslContextFactory = new SslContextFactory.Server();
+
+            sslContextFactory.setKeyStorePath(requireNonNull(keyStorePath,
+                "You must specify a path to an SSL keystore via the --key_store_path command line argument" +
+                    " or GITBUCKET_KEYSTOREPATH environment variable."));
+
+            sslContextFactory.setKeyStorePassword(requireNonNull(keyStorePassword,
+                "You must specify a an SSL keystore password via the --key_store_password argument" +
+                    " or GITBUCKET_KEYSTOREPASSWORD environment variable."));
+
+            sslContextFactory.setKeyManagerPassword(requireNonNull(keyManagerPassword,
+                "You must specify a key manager password via the --key_manager_password' argument" +
+                    " or GITBUCKET_KEYMANAGERPASSWORD environment variable."));
+
+            final HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
+            httpsConfig.addCustomizer(new SecureRequestCustomizer());
+
+            final ServerConnector connector = new ServerConnector(server,
+                new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
+                new HttpConnectionFactory(httpsConfig));
+
+            connector.setHost(hostName);
+            connector.setPort(fallback(securePort, Defaults.HTTPS_PORT, Integer::parseInt));
+
+            connectorInstances.add(connector);
+        }
+
+        require(!connectorInstances.isEmpty(),
+            "No server connectors could be configured, please check your --connectors command line argument" +
+                " or GITBUCKET_CONNECTORS environment variable.");
+
+        server.setConnectors(connectorInstances.toArray(new ServerConnector[0]));
+
         WebAppContext context = new WebAppContext();
 
+        if(saveSessions) {
+            File sessDir = new File(getGitBucketHome(), "sessions");
+            if(!sessDir.exists()){
+                mkdir(sessDir);
+            }
+            SessionHandler sessions = context.getSessionHandler();
+            SessionCache cache = new DefaultSessionCache(sessions);
+            FileSessionDataStore fsds = new FileSessionDataStore();
+            fsds.setStoreDir(sessDir);
+            cache.setSessionDataStore(fsds);
+            sessions.setSessionCache(cache);
+        }
+
         File tmpDir;
-        if(tmpDirPath.equals("")){
+        if(tmpDirPath == null || tmpDirPath.equals("")){
             tmpDir = new File(getGitBucketHome(), "tmp");
             if(!tmpDir.exists()){
-                tmpDir.mkdirs();
+                mkdir(tmpDir);
             }
         } else {
             tmpDir = new File(tmpDirPath);
@@ -111,17 +212,20 @@ public class JettyLauncher {
         ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
         URL location = domain.getCodeSource().getLocation();
 
-        context.setContextPath(contextPath);
+        context.setContextPath(contextPath == null ? "" : contextPath);
         context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
         context.setServer(server);
         context.setWar(location.toExternalForm());
-        if (forceHttps) {
+
-            context.setInitParameter("org.scalatra.ForceHttps", "true");
+        final HandlerList handlers = new HandlerList();
+
+        if (fallback(redirectHttps, Defaults.REDIRECT_HTTPS, Boolean::parseBoolean)) {
+            handlers.addHandler(new SecuredRedirectHandler());
         }
 
-        Handler handler = addStatisticsHandler(context);
+        handlers.addHandler(addStatisticsHandler(context));
 
-        server.setHandler(handler);
+        server.setHandler(handlers);
         server.setStopAtShutdown(true);
         server.setStopTimeout(7_000);
         server.start();
@@ -140,6 +244,40 @@ public class JettyLauncher {
         return new File(System.getProperty("user.home"), ".gitbucket");
     }
 
+    private static String getEnvironmentVariable(String key){
+        String value =  System.getenv(key.toUpperCase().replace('.', '_'));
+        if (value != null && value.length() == 0){
+            return null;
+        } else {
+            return value;
+        }
+    }
+
+    private static <T, R> T fallback(R value, T defaultValue, Function<R, T> converter) {
+        return value == null ? defaultValue : converter.apply(value);
+    }
+
+    private static <T> T fallback(T value, T defaultValue) {
+        return fallback(value, defaultValue, identity());
+    }
+
+    private static void require(boolean condition, String message) {
+        if (!condition) {
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    private static <T> T requireNonNull(T value, String message) {
+        require(value != null, message);
+        return value;
+    }
+
+    private static void mkdir(File dir) {
+        if (!dir.mkdirs()) {
+            throw new RuntimeException("Unable to create directory: " + dir);
+        }
+    }
+
     private static Handler addStatisticsHandler(Handler handler) {
         // The graceful shutdown is implemented via the statistics handler.
         // See the following: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420142

src/main/java/gitbucket/core/util/PatchUtil.java

@@ -20,15 +20,15 @@ public class PatchUtil {
     public static String apply(String source, String patch, FileHeader fh)
             throws IOException, PatchApplyException {
         RawText rt = new RawText(source.getBytes("UTF-8"));
-        List<String> oldLines = new ArrayList<String>(rt.size());
+        List<String> oldLines = new ArrayList<>(rt.size());
         for (int i = 0; i < rt.size(); i++)
             oldLines.add(rt.getString(i));
-        List<String> newLines = new ArrayList<String>(oldLines);
+        List<String> newLines = new ArrayList<>(oldLines);
         for (HunkHeader hh : fh.getHunks()) {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             out.write(patch.getBytes("UTF-8"), hh.getStartOffset(), hh.getEndOffset() - hh.getStartOffset());
             RawText hrt = new RawText(out.toByteArray());
-            List<String> hunkLines = new ArrayList<String>(hrt.size());
+            List<String> hunkLines = new ArrayList<>(hrt.size());
             for (int i = 0; i < hrt.size(); i++)
                 hunkLines.add(hrt.getString(i));
             int pos = 0;

src/main/resources/bundle-plugins.txt

@@ -0,0 +1,4 @@
+notifications:1.10.0
+gist:4.21.0
+emoji:4.6.0
+pages:1.10.0

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

@@ -60,13 +60,12 @@
   <!-- ACCESS_TOKEN -->
   <!--================================================================================================-->
   <createTable tableName="ACCESS_TOKEN">
-    <column name="ACCESS_TOKEN_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="ACCESS_TOKEN_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_ACCESS_TOKEN_PK" primaryKey="true" />
     <column name="TOKEN_HASH" type="varchar(40)" nullable="false"/>
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="NOTE" type="text" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ACCESS_TOKEN_PK" tableName="ACCESS_TOKEN" columnNames="ACCESS_TOKEN_ID"/>
   <addUniqueConstraint constraintName="IDX_ACCESS_TOKEN_TOKEN_HASH" tableName="ACCESS_TOKEN" columnNames="TOKEN_HASH"/>
   <addForeignKeyConstraint constraintName="IDX_ACCESS_TOKEN_FK0" baseTableName="ACCESS_TOKEN" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
 
@@ -74,7 +73,7 @@
   <!-- ACTIVITY -->
   <!--================================================================================================-->
   <createTable tableName="ACTIVITY">
-    <column name="ACTIVITY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="ACTIVITY_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_ACTIVITY_PK" primaryKey="true"/>
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="ACTIVITY_USER_NAME" type="varchar(100)" nullable="false"/>
@@ -84,7 +83,6 @@
     <column name="ACTIVITY_DATE" type="datetime" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ACTIVITY_PK" tableName="ACTIVITY" columnNames="ACTIVITY_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ACTIVITY_FK1" baseTableName="ACTIVITY" baseColumnNames="ACTIVITY_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
   <addForeignKeyConstraint constraintName="IDX_ACTIVITY_FK0" baseTableName="ACTIVITY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
 
@@ -108,7 +106,7 @@
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="COMMIT_ID" type="varchar(100)" nullable="false"/>
-    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_COMMIT_COMMENT_PK" primaryKey="true" />
     <column name="COMMENTED_USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="CONTENT" type="text" nullable="false"/>
     <column name="FILE_NAME" type="varchar(260)" nullable="true"/>
@@ -119,14 +117,13 @@
     <column name="ISSUE_ID" type="int" nullable="true"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_COMMIT_COMMENT_PK" tableName="COMMIT_COMMENT" columnNames="COMMENT_ID"/>
   <addForeignKeyConstraint constraintName="IDX_COMMIT_COMMENT_FK0" baseTableName="COMMIT_COMMENT" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
 
   <!--================================================================================================-->
   <!-- COMMIT_STATUS -->
   <!--================================================================================================-->
   <createTable tableName="COMMIT_STATUS">
-    <column name="COMMIT_STATUS_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="COMMIT_STATUS_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_COMMIT_STATUS_PK" primaryKey="true" />
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="COMMIT_ID" type="varchar(40)" nullable="false"/>
@@ -139,7 +136,6 @@
     <column name="UPDATED_DATE" type="datetime" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_COMMIT_STATUS_PK" tableName="COMMIT_STATUS" columnNames="COMMIT_STATUS_ID"/>
   <addUniqueConstraint constraintName="IDX_COMMIT_STATUS_1" tableName="COMMIT_STATUS" columnNames="USER_NAME, REPOSITORY_NAME, COMMIT_ID, CONTEXT"/>
   <addForeignKeyConstraint constraintName="IDX_COMMIT_STATUS_FK3" baseTableName="COMMIT_STATUS" baseColumnNames="CREATOR" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
   <addForeignKeyConstraint constraintName="IDX_COMMIT_STATUS_FK2" baseTableName="COMMIT_STATUS" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
@@ -206,7 +202,7 @@
     <column name="PULL_REQUEST" type="boolean" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="ISSUE_ID, USER_NAME, REPOSITORY_NAME"/>
+  <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK0" baseTableName="ISSUE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK2" baseTableName="ISSUE" baseColumnNames="MILESTONE_ID" referencedTableName="MILESTONE" referencedColumnNames="MILESTONE_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK1" baseTableName="ISSUE" baseColumnNames="OPENED_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
@@ -218,7 +214,7 @@
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_ISSUE_COMMENT_PK" primaryKey="true" />
     <column name="ACTION" type="varchar(20)" nullable="false"/>
     <column name="COMMENTED_USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="CONTENT" type="text" nullable="false"/>
@@ -226,7 +222,6 @@
     <column name="UPDATED_DATE" type="datetime" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ISSUE_COMMENT_PK" tableName="ISSUE_COMMENT" columnNames="COMMENT_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_COMMENT_FK0" baseTableName="ISSUE_COMMENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
 
   <!--================================================================================================-->
@@ -348,4 +343,4 @@
   <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK" tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT"/>
   <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0" baseTableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" baseColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" referencedTableName="PROTECTED_BRANCH" referencedColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" onDelete="CASCADE" onUpdate="CASCADE"/>
 
-</changeSet>
+</changeSet>

src/main/resources/update/gitbucket-core_4.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/resources/update/gitbucket-core_4.31.xml

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="PULL_REQUEST">
+    <column name="IS_DRAFT" type="boolean" nullable="false" defaultValueBoolean="false" />
+  </addColumn>
+</changeSet>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <dropTable tableName="ACTIVITY" />
+</changeSet>

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <!--================================================================================================-->
+  <!-- WEB_HOOK -->
+  <!--================================================================================================-->
+  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT"/>
+  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK"/>
+  <dropPrimaryKey constraintName="IDX_WEB_HOOK_PK" tableName="WEB_HOOK"/>
+  
+  <createTable tableName="WEB_HOOK_2">
+    <column name="HOOK_ID" type="int" nullable="true" autoIncrement="true" unique="false" primaryKeyName="IDX_WEB_HOOK_PK" primaryKey="true" />
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="TOKEN" type="varchar(100)" nullable="true"/>
+    <column name="CTYPE" type="varchar(10)" nullable="true"/>
+  </createTable>
+
+  <sql>
+    INSERT INTO WEB_HOOK_2 (USER_NAME, REPOSITORY_NAME, URL, TOKEN, CTYPE) SELECT USER_NAME, REPOSITORY_NAME, URL, TOKEN, CTYPE FROM WEB_HOOK
+  </sql>
+
+  <renameTable newTableName="WEB_HOOK_BK" oldTableName="WEB_HOOK"/>
+  <renameTable newTableName="WEB_HOOK" oldTableName="WEB_HOOK_2"/>
+
+  <addUniqueConstraint constraintName="IDX_WEB_HOOK_1" tableName="WEB_HOOK" columnNames="USER_NAME, REPOSITORY_NAME, URL"/>
+  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, URL" referencedTableName="WEB_HOOK" referencedColumnNames="USER_NAME, REPOSITORY_NAME, URL" onDelete="CASCADE" onUpdate="CASCADE"/>
+
+  <!--================================================================================================-->
+  <!-- ACCOUNT_PREFERENCE -->
+  <!--================================================================================================-->
+  <createTable tableName="ACCOUNT_PREFERENCE">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="HIGHLIGHTER_THEME" type="varchar(100)" nullable="false" defaultValue="prettify"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_ACCOUNT_PREFERENCE_PK" tableName="ACCOUNT_PREFERENCE" columnNames="USER_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_PREFERENCE_FK0" baseTableName="ACCOUNT_PREFERENCE" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
+</changeSet>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="REPOSITORY">
+    <column name="SAFE_MODE" type="boolean" nullable="false" defaultValue="true"/>
+  </addColumn>
+</changeSet>

src/main/scala/ScalatraBootstrap.scala

@@ -1,36 +1,41 @@
-
 import java.util.EnumSet
 import javax.servlet._
 
 import gitbucket.core.controller.{ReleaseController, _}
-import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
 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
+    // Register TransactionFilter 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 +56,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

@@ -1,60 +1,123 @@
 package gitbucket.core
 
-import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
+import java.io.FileOutputStream
-import io.github.gitbucket.solidbase.model.{Version, Module}
+import java.nio.charset.StandardCharsets
+import java.sql.Connection
+import java.util.UUID
 
-object GitBucketCoreModule extends Module("gitbucket-core",
+import gitbucket.core.model.Activity
-  new Version("4.0.0",
+import gitbucket.core.util.Directory.ActivityLog
-    new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
+import gitbucket.core.util.JDBCUtil
-    new SqlMigration("update/gitbucket-core_4.0.sql")
+import io.github.gitbucket.solidbase.Solidbase
-  ),
+import io.github.gitbucket.solidbase.migration.{LiquibaseMigration, Migration, SqlMigration}
-  new Version("4.1.0"),
+import io.github.gitbucket.solidbase.model.{Module, Version}
-  new Version("4.2.0",
+import org.json4s.{Formats, NoTypeHints}
-    new LiquibaseMigration("update/gitbucket-core_4.2.xml")
+import org.json4s.jackson.Serialization
-  ),
+import org.json4s.jackson.Serialization.write
-  new Version("4.2.1"),
+
-  new Version("4.3.0"),
+import scala.util.Using
-  new Version("4.4.0"),
+
-  new Version("4.5.0"),
+object GitBucketCoreModule
-  new Version("4.6.0",
+    extends Module(
-    new LiquibaseMigration("update/gitbucket-core_4.6.xml")
+      "gitbucket-core",
-  ),
+      new Version(
-  new Version("4.7.0",
+        "4.0.0",
-    new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
+        new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
-    new SqlMigration("update/gitbucket-core_4.7.sql")
+        new SqlMigration("update/gitbucket-core_4.0.sql")
-  ),
+      ),
-  new Version("4.7.1"),
+      new Version("4.1.0"),
-  new Version("4.8"),
+      new Version("4.2.0", new LiquibaseMigration("update/gitbucket-core_4.2.xml")),
-  new Version("4.9.0",
+      new Version("4.2.1"),
-    new LiquibaseMigration("update/gitbucket-core_4.9.xml")
+      new Version("4.3.0"),
-  ),
+      new Version("4.4.0"),
-  new Version("4.10.0"),
+      new Version("4.5.0"),
-  new Version("4.11.0",
+      new Version("4.6.0", new LiquibaseMigration("update/gitbucket-core_4.6.xml")),
-    new LiquibaseMigration("update/gitbucket-core_4.11.xml")
+      new Version(
-  ),
+        "4.7.0",
-  new Version("4.12.0"),
+        new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
-  new Version("4.12.1"),
+        new SqlMigration("update/gitbucket-core_4.7.sql")
-  new Version("4.13.0"),
+      ),
-  new Version("4.14.0",
+      new Version("4.7.1"),
-    new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
+      new Version("4.8"),
-    new SqlMigration("update/gitbucket-core_4.14.sql")
+      new Version("4.9.0", new LiquibaseMigration("update/gitbucket-core_4.9.xml")),
-  ),
+      new Version("4.10.0"),
-  new Version("4.14.1"),
+      new Version("4.11.0", new LiquibaseMigration("update/gitbucket-core_4.11.xml")),
-  new Version("4.15.0"),
+      new Version("4.12.0"),
-  new Version("4.16.0"),
+      new Version("4.12.1"),
-  new Version("4.17.0"),
+      new Version("4.13.0"),
-  new Version("4.18.0"),
+      new Version(
-  new Version("4.19.0"),
+        "4.14.0",
-  new Version("4.19.1"),
+        new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
-  new Version("4.19.2"),
+        new SqlMigration("update/gitbucket-core_4.14.sql")
-  new Version("4.19.3"),
+      ),
-  new Version("4.20.0"),
+      new Version("4.14.1"),
-  new Version("4.21.0",
+      new Version("4.15.0"),
-    new LiquibaseMigration("update/gitbucket-core_4.21.xml")
+      new Version("4.16.0"),
-  ),
+      new Version("4.17.0"),
-  new Version("4.21.1"),
+      new Version("4.18.0"),
-  new Version("4.21.2"),
+      new Version("4.19.0"),
-  new Version("4.22.0",
+      new Version("4.19.1"),
-    new LiquibaseMigration("update/gitbucket-core_4.22.xml")
+      new Version("4.19.2"),
-  )
+      new Version("4.19.3"),
-)
+      new Version("4.20.0"),
+      new Version("4.21.0", new LiquibaseMigration("update/gitbucket-core_4.21.xml")),
+      new Version("4.21.1"),
+      new Version("4.21.2"),
+      new Version("4.22.0", new LiquibaseMigration("update/gitbucket-core_4.22.xml")),
+      new Version("4.23.0", new LiquibaseMigration("update/gitbucket-core_4.23.xml")),
+      new Version("4.23.1"),
+      new Version("4.24.0", new LiquibaseMigration("update/gitbucket-core_4.24.xml")),
+      new Version("4.24.1"),
+      new Version("4.25.0", new LiquibaseMigration("update/gitbucket-core_4.25.xml")),
+      new Version("4.26.0"),
+      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"),
+      new Version("4.30.1"),
+      new Version("4.31.0", new LiquibaseMigration("update/gitbucket-core_4.31.xml")),
+      new Version("4.31.1"),
+      new Version("4.31.2"),
+      new Version("4.32.0", new LiquibaseMigration("update/gitbucket-core_4.32.xml")),
+      new Version("4.33.0"),
+      new Version(
+        "4.34.0",
+        new Migration() {
+          override def migrate(moduleId: String, version: String, context: java.util.Map[String, AnyRef]): Unit = {
+            implicit val formats: Formats = Serialization.formats(NoTypeHints)
+            import JDBCUtil._
+
+            val conn = context.get(Solidbase.CONNECTION).asInstanceOf[Connection]
+            val list = conn.select("SELECT * FROM ACTIVITY ORDER BY ACTIVITY_ID") {
+              rs =>
+                Activity(
+                  activityId = UUID.randomUUID().toString,
+                  userName = rs.getString("USER_NAME"),
+                  repositoryName = rs.getString("REPOSITORY_NAME"),
+                  activityUserName = rs.getString("ACTIVITY_USER_NAME"),
+                  activityType = rs.getString("ACTIVITY_TYPE"),
+                  message = rs.getString("MESSAGE"),
+                  additionalInfo = {
+                    val additionalInfo = rs.getString("ADDITIONAL_INFO")
+                    if (rs.wasNull()) None else Some(additionalInfo)
+                  },
+                  activityDate = rs.getTimestamp("ACTIVITY_DATE")
+                )
+            }
+            Using.resource(new FileOutputStream(ActivityLog, true)) { out =>
+              list.foreach { activity =>
+                out.write((write(activity) + "\n").getBytes(StandardCharsets.UTF_8))
+              }
+            }
+          }
+        },
+        new LiquibaseMigration("update/gitbucket-core_4.34.xml")
+      ),
+      new Version("4.35.0", new LiquibaseMigration("update/gitbucket-core_4.35.xml")),
+      new Version("4.35.1"),
+      new Version("4.35.2"),
+      new Version("4.35.3"),
+      new Version("4.36.0", new LiquibaseMigration("update/gitbucket-core_4.36.xml")),
+      new Version("4.36.1"),
+      new Version("4.36.2")
+    )

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 {
+  val _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)
@@ -21,3 +22,12 @@ case class ApiBranchForList(
   name: String,
   commit: ApiBranchCommit
 )
+
+/**
+ * https://docs.github.com/en/rest/reference/repos#list-branches-for-head-commit
+ */
+case class ApiBranchForHeadCommit(
+  name: String,
+  commit: ApiBranchCommit,
+  `protected`: Boolean
+)

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

@@ -4,43 +4,78 @@ 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(
+  url: Option[ApiPath], // for output
+  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)))
+      url = Some(
-  val statusNone = Status(Off, Seq.empty)
+        ApiPath(
-  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
+          s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection"
+        )
+      ),
+      enabled = info.enabled,
+      required_status_checks = Some(
+        Status(
+          Some(
+            ApiPath(
+              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks"
+            )
+          ),
+          EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators),
+          info.contexts,
+          Some(
+            ApiPath(
+              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks/contexts"
+            )
+          )
+        )
+      )
+    )
+  val statusNone = Status(None, Off, Seq.empty, None)
+  case class Status(
+    url: Option[ApiPath], // for output
+    enforcement_level: EnforcementLevel,
+    contexts: Seq[String],
+    contexts_url: Option[ApiPath] // for output
+  )
   sealed class EnforcementLevel(val name: String)
   case object Off extends EnforcementLevel("off")
   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: CustomSerializer[EnforcementLevel] = 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,31 @@ 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)
-    ApiPath(s"/${repositoryName.fullName}/commit/${id}")
+    extends FieldSerializable {
-  }else{
+  val url = ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
-    ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/commit/${id}")
-  }
-  val html_url = if(urlIsHtmlUrl){
-    None
-  }else{
-    Some(ApiPath(s"/${repositoryName.fullName}/commit/${id}"))
-  }
 }
 
-object ApiCommit{
+object ApiCommit {
-  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo, urlIsHtmlUrl: Boolean = false): ApiCommit = {
+  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = {
     val diffs = JGitUtil.getDiffs(git, None, commit.id, false, false)
     ApiCommit(
-      id        = commit.id,
+      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)
+    )(repositoryName)
   }
-  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}")
@@ -93,7 +98,7 @@ object ApiCommits {
       url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
       sha = commitInfo.id,
       html_url = ApiPath(s"${repositoryName.fullName}/commit/${commitInfo.id}"),
-      comment_url = ApiPath(""),
+      comment_url = ApiPath(""), // TODO no API for commit comment
       commit = Commit(
         url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
         author = ApiPersonIdent.author(commitInfo),

src/main/scala/gitbucket/core/api/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.id.getName,
+              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,51 @@ case class ApiIssue(
   number: Int,
   title: String,
   user: ApiUser,
-  // labels,
+  assignee: Option[ApiUser],
+  labels: List[ApiLabel],
   state: String,
   created_at: Date,
   updated_at: Date,
-  body: String)(repositoryName: RepositoryName, isPullRequest: Boolean){
+  body: String,
+  milestone: Option[ApiMilestone]
+)(repositoryName: RepositoryName, isPullRequest: Boolean) {
+  val id = 0 // dummy id
+  val assignees = List(assignee).flatten
   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,
+    assignee: Option[ApiUser],
+    labels: List[ApiLabel],
+    milestone: Option[ApiMilestone]
+  ): ApiIssue =
     ApiIssue(
       number = issue.issueId,
-      title  = issue.title,
+      title = issue.title,
-      user   = user,
+      user = user,
-      state  = if(issue.closed){ "closed" }else{ "open" },
+      assignee = assignee,
-      body   = issue.content.getOrElse(""),
+      labels = labels,
+      milestone = milestone,
+      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/ApiMilestone.scala

@@ -0,0 +1,49 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.{Milestone, Repository}
+import gitbucket.core.util.RepositoryName
+import java.util.Date
+
+/**
+ * https://docs.github.com/en/rest/reference/issues#milestones
+ */
+case class ApiMilestone(
+  url: ApiPath,
+  html_url: ApiPath,
+//  label_url: ApiPath,
+  id: Int,
+  number: Int,
+  state: String,
+  title: String,
+  description: String,
+//  creator: ApiUser,  // MILESTONE table does not have created user column
+  open_issues: Int,
+  closed_issues: Int,
+//  created_at: Option[Date],
+//  updated_at: Option[Date],
+  closed_at: Option[Date],
+  due_on: Option[Date]
+)
+
+object ApiMilestone {
+  def apply(
+    repository: Repository,
+    milestone: Milestone,
+    open_issue_count: Int = 0,
+    closed_issue_count: Int = 0
+  ): ApiMilestone =
+    ApiMilestone(
+      url = ApiPath(s"/api/v3/repos/${RepositoryName(repository).fullName}/milestones/${milestone.milestoneId}"),
+      html_url = ApiPath(s"/${RepositoryName(repository).fullName}/milestone/${milestone.milestoneId}"),
+//      label_url = ApiPath(s"/api/v3/repos/${RepositoryName(repository).fullName}/milestones/${milestone_number}/labels"),
+      id = milestone.milestoneId,
+      number = milestone.milestoneId, // use milestoneId as number
+      state = if (milestone.closedDate.isDefined) "closed" else "open",
+      title = milestone.title,
+      description = milestone.description.getOrElse(""),
+      open_issues = open_issue_count,
+      closed_issues = closed_issue_count,
+      closed_at = milestone.closedDate,
+      due_on = milestone.dueDate
+    )
+}

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.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,55 @@ 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],
+  draft: Option[Boolean]
+) {
+  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) },
+      draft = Some(pullRequest.isDraft)
-      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/ApiRelease.scala

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

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

@@ -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,57 @@ case class ApiRepository(
   forks: Int,
   `private`: Boolean,
   default_branch: String,
-  owner: ApiUser)(urlIsHtmlUrl: Boolean) {
+  owner: ApiUser,
+  has_issues: Boolean
+) {
+  val id = 0 // dummy id
   val forks_count = forks
   val watchers_count = watchers
-  val url = if(urlIsHtmlUrl){
+  val url = ApiPath(s"/api/v3/repos/${full_name}")
-    ApiPath(s"/${full_name}")
-  } else {
-    ApiPath(s"/api/v3/repos/${full_name}")
-  }
-  val http_url  = ApiPath(s"/git/${full_name}.git")
   val clone_url = ApiPath(s"/git/${full_name}.git")
-  val html_url  = ApiPath(s"/${full_name}")
+  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 =
+  ): 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)
+      has_issues = if (repository.options.issuesOption == "DISABLE") false else true
+    )
 
   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))
+    this(repositoryInfo, ApiUser(owner))
-
-  def forWebhookPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    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)
+      has_issues = true
+    )
 }

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

@@ -0,0 +1,6 @@
+package gitbucket.core.api
+
+case class ApiRepositoryCollaborator(
+  permission: String,
+  user: ApiUser
+)

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

@@ -0,0 +1,29 @@
+package gitbucket.core.api
+
+import gitbucket.core.util.RepositoryName
+
+case class ApiTagCommit(
+  sha: String,
+  url: ApiPath
+)
+
+case class ApiTag(
+  name: String,
+  commit: ApiTagCommit,
+  zipball_url: ApiPath,
+  tarball_url: ApiPath
+)
+
+object ApiTag {
+  def apply(
+    tagName: String,
+    repositoryName: RepositoryName,
+    commitId: String
+  ): ApiTag =
+    ApiTag(
+      name = tagName,
+      commit = ApiTagCommit(sha = commitId, url = ApiPath(s"/${repositoryName.fullName}/commits/${commitId}")),
+      zipball_url = ApiPath(s"/${repositoryName.fullName}/archive/${tagName}.zip"),
+      tarball_url = ApiPath(s"/${repositoryName.fullName}/archive/${tagName}.tar.gz")
+    )
+}

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

@@ -0,0 +1,44 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.{RepositoryWebHook, WebHook}
+
+/**
+ * https://docs.github.com/en/rest/reference/repos#webhooks
+ */
+case class ApiWebhookConfig(
+  content_type: String,
+//  insecure_ssl: String,
+  url: String
+)
+
+case class ApiWebhook(
+  `type`: String,
+  id: Int,
+  name: String,
+  active: Boolean,
+  events: List[String],
+  config: ApiWebhookConfig,
+//  updated_at: Option[Date],
+//  created_at: Option[Date],
+  url: ApiPath,
+//  test_url: ApiPath,
+//  ping_url: ApiPath,
+//  last_response: ...
+)
+
+object ApiWebhook {
+  def apply(
+    _type: String,
+    hook: RepositoryWebHook,
+    hookEvents: Set[WebHook.Event]
+  ): ApiWebhook =
+    ApiWebhook(
+      `type` = _type,
+      id = hook.hookId,
+      name = "web", // dummy
+      active = true, // dummy
+      events = hookEvents.toList.map(_.name),
+      config = ApiWebhookConfig(hook.ctype.code, hook.url),
+      url = ApiPath(s"/api/v3/${hook.userName}/${hook.repositoryName}/hooks/${hook.hookId}")
+    )
+}

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

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

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

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

src/main/scala/gitbucket/core/api/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/CreateAMilestone.scala

@@ -0,0 +1,14 @@
+package gitbucket.core.api
+
+import java.util.Date
+
+case class CreateAMilestone(
+  title: String,
+  state: String = "open",
+  description: Option[String],
+  due_on: Option[Date]
+) {
+  def isValid: Boolean = {
+    title.length <= 100 && title.matches("[a-zA-Z0-9\\-\\+_.]+")
+  }
+}

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

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

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

@@ -0,0 +1,7 @@
+package gitbucket.core.api
+
+/**
+ * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#create-a-reference
+ * api form
+ */
+case class CreateARef(ref: String, sha: String)

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

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

src/main/scala/gitbucket/core/api/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/CreateARepositoryWebhook.scala

@@ -0,0 +1,35 @@
+package gitbucket.core.api
+
+case class CreateARepositoryWebhookConfig(
+  url: String,
+  content_type: String = "form",
+  insecure_ssl: String = "0",
+  secret: Option[String]
+)
+
+/**
+ * https://docs.github.com/en/rest/reference/repos#create-a-repository-webhook
+ */
+case class CreateARepositoryWebhook(
+  name: String = "web",
+  config: CreateARepositoryWebhookConfig,
+  events: List[String] = List("push"),
+  active: Boolean = true
+) {
+  def isValid: Boolean = {
+    config.content_type == "form" || config.content_type == "json"
+  }
+}
+
+case class UpdateARepositoryWebhook(
+  name: String = "web",
+  config: CreateARepositoryWebhookConfig,
+  events: List[String] = List("push"),
+  add_events: List[String] = List(),
+  remove_events: List[String] = List(),
+  active: Boolean = true
+) {
+  def isValid: Boolean = {
+    config.content_type == "form" || config.content_type == "json"
+  }
+}

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]() +
@@ -39,21 +43,35 @@ object JsonFormat {
     FieldSerializer[ApiCommits.Tree]() +
     FieldSerializer[ApiCommits.Stats]() +
     FieldSerializer[ApiCommits.File]() +
+    FieldSerializer[ApiRelease]() +
+    FieldSerializer[ApiReleaseAsset]() +
     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/MergeAPullRequest.scala

@@ -0,0 +1,23 @@
+package gitbucket.core.api
+
+/**
+ * https://docs.github.com/en/rest/reference/pulls#merge-a-pull-request
+ */
+case class MergeAPullRequest(
+  commit_title: Option[String],
+  commit_message: Option[String],
+  /* TODO: Not Implemented
+  sha: Option[String],*/
+  merge_method: Option[String]
+)
+
+case class SuccessToMergePrResponse(
+  sha: String,
+  merged: Boolean,
+  message: String
+)
+
+case class FailToMergePrResponse(
+  documentation_url: String,
+  message: String
+)

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

@@ -0,0 +1,7 @@
+package gitbucket.core.api
+
+/**
+ * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#update-a-reference
+ * api form
+ */
+case class UpdateARef(sha: String, force: Boolean)

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

@@ -1,52 +1,31 @@
 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 ApiIssueMilestoneControllerBase
-  with ProtectedBranchService
+    with ApiOrganizationControllerBase
-  with IssuesService
+    with ApiPullRequestControllerBase
-  with LabelsService
+    with ApiReleaseControllerBase
-  with MilestonesService
+    with ApiRepositoryBranchControllerBase
-  with PullRequestService
+    with ApiRepositoryCollaboratorControllerBase
-  with CommitsService
+    with ApiRepositoryCommitControllerBase
-  with CommitStatusService
+    with ApiRepositoryContentsControllerBase
-  with RepositoryCreationService
+    with ApiRepositoryControllerBase
-  with IssueCreationService
+    with ApiRepositoryStatusControllerBase
-  with HandleCommentService
+    with ApiRepositoryWebhookControllerBase
-  with WebHookService
+    with ApiUserControllerBase
-  with WebHookPullRequestService
+    with RepositoryService
-  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
@@ -55,662 +34,70 @@ trait ApiControllerBase extends ControllerBase {
     with PullRequestService
     with CommitsService
     with CommitStatusService
+    with ReleaseService
     with RepositoryCreationService
+    with RepositoryCommitFileService
     with IssueCreationService
     with HandleCommentService
+    with MergeService
+    with WebHookService
+    with WebHookPullRequestService
+    with WebHookIssueCommentService
+    with WebHookPullRequestReviewCommentService
+    with WikiService
+    with ActivityService
     with PrioritiesService
+    with AdminAuthenticator
     with OwnerAuthenticator
     with UsersAuthenticator
     with GroupManagerAuthenticator
     with ReferrerAuthenticator
     with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
+    with WritableUsersAuthenticator
+    with RequestCache
+
+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._
@@ -20,6 +20,7 @@ import javax.servlet.{FilterChain, ServletRequest, ServletResponse}
 import is.tagomor.woothee.Classifier
 
 import scala.util.Try
+import scala.util.Using
 import net.coobird.thumbnailator.Thumbnails
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.ObjectId
@@ -27,41 +28,55 @@ import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.treewalk._
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
+import org.json4s.Formats
 
 /**
  * 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)
 
-  implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
+  implicit val jsonFormats: Formats = gitbucket.core.api.JsonFormat.jsonFormats
 
   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 +93,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 +141,79 @@ 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(
-            }
+                request.getRequestURI
-          )))
+                  .substring(request.getContextPath.length) + Option(request.getQueryString).map("?" + _).getOrElse("")
+              )
+            )
+          )
         }
       }
     }
 
-  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 +223,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.resource(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, repository.repository.options.safeMode)
 
-      if(loader.isLarge){
+      if (loader.isLarge) {
         response.setContentLength(loader.getSize.toInt)
         loader.copyTo(response.outputStream)
       } else {
@@ -231,11 +263,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.resource(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in =>
             IOUtils.copy(in, response.getOutputStream)
           }
         } else {
@@ -250,34 +282,45 @@ 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
 
+  def withLoginAccount(f: Account => Any): Any = {
+    loginAccount match {
+      case Some(loginAccount) => f(loginAccount)
+      case None               => Unauthorized()
+    }
+  }
+
   /**
    * Get object from cache.
    *
    * If object has not been cached with the specified key then retrieves by given action.
    * Cached object are available during a request.
    */
-  def cache[A](key: String)(action: => A): A =
+  def cache[A](key: String)(action: => A): A = {
-    defining(Keys.Request.Cache(key)){ cacheKey =>
+    val cacheKey = Keys.Request.Cache(key)
-      Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
+    Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
-        val newObject = action
+      val newObject = action
-        request.setAttribute(cacheKey, newObject)
+      request.setAttribute(cacheKey, newObject)
-        newObject
+      newObject
-      }
     }
+  }
 
 }
 
@@ -285,48 +328,111 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
  * Base trait for controllers which manages account information.
  */
 trait AccountManagementControllerBase extends ControllerBase {
-  self: AccountService  =>
+  self: AccountService =>
+
+  private val logger = LoggerFactory.getLogger(getClass)
 
   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 =>
+      try {
-        val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
+        fileId.foreach { fileId =>
-        val uploadDir = getUserUploadDir(userName)
+          val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
-        if(!uploadDir.exists){
+          val uploadDir = getUserUploadDir(userName)
-          uploadDir.mkdirs()
+          if (!uploadDir.exists) {
+            uploadDir.mkdirs()
+          }
+          Thumbnails
+            .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
+            .size(324, 324)
+            .toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
+          updateAvatarImage(userName, Some(filename))
         }
-        Thumbnails.of(new java.io.File(getTemporaryDir(session.getId), fileId))
+      } catch {
-          .size(324, 324)
+        case e: Exception => logger.info("Error while updateImage" + e.getMessage)
-          .toFile(new java.io.File(uploadDir, 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.view.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.view.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

@@ -1,49 +1,97 @@
 package gitbucket.core.controller
 
 import gitbucket.core.dashboard.html
+import gitbucket.core.model.Account
 import gitbucket.core.service._
 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 MergeService
+    with PullRequestService
+    with RepositoryService
+    with AccountService
+    with ActivityService
+    with CommitsService
+    with LabelsService
+    with PrioritiesService
+    with WebHookService
+    with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
+    with MilestonesService
+    with CommitStatusService
+    with UsersAuthenticator
+    with RequestCache
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with PullRequestService with RepositoryService with AccountService
+  self: IssuesService
+    with PullRequestService
+    with RepositoryService
+    with AccountService
+    with CommitStatusService
     with UsersAuthenticator =>
 
+  get("/dashboard/repos")(usersOnly {
+    context.withLoginAccount { loginAccount =>
+      val repos = getVisibleRepositories(
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
+      html.repos(getGroupNames(loginAccount.userName), repos, repos)
+    }
+  })
+
   get("/dashboard/issues")(usersOnly {
-    searchIssues("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "created_by")
+    }
   })
 
   get("/dashboard/issues/assigned")(usersOnly {
-    searchIssues("assigned")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "assigned")
+    }
   })
 
   get("/dashboard/issues/created_by")(usersOnly {
-    searchIssues("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "created_by")
+    }
   })
 
   get("/dashboard/issues/mentioned")(usersOnly {
-    searchIssues("mentioned")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "mentioned")
+    }
   })
 
   get("/dashboard/pulls")(usersOnly {
-    searchPullRequests("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "created_by")
+    }
   })
 
   get("/dashboard/pulls/created_by")(usersOnly {
-    searchPullRequests("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "created_by")
+    }
   })
 
   get("/dashboard/pulls/assigned")(usersOnly {
-    searchPullRequests("assigned")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "assigned")
+    }
   })
 
   get("/dashboard/pulls/mentioned")(usersOnly {
-    searchPullRequests("mentioned")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "mentioned")
+    }
   })
 
   private def getOrCreateCondition(key: String, filter: String, userName: String) = {
@@ -56,54 +104,76 @@ trait DashboardControllerBase extends ControllerBase {
     }
   }
 
-  private def searchIssues(filter: String) = {
+  private def searchIssues(loginAccount: Account, filter: String) = {
     import IssuesService._
 
-    val userName  = context.loginAccount.get.userName
+    val userName = loginAccount.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)
+    val issues = searchIssue(condition, IssueSearchOption.Issues, (page - 1) * IssueLimit, IssueLimit, userRepos: _*)
 
     html.issues(
-      searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
+      issues.map(issue => (issue, None)),
       page,
-      countIssue(condition.copy(state = "open"  ), false, userRepos: _*),
+      countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, userRepos: _*),
-      countIssue(condition.copy(state = "closed"), false, userRepos: _*),
+      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, 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(
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
+    )
   }
 
-  private def searchPullRequests(filter: String) = {
+  private def searchPullRequests(loginAccount: Account, filter: String) = {
     import IssuesService._
     import PullRequestService._
 
-    val userName  = context.loginAccount.get.userName
+    val userName = loginAccount.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)
+    val issues = searchIssue(
+      condition,
+      IssueSearchOption.PullRequests,
+      (page - 1) * PullRequestLimit,
+      PullRequestLimit,
+      allRepos: _*
+    )
+    val status = issues.map { issue =>
+      issue.commitId.flatMap { commitId =>
+        getCommitStatusWithSummary(issue.issue.userName, issue.issue.repositoryName, commitId)
+      }
+    }
 
     html.pulls(
-      searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
+      issues.zip(status),
       page,
-      countIssue(condition.copy(state = "open"  ), true, allRepos: _*),
+      countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, allRepos: _*),
-      countIssue(condition.copy(state = "closed"), true, allRepos: _*),
+      countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, 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(
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
+    )
   }
 
-
 }

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

@@ -1,10 +1,11 @@
 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._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import org.eclipse.jgit.api.Git
@@ -14,125 +15,190 @@ import org.scalatra._
 import org.scalatra.servlet.{FileItem, FileUploadSupport, MultipartConfig}
 import org.apache.commons.io.{FileUtils, IOUtils}
 
+import scala.util.Using
+import gitbucket.core.service.SystemSettingsService
+import slick.jdbc.JdbcBackend.Session
+
 /**
  * Provides Ajax based file upload functionality.
  *
  * 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
+    with SystemSettingsService {
 
-  configureMultipartHandling(MultipartConfig(maxFileSize = Some(FileUtil.MaxFileSize)))
+  post("/image") {
-
+    setMultipartConfig()
-  post("/image"){
+    execute(
-    execute({ (file, fileId) =>
+      { (file, fileId) =>
-      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+        FileUtils
-      session += Keys.Session.Upload(fileId) -> file.name
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get())
-    }, FileUtil.isImage)
+        session += Keys.Session.Upload(fileId) -> file.name
+      },
+      FileUtil.isImage(_)
+    )
   }
 
-  post("/tmp"){
+  post("/tmp") {
-    execute({ (file, fileId) =>
+    setMultipartConfig()
-      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+    execute(
-      session += Keys.Session.Upload(fileId) -> file.name
+      { (file, fileId) =>
-    }, _ => true)
+        FileUtils
+          .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) =>
+    setMultipartConfig()
-      FileUtils.writeByteArrayToFile(new java.io.File(
+    execute(
-        getAttachedDir(params("owner"), params("repository")),
+      { (file, fileId) =>
-        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
+        FileUtils.writeByteArrayToFile(
-    }, _ => true)
+          new File(
+            getAttachedDir(params("owner"), params("repository")),
+            FileUtil.checkFilename(fileId + "." + FileUtil.getExtension(file.getName))
+          ),
+          file.get()
+        )
+      },
+      _ => true
+    )
   }
 
-  post("/wiki/:owner/:repository"){
+  post("/wiki/:owner/:repository") {
+    setMultipartConfig()
     // 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.resource(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/*") {
-    session.get(Keys.Session.LoginAccount).collect { case _: Account =>
+    setMultipartConfigForLargeFile()
-      val owner = params("owner")
+    session
-      val repository = params("repository")
+      .get(Keys.Session.LoginAccount)
-      val tag = params("tag")
+      .collect {
-      execute({ (file, fileId) =>
+        case _: Account =>
-        FileUtils.writeByteArrayToFile(
+          val owner = params("owner")
-          new java.io.File(getReleaseFilesDir(owner, repository), tag + "/" + fileId),
+          val repository = params("repository")
-          file.get
+          val tag = multiParams("splat").head
-        )
+          execute(
-      }, _ => true)
+            { (file, fileId) =>
-    }.getOrElse(BadRequest())
+              FileUtils.writeByteArrayToFile(
+                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 =>
+    setMultipartConfig()
-      execute({ (file, fileId) =>
+    session.get(Keys.Session.LoginAccount).collect {
-        request2Session(request).conn.importAsSQL(file.getInputStream)
+      case loginAccount: Account if loginAccount.isAdmin =>
-      }, _ => true)
+        execute({ (file, fileId) =>
+          request2Session(request).conn.importAsSQL(file.getInputStream)
+        }, _ => true)
     }
     redirect("/admin/data")
   }
 
+  private def setMultipartConfig(): Unit = {
+    val settings = loadSystemSettings()
+    val config = MultipartConfig(maxFileSize = Some(settings.upload.maxFileSize))
+    config.apply(request.getServletContext())
+  }
+
+  private def setMultipartConfigForLargeFile(): Unit = {
+    val settings = loadSystemSettings()
+    val config = MultipartConfig(maxFileSize = Some(settings.upload.largeMaxFileSize))
+    config.apply(request.getServletContext())
+  }
+
   private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
-    implicit val session = Database.getSession(request)
+    implicit val session: 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, mimeTypeChecker: (String) => Boolean) =
-    case Some(file) if(mimeTypeChcker(file.name)) =>
+    fileParams.get("file") match {
-      defining(FileUtil.generateFileId){ fileId =>
+      case Some(file) if mimeTypeChecker(file.name) =>
+        val fileId = FileUtil.generateFileId
         f(file, fileId)
         contentType = "text/plain"
         Ok(fileId)
-      }
+      case _ => BadRequest()
-    case _ => BadRequest()
+    }
-  }
 
 }

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

@@ -8,26 +8,27 @@ import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util._
-import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
+import gitbucket.core.view.helpers._
 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
+    with RequestCache
 
 trait IndexControllerBase extends ControllerBase {
   self: RepositoryService
@@ -36,6 +37,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,50 +59,70 @@ 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),
+            None,
+            withoutPhysicalInfo = true,
+            limit = context.settings.limitVisibleRepositories
+          ),
+          showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
+            account.userName
+          )
+        )
+      }
+      .getOrElse {
+        gitbucket.core.html.index(
+          getRecentPublicActivities(),
+          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
+      flash.update(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
+        flash.update("userName", form.userName)
-        flash += "password" -> form.password
+        flash.update("password", form.password)
-        flash += "error" -> "Sorry, your Username and/or Password is incorrect. Please try again."
+        flash.update("error", "Sorry, your Username and/or Password is incorrect. Please try again.")
         redirect("/signin")
     }
   }
 
   /**
-    * 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,22 +130,22 @@ 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")
       session.get(Keys.Session.OidcContext) match {
         case Some(context: OidcContext) =>
-          authenticate(params, redirectURI, context.state, context.nonce, oidc) map { account =>
+          authenticate(params.toMap, redirectURI, context.state, context.nonce, oidc).map { account =>
             signin(account, context.redirectBackURI)
           } orElse {
-            flash += "error" -> "Sorry, authentication failed. Please try again."
+            flash.update("error", "Sorry, authentication failed. Please try again.")
             session.invalidate()
             redirect("/signin")
           }
         case _ =>
-          flash += "error" -> "Sorry, something wrong. Please try again."
+          flash.update("error", "Sorry, something wrong. Please try again.")
           session.invalidate()
           redirect("/signin")
       }
@@ -131,33 +154,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())
+    xml.feed(getRecentPublicActivities())
   }
 
-  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 +196,31 @@ 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"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(
+                  StringUtil.cutTail(t.userName, 25, "...")
+                )}</b> ${StringUtil
+                  .escapeHtml(StringUtil.cutTail(t.fullName, 25, "..."))}",
+                "value" -> t.userName
+              )
+            }
+        )
+      )
     )
   })
 
@@ -198,48 +229,84 @@ 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?
+  // TODO Move to RepositoryViewrController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")){ case (query, target) =>
+    val query = params.getOrElse("q", "").trim
-      val page = try {
+    val target = params.getOrElse("type", "code")
-        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 _: 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 =
-    val repositories = visibleRepositories.filter { repository =>
+      getVisibleRepositories(
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
+
+    val repositories = {
+      context.settings.limitVisibleRepositories match {
+        case true =>
+          getVisibleRepositories(
+            context.loginAccount,
+            None,
+            withoutPhysicalInfo = true,
+            limit = false
+          )
+        case false => visibleRepositories
+      }
+    }.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }
-    context.loginAccount.map { account =>
-      gitbucket.core.search.html.repositories(query, repositories, Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
-    }.getOrElse {
-      gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil)
-    }
-  }
 
+    gitbucket.core.search.html.repositories(query, repositories, visibleRepositories)
+  }
 }

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

@@ -1,9 +1,9 @@
 package gitbucket.core.controller
 
 import gitbucket.core.issues.html
+import gitbucket.core.model.Account
 import gitbucket.core.service.IssuesService._
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import gitbucket.core.view
@@ -11,23 +11,26 @@ 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 MergeService
-  with WebHookIssueCommentService
+    with PullRequestService
-  with CommitsService
+    with WebHookIssueCommentService
-  with PrioritiesService
+    with WebHookPullRequestReviewCommentService
+    with CommitsService
+    with PrioritiesService
+    with RequestCache
 
 trait IssuesControllerBase extends ControllerBase {
   self: IssuesService
@@ -45,40 +48,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,181 +95,224 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
+    val issueId = params("id")
-      getIssue(owner, name, issueId) map { issue =>
+    getIssue(repository.owner, repository.name, issueId) map {
-        if(issue.isPullRequest){
+      issue =>
+        if (issue.isPullRequest) {
           redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
         } else {
           html.issue(
             issue,
-            getComments(owner, name, issueId.toInt),
+            getComments(repository.owner, repository.name, issueId.toInt),
-            getIssueLabels(owner, name, issueId.toInt),
+            getIssueLabels(repository.owner, repository.name, issueId.toInt),
-            getAssignableUserNames(owner, name),
+            getAssignableUserNames(repository.owner, repository.name),
-            getMilestonesWithIssueCount(owner, name),
+            getMilestonesWithIssueCount(repository.owner, repository.name),
-            getPriorities(owner, name),
+            getPriorities(repository.owner, repository.name),
-            getLabels(owner, name),
+            getLabels(repository.owner, repository.name),
             isIssueEditable(repository),
             isIssueManageable(repository),
-            repository)
+            isIssueCommentManageable(repository),
+            repository
+          )
         }
-      } getOrElse NotFound()
+    } 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) =>
+      html.create(
-        html.create(
+        getAssignableUserNames(repository.owner, repository.name),
-          getAssignableUserNames(owner, name),
+        getMilestones(repository.owner, repository.name),
-          getMilestones(owner, name),
+        getPriorities(repository.owner, repository.name),
-          getPriorities(owner, name),
+        getDefaultPriority(repository.owner, repository.name),
-          getDefaultPriority(owner, name),
+        getLabels(repository.owner, repository.name),
-          getLabels(owner, name),
+        isIssueManageable(repository),
-          isIssueManageable(repository),
+        getContentTemplate(repository, "ISSUE_TEMPLATE"),
-          getContentTemplate(repository, "ISSUE_TEMPLATE"),
+        repository
-          repository)
+      )
-      }
     } else Unauthorized()
   })
 
   post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
+    context.withLoginAccount {
-      val issue = createIssue(
+      loginAccount =>
-        repository,
+        if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-        form.title,
+          val issue = createIssue(
-        form.content,
+            repository,
-        form.assignedUserName,
+            form.title,
-        form.milestoneId,
+            form.content,
-        form.priorityId,
+            form.assignedUserName,
-        form.labelNames.toArray.flatMap(_.split(",")),
+            form.milestoneId,
-        context.loginAccount.get)
+            form.priorityId,
-
+            form.labelNames.toSeq.flatMap(_.split(",")),
-      redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
+            loginAccount
-    } else Unauthorized()
+          )
+          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) =>
+    context.withLoginAccount {
-      getIssue(owner, name, params("id")).map { issue =>
+      loginAccount =>
-        if(isEditableContent(owner, name, issue.openedUserName)){
+        getIssue(repository.owner, repository.name, params("id")).map {
-          // update issue
+          issue =>
-          updateIssue(owner, name, issue.issueId, title, issue.content)
+            if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
-          // extract references and create refer comment
+              if (issue.title != title) {
-          createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
+                // update issue
-
+                updateIssue(repository.owner, repository.name, issue.issueId, title, issue.content)
-          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+                // extract references and create refer comment
-        } else Unauthorized()
+                createReferComment(repository.owner, repository.name, issue.copy(title = title), title, loginAccount)
-      } getOrElse NotFound()
+                createComment(
+                  repository.owner,
+                  repository.name,
+                  loginAccount.userName,
+                  issue.issueId,
+                  issue.title + "\r\n" + title,
+                  "change_title"
+                )
+              }
+              redirect(s"/${repository.owner}/${repository.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) =>
+    context.withLoginAccount {
-      getIssue(owner, name, params("id")).map { issue =>
+      loginAccount =>
-        if(isEditableContent(owner, name, issue.openedUserName)){
+        getIssue(repository.owner, repository.name, params("id")).map { issue =>
-          // update issue
+          if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
-          updateIssue(owner, name, issue.issueId, issue.title, content)
+            // update issue
-          // extract references and create refer comment
+            updateIssue(repository.owner, repository.name, issue.issueId, issue.title, content)
-          createReferComment(owner, name, issue, content.getOrElse(""), context.loginAccount.get)
+            // extract references and create refer comment
+            createReferComment(repository.owner, repository.name, issue, content.getOrElse(""), loginAccount)
 
-          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+            redirect(s"/${repository.owner}/${repository.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 =>
+    context.withLoginAccount {
-      val actionOpt = params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      loginAccount =>
-      handleComment(issue, Some(form.content), repository, actionOpt) map { case (issue, id) =>
+        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-        redirect(s"/${repository.owner}/${repository.name}/${
+          val actionOpt =
-          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+            params
-      }
+              .get("action")
-    } getOrElse NotFound()
+              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
+          handleComment(issue, Some(form.content), repository, actionOpt) map {
+            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 =>
+    context.withLoginAccount {
-      val actionOpt = params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      loginAccount =>
-      handleComment(issue, form.content, repository, actionOpt) map { case (issue, id) =>
+        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-        redirect(s"/${repository.owner}/${repository.name}/${
+          val actionOpt =
-          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+            params
-      }
+              .get("action")
-    } getOrElse NotFound()
+              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
+          handleComment(issue, form.content, repository, actionOpt) map {
+            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) =>
+    context.withLoginAccount {
-      getComment(owner, name, params("id")).map { comment =>
+      loginAccount =>
-        if(isEditableContent(owner, name, comment.commentedUserName)){
+        getComment(repository.owner, repository.name, params("id")).map { comment =>
-          updateComment(comment.issueId, comment.commentId, form.content)
+          if (isEditableContent(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
-          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
+            updateComment(comment.issueId, comment.commentId, form.content)
-        } else Unauthorized()
+            redirect(s"/${repository.owner}/${repository.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) =>
+    context.withLoginAccount { loginAccount =>
-      getComment(owner, name, params("id")).map { comment =>
+      getComment(repository.owner, repository.name, params("id")).map { comment =>
-        if(isEditableContent(owner, name, comment.commentedUserName)){
+        if (isDeletableComment(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
-          Ok(deleteComment(comment.issueId, comment.commentId))
+          Ok(deleteComment(repository.owner, repository.name, comment.issueId, comment.commentId))
         } else Unauthorized()
       } getOrElse NotFound()
     }
   })
 
   ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
-    getIssue(repository.owner, repository.name, params("id")) map { x =>
+    context.withLoginAccount {
-      if(isEditableContent(x.userName, x.repositoryName, x.openedUserName)){
+      loginAccount =>
-        params.get("dataType") collect {
+        getIssue(repository.owner, repository.name, params("id")) map {
-          case t if t == "html" => html.editissue(x.content, x.issueId, repository)
+          x =>
-        } getOrElse {
+            if (isEditableContent(x.userName, x.repositoryName, x.openedUserName, loginAccount)) {
-          contentType = formats("json")
+              params.get("dataType") collect {
-          org.json4s.jackson.Serialization.write(
+                case t if t == "html" => html.editissue(x.content, x.issueId, repository)
-            Map(
+              } getOrElse {
-              "title"   -> x.title,
+                contentType = formats("json")
-              "content" -> Markdown.toHtml(
+                org.json4s.jackson.Serialization.write(
-                markdown = x.content getOrElse "No description given.",
+                  Map(
-                repository = repository,
+                    "title" -> x.title,
-                enableWikiLink = false,
+                    "content" -> Markdown.toHtml(
-                enableRefsLink = true,
+                      markdown = x.content getOrElse "No description given.",
-                enableAnchor = true,
+                      repository = repository,
-                enableLineBreaks = true,
+                      branch = repository.repository.defaultBranch,
-                enableTaskList = true,
+                      enableWikiLink = false,
-                hasWritePermission = true
+                      enableRefsLink = true,
-              )
+                      enableAnchor = true,
-            )
+                      enableLineBreaks = true,
-          )
+                      enableTaskList = true,
-        }
+                      hasWritePermission = true
-      } else Unauthorized()
+                    )
-    } getOrElse NotFound()
+                  )
+                )
+              }
+            } else Unauthorized()
+        } getOrElse NotFound()
+    }
   })
 
   ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
-    getComment(repository.owner, repository.name, params("id")) map { x =>
+    context.withLoginAccount {
-      if(isEditableContent(x.userName, x.repositoryName, x.commentedUserName)){
+      loginAccount =>
-        params.get("dataType") collect {
+        getComment(repository.owner, repository.name, params("id")) map {
-          case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+          x =>
-        } getOrElse {
+            if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName, loginAccount)) {
-          contentType = formats("json")
+              params.get("dataType") collect {
-          org.json4s.jackson.Serialization.write(
+                case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
-            Map(
+              } getOrElse {
-              "content" -> view.Markdown.toHtml(
+                contentType = formats("json")
-                markdown = x.content,
+                org.json4s.jackson.Serialization.write(
-                repository = repository,
+                  Map(
-                enableWikiLink = false,
+                    "content" -> view.Markdown.toHtml(
-                enableRefsLink = true,
+                      markdown = x.content,
-                enableAnchor = true,
+                      repository = repository,
-                enableLineBreaks = true,
+                      branch = repository.repository.defaultBranch,
-                enableTaskList = true,
+                      enableWikiLink = false,
-                hasWritePermission = true
+                      enableRefsLink = true,
-              )
+                      enableAnchor = true,
-            )
+                      enableLineBreaks = true,
-          )
+                      enableTaskList = true,
-        }
+                      hasWritePermission = true
-      } else Unauthorized()
+                    )
-    } getOrElse NotFound()
+                  )
+                )
+              }
+            } else Unauthorized()
+        } getOrElse NotFound()
+    }
   })
 
   ajaxPost("/:owner/:repository/issues/new/label")(writableUsersOnly { repository =>
@@ -270,21 +322,25 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/new")(writableUsersOnly { repository =>
-    defining(params("id").toInt){ issueId =>
+    val issueId = params("id").toInt
-      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+    registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
-      html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
-    }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/delete")(writableUsersOnly { repository =>
-    defining(params("id").toInt){ issueId =>
+    val issueId = params("id").toInt
-      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+    deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
-      html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    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 +348,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,108 +363,160 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
-    defining(params.get("value")){ action =>
+    val action = params.get("value")
-      action match {
+    action match {
-        case Some("open")  => executeBatch(repository) { issueId =>
+      case Some("open") =>
+        executeBatch(repository) { issueId =>
           getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
             handleComment(issue, None, repository, Some("reopen"))
           }
         }
-        case Some("close") => executeBatch(repository) { issueId =>
+        if (params("uri").nonEmpty) {
+          redirect(params("uri"))
+        }
+      case Some("close") =>
+        executeBatch(repository) { issueId =>
           getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
             handleComment(issue, None, repository, Some("close"))
           }
         }
-        case _ => BadRequest()
+        if (params("uri").nonEmpty) {
-      }
+          redirect(params("uri"))
+        }
+      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)
+          if (params("uri").nonEmpty) {
+            redirect(params("uri"))
+          }
         }
       }
     } getOrElse NotFound()
   })
 
   post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
-    defining(assignedUserName("value")){ value =>
+    val value = assignedUserName("value")
-      executeBatch(repository) {
+    executeBatch(repository) {
-        updateAssignedUserName(repository.owner, repository.name, _, value, true)
+      updateAssignedUserName(repository.owner, repository.name, _, value, true)
-      }
+    }
+    if (params("uri").nonEmpty) {
+      redirect(params("uri"))
     }
   })
 
   post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
-    defining(milestoneId("value")){ value =>
+    val value = milestoneId("value")
-      executeBatch(repository) {
+    executeBatch(repository) {
-        updateMilestoneId(repository.owner, repository.name, _, value, true)
+      updateMilestoneId(repository.owner, repository.name, _, value, true)
-      }
     }
   })
 
   post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
-    defining(priorityId("value")){ value =>
+    val value = priorityId("value")
-      executeBatch(repository) {
+    executeBatch(repository) {
-        updatePriorityId(repository.owner, repository.name, _, value, true)
+      updatePriorityId(repository.owner, repository.name, _, value, true)
-      }
     }
   })
 
   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()
   })
 
+  /**
+   * JSON API for issue and PR completion.
+   */
+  ajaxGet("/:owner/:repository/_issue/proposals")(writableUsersOnly { repository =>
+    contentType = formats("json")
+    org.json4s.jackson.Serialization.write(
+      Map(
+        "options" -> (
+          getOpenIssues(repository.owner, repository.name)
+            .map { t =>
+              Map(
+                "label" -> s"""${if (t.isPullRequest) "<i class='octicon octicon-git-pull-request'></i>"
+                else "<i class='octicon octicon-issue-opened'></i>"}<b> #${StringUtil
+                  .escapeHtml(t.issueId.toString)} ${StringUtil
+                  .escapeHtml(StringUtil.cutTail(t.title, 50, "..."))}</b>""",
+                "value" -> t.issueId.toString
+              )
+            }
+        )
+      )
+    )
+  })
+
   val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
   val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
   val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
   private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
-    params("checked").split(',') map(_.toInt) foreach execute
+    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")
+      case _        =>
     }
   }
 
   private def searchIssues(repository: RepositoryService.RepositoryInfo) = {
-    defining(repository.owner, repository.name){ case (owner, repoName) =>
+    val page = IssueSearchCondition.page(request)
-      val page = IssueSearchCondition.page(request)
+    // retrieve search condition
+    val condition = IssueSearchCondition(request)
+    // search issues
+    val issues =
+      searchIssue(
+        condition,
+        IssueSearchOption.Issues,
+        (page - 1) * IssueLimit,
+        IssueLimit,
+        repository.owner -> repository.name
+      )
 
-      // retrieve search condition
+    html.list(
-      val condition = IssueSearchCondition(request)
+      "issues",
-
+      issues.map(issue => (issue, None)),
-      html.list(
+      page,
-          "issues",
+      getAssignableUserNames(repository.owner, repository.name),
-          searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
+      getMilestones(repository.owner, repository.name),
-          page,
+      getPriorities(repository.owner, repository.name),
-          getAssignableUserNames(owner, repoName),
+      getLabels(repository.owner, repository.name),
-          getMilestones(owner, repoName),
+      countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, repository.owner -> repository.name),
-          getPriorities(owner, repoName),
+      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, repository.owner -> repository.name),
-          getLabels(owner, repoName),
+      condition,
-          countIssue(condition.copy(state = "open"  ), false, owner -> repoName),
+      repository,
-          countIssue(condition.copy(state = "closed"), false, owner -> repoName),
+      isIssueEditable(repository),
-          condition,
+      isIssueManageable(repository)
-          repository,
+    )
-          isIssueEditable(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, loginAccount: Account)(
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+    implicit context: Context
+  ): Boolean = {
+    hasDeveloperRole(owner, repository, context.loginAccount) || author == loginAccount.userName
+  }
+
+  /**
+   * Tests whether an issue comment is deletable by a logged-in user.
+   */
+  private def isDeletableComment(owner: String, repository: String, author: String, loginAccount: Account)(
+    implicit context: Context
+  ): Boolean = {
+    hasOwnerRole(owner, repository, context.loginAccount) || author == loginAccount.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.")
+        }
     }
   }