Release GitBucket 4.46.1 (#4008)

Co-authored-by: gitbucket-bot[bot] <256891351+gitbucket-bot[bot]@users.noreply.github.com>

.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

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# update scalafmt
+3d5ca44d66c77a46770a65a895c9737c542690f6
+
+# Scala Steward: Reformat with scalafmt 3.8.2
+f1360f44c61f8e12666965c10e79f11cd75d6d30
+
+# Scala Steward: Reformat with scalafmt 3.9.7
+a54fb4960ff0762738f4895cdc29bf2715a57f87

.github/CODEOWNERS

@@ -0,0 +1,6 @@
+* @takezoe
+
+build.sbt @xuwei-k
+project/* @xuwei-k
+.github/workflows/* @xuwei-k
+.scalafmt.conf @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,18 +0,0 @@
-### Before submitting an issue to GitBucket I have first:
-
-- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
-- [] searched for similar already existing issue
-- [] 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)*
-
-## Issue
-**Impacted version**: xxxx
-
-**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*
-- *describe the problem and its symptoms*
-- *explain how to reproduce*
-- *attach whatever information that can help understanding the context (screen capture, log files)*

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/issue_template.yml

@@ -0,0 +1,41 @@
+name: Report issue
+description: Report a problem or feature request with GitBucket
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### Before submitting an issue to GitBucket, please ensure you have:
+        - Read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
+        - Searched for similar existing issues
+        - Read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki)
+        - You can use [Gitter chat room](https://gitter.im/gitbucket/gitbucket) instead of GitHub Issues for casual discussion or inquiry
+
+  - type: checkboxes
+    id: prerequisites
+    attributes:
+      label: Prerequisites
+      options:
+        - label: I have read the contribution guidelines
+        - label: I have searched for similar issues
+        - label: I have read the documentation and wiki
+
+  - type: input
+    id: impacted_version
+    attributes:
+      label: Impacted version
+      description: Which version of GitBucket is affected?
+      placeholder: e.g. 4.37.0
+
+  - type: input
+    id: deployment_mode
+    attributes:
+      label: Deployment mode
+      description: How do you use GitBucket? (standalone app, under webcontainer, with an HTTP frontend, etc.)
+      placeholder: e.g. Standalone app, Tomcat, nginx
+
+  - type: textarea
+    id: problem_description
+    attributes:
+      label: Problem description
+      description: Be as explicit as you can. Describe the problem, its symptoms, how to reproduce, and attach any relevant information (screenshots, logs, etc.)
+      placeholder: Describe the problem and how to reproduce it

.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,42 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [17, 25]
+    steps:
+    - uses: actions/checkout@v6
+    - name: Cache
+      uses: actions/cache@v5
+      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@v5
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: adopt
+    - name: Setup sbt launcher
+      uses: sbt/setup-sbt@v1
+    - name: Run tests
+      run: sbt scalafmtSbtCheck scalafmtCheckAll test
+    - name: Scala 3
+      run: sbt '++ 3.x' update # TODO
+    - name: Build executable
+      run: sbt executable
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: gitbucket-java${{ matrix.java }}-${{ github.sha }}
+        path: ./target/executable/gitbucket.*

.gitignore

@@ -2,6 +2,9 @@
 *.log
 .ensime
 .ensime_cache
+.DS_Store
+.java-version
+.tmp
 
 # sbt specific
 dist/*
@@ -10,6 +13,7 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+.bsp/
 
 # Scala-IDE specific
 .scala_dependencies
@@ -24,3 +28,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,8 @@
+updates.limit = 3
+
+updates.includeScala = true
+
+updates.pin = [
+  { groupId = "org.eclipse.jetty", version = "10." }
+  { groupId = "org.mariadb.jdbc", version = "2." }
+]

.scalafmt.conf

@@ -1,11 +1,24 @@
+version = "3.11.0"
 project.git = true
 
 maxColumn = 120
-docstrings = JavaDoc
+docstrings.style = keep
 
 align.tokens = ["%", "%%", {code = "=>", owner = "Case"}]
 align.openParenCallSite = false
 align.openParenDefnSite = false
 continuationIndent.callSite = 2
 continuationIndent.defnSite = 2
-danglingParentheses = true
+danglingParentheses.preset = true
+runner.dialect = scala213source3
+rewrite.trailingCommas.style = keep
+fileOverride {
+  "glob:**/*.sbt" {
+    runner.dialect = scala212
+    rewrite.scala3.convertToNewSyntax = false
+  }
+}
+rewrite.scala3.convertToNewSyntax = true
+runner.dialectOverride.allowSignificantIndentation = false
+runner.dialectOverride.allowAsForImportRename = false
+runner.dialectOverride.allowStarWildcardImport = false

.travis.yml

@@ -1,18 +0,0 @@
-language: scala
-sudo: true
-jdk: 
-  - oraclejdk8
-script:
-  - sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck 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,12 +1,266 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-### 4.23.1 - 10 Apr 2018
+## 4.46.1 - 18 Apr 2026
+- Fix NullPointerException that could happen in the commits page
+- Add options to improve pull request compare performance
+
+## 4.46.0 - 7 Mar 2026
+- Add support for reverting pull request
+- Add markdown toolbar
+- Enable text completion in Ace editor
+- Apply Ace editor for Wiki editing
+- Webhook security: SHA-256 support
+- Preserve UTF-8 BOM when editing files in browser
+
+## 4.45.0 - 10 Jan 2026
+- Add new option to show full username on UI
+- Support render plugin in issues, pull requests, wiki and commit comments
+- Support link to other pages from Wiki page using Wiki link syntax
+
+## 4.44.0 - 23 Sep 2025
+- Enhanced branch protection which supports the following settings:
+  - Prevent pushes from non-allowed users
+  - Whether to apply restrictions to administrator users as well
+- Improve logging for initialization errors
+
+## 4.43.0 - 29 Jun 2025
+- Upgrade H2 database from 1.x to 2.x
+
+Note that upgrading from h2 1.x to 2.x requires data file migration: https://www.h2database.com/html/migration-to-v2.html
+
+It can't be done automatically using GitBucket's auto migration mechanism because it relies on database itself. So, users who use h2 will have to dump and recreate their database manually with the following steps:
+```bash
+# Export database using the current version of H2
+$ curl -O https://repo1.maven.org/maven2/com/h2database/h2/1.4.199/h2-1.4.199.jar
+$ java -cp h2-1.4.199.jar org.h2.tools.Script -url "jdbc:h2:~/.gitbucket/data" -user sa -password sa -script dump.sql
+
+# Recreate database using the new version of H2
+$ curl -O https://repo1.maven.org/maven2/com/h2database/h2/2.3.232/h2-2.3.232.jar
+$ java -cp h2-2.3.232.jar org.h2.tools.RunScript -url "jdbc:h2:~/.gitbucket/data" -user sa -password sa -script dump.sql
+```
+
+In addition, if `~/.gitbucket/database.conf` has the following configuration, remove `;MVCC=true` from `url`.
+```
+db {
+  url = "jdbc:h2:${DatabaseHome};MVCC=true" // => "jdbc:h2:${DatabaseHome}"
+  ...
+}
+```
+
+## 4.42.1 - 20 Jan 2025
+- Fix LDAP issue with SSL
+
+## 4.42.0 - 30 Dec 2024
+- Increase max branch name length 100 -> 255
+- Fix some GitHub incompatible Web APIs
+- Apply user-defined CSS after all plugins
+- Improve performance of listing commit logs
+- Drop Java 11 support. Java 17 is now required
+
+## 4.41.0 - 18 May 2024
+- Simplify pull request UI
+- Keyword search for issues and pull requests
+- New settings for max files and lines limit in showing diff
+- Adjust the default branch automatically when cloning external repository
+- Fix layout of branch selector
+- Performance improvement for listing branches
+- Upgrade internal libraries
+
+## 4.40.0 - 22 Oct 2023
+- Configurable default branch name
+- Support custom fields of issues and pull requests in search condition
+- Create pull request from default branch of forked repositories
+- News feed shows activities of all visible repositories
+- Drop Java 8 support
+- Improve git push performance
+
+## 4.39.0 - 29 Apr 2023
+- Support enum type in custom fields of Issues and Pull requests
+- Hide large diffs by default
+- Add new options to make it possible to run GitBucket using multiple machines
+- Fix many API issues
+
+## 4.38.4 - 2 Nov 2022
+- Downgrade MariaDB JDBC drive to avoid unknown error
+
+## 4.38.3 - 30 Oct 2022
+- Fix several issues around multiple assignees in issues and pull requests
+- Fix IllegalStateException when returning unknown avatar image
+
+## 4.38.2 - 20 Sep 2022
+- Resurrect assignee icons on the issue list
+
+## 4.38.1 - 10 Sep 2022
+- Fix comment diff in Chrome 105
+- Fix Markdown table CSS
+- Fix HTML rendering of multiple assignees
+
+## 4.38.0 - 3 Sep 2022
+- Support multiple assignees for Issues and Pull requests
+- Custom fields for issues and pull requests
+- Reset password by users
+- Allow to configure Jetty idle timeout in standalone mode
+- Horizontal scroll for too wide tables in Markdown
+- Hide header content on signin and register page
+- Fix the default charset of the online editor in the repository viewer
+- Fix the milestone count
+- Some improvements and bugfixes for WebAPI and WebHook
+
+## 4.37.2 - 16 Jan 2022
+- Fixed a security issue reported by [Positive Technologies](https://www.ptsecurity.com/ww-en/). Great thanks for their detailed report and close support!
+
+## 4.37.1 - 14 Dec 2021
+- Update gist-plugin and notification-plugin
+- Fix SSHCommand extension point for apache-sshd 2.x
+
+## 4.37.0 - 11 Dec 2021
+- Enhance Git Reference APIs
+- Add milestone data to issue list API
+- Support "all" in issue list API
+- Support EDDSA in signed commit verification
+- Support custom SSH url
+- Relax max passward length limitation
+- Relax max webhook url length limitation
+
+## 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
+## 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
@@ -14,19 +268,19 @@ All changes to the project will be documented in this file.
 - Git authentication with personal access token
 - Max parallel builds and max stored history in CI plugin became configurable
 
-### 4.22.0 - 3 Mar 2018
+## 4.22.0 - 3 Mar 2018
 - Pull request merge strategy settings
 - Create repository with an empty commit
 - Improve database viewer
 - Update maven-repository-plugin
 
-### 4.21.2 - 27 Jan 2018
+## 4.21.2 - 27 Jan 2018
 - Bugfix
 
-### 4.21.1 - 27 Jan 2018
+## 4.21.1 - 27 Jan 2018
 - Bugfix
 
-### 4.21.0 - 27 Jan 2018
+## 4.21.0 - 27 Jan 2018
 - Release page
 - OpenID Connect support
 - New database viewer

README.md

@@ -1,4 +1,4 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket)
+GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket/actions/workflows/build.yml/badge.svg)](https://github.com/gitbucket/gitbucket/actions/workflows/build.yml) [![gitbucket Scala version support](https://index.scala-lang.org/gitbucket/gitbucket/gitbucket/latest-by-scala-version.svg)](https://index.scala-lang.org/gitbucket/gitbucket/gitbucket) [![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,7 +8,7 @@ GitBucket is a Git web platform powered by Scala offering:
 - High extensibility by plugins
 - API compatibility with GitHub
 
-You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/).
+![GitBucket](https://gitbucket.github.io/img/screenshots/screenshot-repository_viewer.png)
 
 Features
 --------
@@ -22,29 +22,14 @@ 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.
+GitBucket requires **Java 17**. You have to install it, if it is not already installed.
 
 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:
+You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc). Note that GitBucket doesn't support Jakarta EE yet.
-
-- `--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).
 
@@ -59,28 +44,54 @@ GitBucket has a plug-in system that allows extra functionality. Officially the f
 - [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin)
 - [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin)
 
-You can find more plugins made by the community at [GitBucket community plugins](https://gitbucket-plugins.github.io/).
+You can find more plugins made by the community at [GitBucket community plugins](https://github.com/gitbucket/gitbucket/wiki/Community-Plugins).
+
+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 chat 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.23.x
+What's New in 4.46.x
 -------------
-### 4.23.1 - 10 Apr 2018
+## 4.46.1 - 18 Apr 2026
-- Fix bug that the contents API doesn't work for the repository root
+- Fix NullPointerException that could happen in the commits page
-- Fix shutdown problem in Tomcat deployment
+- Add options to improve pull request compare performance
-- Render by plugins at the blob view even if it's a binary file
 
-### 4.23.0 - 31 Mar 2018
+## 4.46.0 - 7 Mar 2026
-- Allow tail slash in URL
+- Add support for reverting pull request
-- Display commit message of tags at the releases page
+- Add markdown toolbar
-- Add labels property to issues and pull requests API response
+- Enable text completion in Ace editor
-- Plugins list API
+- Apply Ace editor for Wiki editing
-- Git authentication with personal access token
+- Webhook security: SHA-256 support
-- Max parallel builds and max stored history in CI plugin became configurable
+- Preserve UTF-8 BOM when editing files in browser
 
-See the [change log](CHANGELOG.md) for all of the updates.
+Note that you have to migrate h2 database file if you will upgrade GitBucket from 4.42 or before to 4.43 or later and you are using the default h2 database because h2 1.x and h2.x don't have compatibility: https://www.h2database.com/html/migration-to-v2.html
+
+It can't be done automatically using GitBucket's auto migration mechanism because it relies on database itself. So, users who use h2 will have to dump and recreate their database manually with the following steps:
+```bash
+# Export database using the current version of H2
+$ curl -O https://repo1.maven.org/maven2/com/h2database/h2/1.4.199/h2-1.4.199.jar
+$ java -cp h2-1.4.199.jar org.h2.tools.Script -url "jdbc:h2:~/.gitbucket/data" -user sa -password sa -script dump.sql
+
+# Recreate database using the new version of H2
+$ curl -O https://repo1.maven.org/maven2/com/h2database/h2/2.3.232/h2-2.3.232.jar
+$ java -cp h2-2.3.232.jar org.h2.tools.RunScript -url "jdbc:h2:~/.gitbucket/data" -user sa -password sa -script dump.sql
+```
+
+In addition, if `~/.gitbucket/database.conf` has the following configuration, remove `;MVCC=true` from `url`.
+```
+db {
+  url = "jdbc:h2:${DatabaseHome};MVCC=true" // => "jdbc:h2:${DatabaseHome}"
+  ...
+}
+```
+
+See the [change log](CHANGELOG.md) for all the past updates.

build.sbt

@@ -1,93 +1,108 @@
-import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
+import com.jsuereth.sbtpgp.PgpKeys._
-import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.23.1"
+val GitBucketVersion = "4.46.1"
-val ScalatraVersion = "2.6.1"
+val ScalatraVersion = "3.1.2"
-val JettyVersion = "9.4.7.v20170914"
+val JettyVersion = "10.0.26"
+val JgitVersion = "6.10.1.202505221210-r"
 
 lazy val root = (project in file("."))
-  .enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin)
+  .enablePlugins(SbtTwirl, ContainerPlugin)
-  .settings(
-    )
 
 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.5"
+scalaVersion := "2.13.18"
 
-scalafmtOnCompile := true
+crossScalaVersions += "3.8.3"
 
-// dependency settings
+// scalafmtOnCompile := true
-resolvers ++= Seq(
+
-  Classpaths.typesafeReleases,
+coverageExcludedPackages := ".*\\.html\\..*"
-  Resolver.jcenterRepo,
-  "amateras" at "http://amateras.sourceforge.jp/mvn/",
-  "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.11.0.201803080745-r",
+  "org.eclipse.jgit"          % "org.eclipse.jgit.http.server" % JgitVersion,
-  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % "4.11.0.201803080745-r",
+  "org.eclipse.jgit"          % "org.eclipse.jgit.archive"     % JgitVersion,
-  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
+  "org.scalatra"             %% "scalatra-javax"               % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
+  "org.scalatra"             %% "scalatra-json-javax"          % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
+  "org.scalatra"             %% "scalatra-forms-javax"         % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"              % "3.5.3",
+  "io.github.json4s"         %% "json4s-jackson"               % "4.1.0",
-  "commons-io"                      % "commons-io"                   % "2.6",
+  "commons-io"                % "commons-io"                   % "2.21.0",
-  "io.github.gitbucket"             % "solidbase"                    % "1.0.2",
+  "io.github.gitbucket"       % "solidbase"                    % "1.1.0",
-  "io.github.gitbucket"             % "markedj"                      % "1.0.15",
+  "io.github.gitbucket"       % "markedj"                      % "1.0.20",
-  "org.apache.commons"              % "commons-compress"             % "1.15",
+  "org.tukaani"               % "xz"                           % "1.12",
-  "org.apache.commons"              % "commons-email"                % "1.5",
+  "org.apache.commons"        % "commons-compress"             % "1.28.0",
-  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.4",
+  "org.apache.commons"        % "commons-email"                % "1.6.0",
-  "org.apache.sshd"                 % "apache-sshd"                  % "1.6.0" exclude ("org.slf4j", "slf4j-jdk14"),
+  "commons-net"               % "commons-net"                  % "3.13.0",
-  "org.apache.tika"                 % "tika-core"                    % "1.17",
+  "org.apache.httpcomponents" % "httpclient"                   % "4.5.14",
-  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.10",
+  "org.apache.sshd"           % "apache-sshd"                  % "2.17.1" exclude ("org.slf4j", "slf4j-jdk14") exclude (
-  "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
+    "org.apache.sshd",
-  "com.h2database"                  % "h2"                           % "1.4.196",
+    "sshd-mina"
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.2.3",
+  ) exclude ("org.apache.sshd", "sshd-netty")
-  "org.postgresql"                  % "postgresql"                   % "42.1.4",
+    exclude ("org.apache.sshd", "sshd-spring-sftp"),
-  "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
+  "org.apache.tika"                 % "tika-core"                 % "3.3.0",
-  "com.zaxxer"                      % "HikariCP"                     % "2.7.4",
+  "com.github.takezoe"             %% "blocking-slick"            % "0.0.14",
-  "com.typesafe"                    % "config"                       % "1.3.2",
+  "com.novell.ldap"                 % "jldap"                     % "2009-10-07",
-  "com.typesafe.akka"               %% "akka-actor"                  % "2.5.8",
+  "com.h2database"                  % "h2"                        % "2.4.240",
-  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.0.0",
+  "org.mariadb.jdbc"                % "mariadb-java-client"       % "2.7.13",
-  "com.github.bkromhout"            % "java-diff-utils"              % "2.1.1",
+  "org.postgresql"                  % "postgresql"                % "42.7.10",
-  "org.cache2k"                     % "cache2k-all"                  % "1.0.1.Final",
+  "ch.qos.logback"                  % "logback-classic"           % "1.5.32",
-  "com.enragedginger"               %% "akka-quartz-scheduler"       % "1.6.1-akka-2.5.x" exclude ("c3p0", "c3p0"),
+  "com.zaxxer"                      % "HikariCP"                  % "7.0.2" exclude ("org.slf4j", "slf4j-api"),
-  "net.coobird"                     % "thumbnailator"                % "0.4.8",
+  "com.typesafe"                    % "config"                    % "1.4.6",
-  "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
+  "fr.brouillard.oss.security.xhub" % "xhub4j-core"               % "1.1.0",
-  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "5.45",
+  "io.github.java-diff-utils"       % "java-diff-utils"           % "4.16",
-  "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
+  "org.cache2k"                     % "cache2k-api"               % "2.6.1.Final",
-  "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
+  "org.cache2k"                     % "cache2k-core"              % "2.6.1.Final",
-  "junit"                           % "junit"                        % "4.12" % "test",
+  "net.coobird"                     % "thumbnailator"             % "0.4.21",
-  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test",
+  "com.github.zafarkhaja"           % "java-semver"               % "0.10.2",
-  "org.mockito"                     % "mockito-core"                 % "2.13.0" % "test",
+  "com.nimbusds"                    % "oauth2-oidc-sdk"           % "11.37",
-  "com.wix"                         % "wix-embedded-mysql"           % "3.0.0" % "test",
+  "org.eclipse.jetty"               % "jetty-webapp"              % JettyVersion    % "provided",
-  "ru.yandex.qatools.embed"         % "postgresql-embedded"          % "2.6" % "test",
+  "javax.servlet"                   % "javax.servlet-api"         % "3.1.0"         % "provided",
-  "net.i2p.crypto"                  % "eddsa"                        % "0.2.0",
+  "junit"                           % "junit"                     % "4.13.2"        % "test",
-  "is.tagomor.woothee"              % "woothee-java"                 % "1.7.0"
+  "org.scalatra"                   %% "scalatra-scalatest-javax"  % ScalatraVersion % "test",
+  "org.mockito"                     % "mockito-core"              % "5.23.0"        % "test",
+  "org.testcontainers"              % "testcontainers-mysql"      % "2.0.4"         % "test",
+  "org.testcontainers"              % "testcontainers-postgresql" % "2.0.4"         % "test",
+  "net.i2p.crypto"                  % "eddsa"                     % "0.3.0",
+  "is.tagomor.woothee"              % "woothee-java"              % "1.11.0",
+  "org.ec4j.core"                   % "ec4j-core"                 % "1.2.0",
+  "org.kohsuke"                     % "github-api"                % "1.330"         % "test"
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method", "-Xfuture")
+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"
+)
+scalacOptions ++= {
+  scalaBinaryVersion.value match {
+    case "2.13" =>
+      Seq("-Xsource:3-cross")
+    case _ =>
+      Nil
+  }
+}
+compile / javacOptions ++= Seq("-target", "11", "-source", "11")
+Container / 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 {
       case ("manifest.mf" :: Nil) => MergeStrategy.discard
@@ -96,25 +111,10 @@ assemblyMergeStrategy in assembly := {
   case x => MergeStrategy.first
 }
 
-// JRebel
-//Seq(jrebelSettings: _*)
-
-//jrebel.webLinks += (target in webappPrepare).value
-//jrebel.enabled := System.getenv().get("JREBEL") != null
-javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
-  if (path.endsWith(".jar")) {
-    // Legacy JRebel agent
-    Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
-  } else {
-    // New JRebel agent
-    Seq(s"-agentpath:${path}")
-  }
-}
-
 // Exclude a war file from published artifacts
 signedArtifacts := {
-  signedArtifacts.value.filterNot {
+  signedArtifacts.value.filterNot { case (_, file) =>
-    case (_, file) => file.getName.endsWith(".war") || file.getName.endsWith(".war.asc")
+    file.getName.endsWith(".war") || file.getName.endsWith(".war.asc")
   }
 }
 
@@ -122,17 +122,22 @@ signedArtifacts := {
 val ExecutableConfig = config("executable").hide
 Keys.ivyConfigurations += ExecutableConfig
 libraryDependencies ++= Seq(
-  "org.eclipse.jetty" % "jetty-security"     % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-security" % JettyVersion % "executable",
-  "org.eclipse.jetty" % "jetty-webapp"       % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-webapp"   % JettyVersion % "executable",
-  "org.eclipse.jetty" % "jetty-continuation" % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-server"   % JettyVersion % "executable",
-  "org.eclipse.jetty" % "jetty-server"       % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-xml"      % JettyVersion % "executable",
-  "org.eclipse.jetty" % "jetty-xml"          % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-http"     % JettyVersion % "executable",
-  "org.eclipse.jetty" % "jetty-http"         % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-servlet"  % JettyVersion % "executable",
-  "org.eclipse.jetty" % "jetty-servlet"      % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-io"       % JettyVersion % "executable",
-  "org.eclipse.jetty" % "jetty-io"           % JettyVersion % "executable",
+  "org.eclipse.jetty" % "jetty-util"     % JettyVersion % "executable"
-  "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}
@@ -151,9 +156,11 @@ executableKey := {
   // include jetty classes
   val jettyJars = Keys.update.value select configurationFilter(name = ExecutableConfig.name)
   jettyJars foreach { jar =>
-    IO unzip (jar, temp, (name: String) =>
+    IO unzip (
-      (name startsWith "javax/") ||
+      jar,
-        (name startsWith "org/"))
+      temp,
+      (name: String) => (name startsWith "javax/") || (name startsWith "org/") || (name startsWith "META-INF/services/")
+    )
   }
 
   // include original war file
@@ -161,7 +168,7 @@ executableKey := {
   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" */ )
   launchClasses foreach { name =>
     IO copyFile (classDir / name, temp / name)
@@ -170,34 +177,38 @@ 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.URI(url).toURL.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 =>
+  val contentMappings = (temp.allPaths --- PathFinder(temp)).get() pair { file =>
     IO.relativizeFile(temp, file)
   }
   val manifest = new JarManifest
   manifest.getMainAttributes put (AttrName.MANIFEST_VERSION, "1.0")
   manifest.getMainAttributes put (AttrName.MAIN_CLASS, "JettyLauncher")
   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",
     "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
@@ -205,9 +216,9 @@ executableKey := {
   outputFile
 }
 publishTo := {
-  val nexus = "https://oss.sonatype.org/"
+  val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
-  if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
+  if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
-  else Some("releases" at nexus + "service/local/staging/deploy/maven2")
+  else localStaging.value
 }
 publishMavenStyle := true
 pomIncludeRepository := { _ =>
@@ -259,7 +270,26 @@ 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
+  }
 }
+
+Container / javaOptions ++= Seq(
+  "-Dlogback.configurationFile=/logback-dev.xml",
+  "-Xdebug",
+  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000",
+  "-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF",
+  // "-Ddev-features=keep-session"
+)
+Container / containerLibs := Seq(("org.eclipse.jetty" % "jetty-runner" % JettyVersion).intransitive())
+Container / containerMain := "org.eclipse.jetty.runner.Runner"

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,76 @@
+How to build and run from the source tree
+========
+
+First of all, Install [sbt](https://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 ~container: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`.
+
+Note that HttpSession is cleared when auto-reloading happened.
+This is a bit annoying when developing features that requires sign-in.
+You can keep HttpSession even if GitBucket is restarted by enabling this configuration in `build.sbt`:
+https://github.com/gitbucket/gitbucket/blob/3dcc0aee3c4413b05be7c03476626cb202674afc/build.sbt#L292
+
+Or by launching GitBucket with the following command:
+```shell
+sbt '; set Container/javaOptions += "-Ddev-features=keep-session" ; ~container:start'
+```
+
+Note that this feature serializes HttpSession on the local disk and assigns all requests to the same session
+which means you cannot test multi users behavior in this mode.
+
+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 `build.sbt`:
+
+```scala
+javaOptions in Jetty ++= Seq(
+  "-Xdebug",
+  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+)
+```
+
+Run GitBucket:
+
+```shell
+$ sbt ~container: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

@@ -5,20 +5,27 @@ GitBucket persists all data into __HOME/.gitbucket__ in default (In 1.9 or befor
 This directory has following structure:
 
 ```
-* /HOME/gitbucket
+* /HOME/.gitbucket
+  * gitbucket.conf
+  * database.conf
+  * activity.log
+  * data.mv.db, data.trace.db (H2 data files if the default embed H2 is used)
   * /repositories 
     * /USER_NAME
       * /REPO_NAME.git (substance of repository. GitServlet sees this directory)
-      * /REPO_NAME
-        * /issues (files which are attached to issue)
       * /REPO_NAME.wiki.git (wiki repository)
+      * /REPO_NAME
+        * /issues (files attached to issue)
+        * /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)
+  * /sessions
+    * HTTP session data created (if '--save_sessions' option is used in the standalone mode)
   * /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,31 @@ 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, stage artifacts on your machine:
+
+```bash
+$ sbt publishSigned
+```
+
+Next, upload artifacts to Sonatype's Central Portal with the following command:
+
+```bash
+$ sbt sonaUpload
+```
+
+Then logged-in to https://central.sonatype.com/ and publish the deployment.
+
+You need to wait up to a day until default bundled plugins:
+
+- https://github.com/gitbucket/gitbucket-notifications-plugin
+- https://github.com/gitbucket/gitbucket-gist-plugin
+- https://github.com/gitbucket/gitbucket-pages-plugin
+- https://github.com/gitbucket/gitbucket-emoji-plugin
+
 ### Make release war file
 
 Run `sbt executable`. The release war file and fingerprint are generated into `target/executable/gitbucket.war`.
@@ -41,21 +66,4 @@ Run `sbt executable`. The release war file and fingerprint are generated into `t
 ```bash
 $ sbt executable
 ```
-
+Create new release from the corresponded tag on GitHub, then upload generated jar file and fingerprints to the release.
-### Deploy assembly jar file
-
-For plug-in development, we have to publish the GitBucket jar file to the Maven central repository as well. At first, hit following command to publish artifacts to the sonatype OSS repository:
-
-```bash
-$ sbt 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](https://scalatra.org/guides/2.8/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.5.0",
-        "range": ">=4.23.0",
-        "url": "https://github.com/gitbucket/gitbucket-notifications-plugin/releases/download/1.5.0/gitbucket-notifications-plugin-assembly-1.5.0.jar"
-      }
-    ],
-    "default": true
-  },
-  {
-    "id": "emoji",
-    "name": "Emoji Plugin",
-    "description": "Provides Emoji support for GitBucket.",
-    "versions": [
-      {
-        "version": "4.5.0",
-        "range": ">=4.18.0",
-        "url": "https://github.com/gitbucket/gitbucket-emoji-plugin/releases/download/4.5.0/gitbucket-emoji-plugin_2.12-4.5.0.jar"
-      }
-    ],
-    "default": false
-  },
-  {
-    "id": "gist",
-    "name": "Gist Plugin",
-    "description": "Provides Gist feature on GitBucket.",
-    "versions": [
-      {
-        "version": "4.13.0",
-        "range": ">=4.23.0",
-        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.13.0/gitbucket-gist-plugin-assembly-4.13.0.jar"
-      }
-    ],
-    "default": false
-  },
-  {
-    "id": "pages",
-    "name": "Pages Plugin",
-    "description": "Project pages for gitbucket",
-    "versions": [
-      {
-        "version": "1.7.0",
-        "range": ">=4.23.0",
-        "url": "https://github.com/gitbucket/gitbucket-pages-plugin/releases/download/v1.7.0/gitbucket-pages-plugin_2.12-1.7.0.jar"
-      }
-    ],
-    "default": false
-  }
-]

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.3
+sbt.version=1.12.9

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,11 +1,11 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.geirsson"     % "sbt-scalafmt" % "1.4.0")
+addSbtPlugin("org.scalameta"           % "sbt-scalafmt"       % "2.6.0")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"    % "1.3.13")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl"          % "2.0.9")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly" % "0.14.5")
+addSbtPlugin("com.eed3si9n"            % "sbt-assembly"       % "2.3.1")
-//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
+addSbtPlugin("org.scalatra.sbt"        % "sbt-scalatra"       % "1.0.4")
-//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+addSbtPlugin("com.github.sbt"          % "sbt-pgp"            % "2.3.1")
-addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.1")
+addSbtPlugin("com.github.sbt"          % "sbt-license-report" % "1.9.0")
-addSbtPlugin("com.jsuereth"     % "sbt-pgp"      % "1.1.0")
+addSbtPlugin("org.scoverage"           % "sbt-scoverage"      % "2.4.4")
-addSbtCoursier
+
-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,109 @@
-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");
+        String jettyIdleTimeout = getEnvironmentVariable("gitbucket.jettyIdleTimeout");
+        boolean saveSessions = false;
 
         for(String arg: args) {
+            if (arg.equals("--save_sessions")) {
+                saveSessions = true;
+            }
+            if (arg.equals("--disable_news_feed")) {
+                System.setProperty("gitbucket.disableNewsFeed", "true");
+            }
+            if (arg.equals("--disable_cache")) {
+                System.setProperty("gitbucket.disableCache", "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 +114,100 @@ public class JettyLauncher {
                         case "--plugin_dir":
                             System.setProperty("gitbucket.pluginDir", dim[1]);
                             break;
-                        case "--validate_password":
+                        case "--jetty_idle_timeout":
-                            System.setProperty("gitbucket.validate.password", dim[1]);
+                            jettyIdleTimeout = dim[1];
                             break;
                     }
                 }
             }
         }
 
-        if(host != null) {
+        if (contextPath != null && !contextPath.startsWith("/")) {
-            address = new InetSocketAddress(host, port);
+            contextPath = "/" + contextPath;
+        }
+
+        final String hostName = InetAddress.getByName(fallback(host, Defaults.HOST)).getHostName();
+
+        final Server server = new Server();
+
+        final Set<String> connectorsSet = Stream.of(fallback(connectors, Defaults.CONNECTORS)
+            .toLowerCase().split(",")).map(String::trim).collect(toSet());
+
+        final List<ServerConnector> connectorInstances = new ArrayList<>();
+
+        final HttpConfiguration httpConfig = new HttpConfiguration();
+        httpConfig.setSendServerVersion(false);
+        if (connectorsSet.contains(Connectors.HTTPS)) {
+            httpConfig.setSecurePort(fallback(securePort, Defaults.HTTPS_PORT, Integer::parseInt));
+        }
+        if (jettyIdleTimeout != null && jettyIdleTimeout.trim().length() != 0) {
+            httpConfig.setIdleTimeout(Long.parseLong(jettyIdleTimeout.trim()));
         } else {
-            address = new InetSocketAddress(port);
+            httpConfig.setIdleTimeout(300000L); // default is 5min
         }
 
-        Server server = new Server(address);
+        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));
 
-//        SelectChannelConnector connector = new SelectChannelConnector();
+            connectorInstances.add(connector);
-//        if(host != null) {
-//            connector.setHost(host);
-//        }
-//        connector.setMaxIdleTime(1000 * 60 * 60);
-//        connector.setSoLingerTime(-1);
-//        connector.setPort(port);
-//        server.addConnector(connector);
-
-        // Disabling Server header
-        for (Connector connector : server.getConnectors()) {
-            for (ConnectionFactory factory : connector.getConnectionFactories()) {
-                if (factory instanceof HttpConnectionFactory) {
-                    ((HttpConnectionFactory) factory).getHttpConfiguration().setSendServerVersion(false);
-                }
-            }
         }
 
+        if (connectorsSet.contains(Connectors.HTTPS)) {
+            final SslContextFactory.Server 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 +227,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 +259,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.11.0
+gist:4.24.0
+emoji:4.6.0
+pages:1.10.0

src/main/resources/logback-dev.xml

@@ -7,7 +7,7 @@
   </appender>
 
   <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <file>gitbucket.log</file>
+    <file>.tmp/gitbucket.log</file>
     <encoder>
       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
@@ -23,4 +23,4 @@
   <logger name="scala.slick.jdbc.JdbcBackend.statement" level="DEBUG" />
   -->
 
-</configuration>
+</configuration>

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

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

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"/>
 
   <!--================================================================================================-->
@@ -242,7 +237,7 @@
   <addForeignKeyConstraint constraintName="IDX_ISSUE_ID_FK1" baseTableName="ISSUE_ID" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
 
   <!--================================================================================================-->
-  <!-- ISSUE_ID -->
+  <!-- ISSUE_LABEL -->
   <!--================================================================================================-->
   <createTable tableName="ISSUE_LABEL">
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
@@ -348,4 +343,28 @@
   <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>
+  <!--================================================================================================-->
+  <!-- ISSUE_OUTLINE_VIEW -->
+  <!--================================================================================================-->
+  <sql>
+    CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+      SELECT
+        A.USER_NAME,
+        A.REPOSITORY_NAME,
+        A.ISSUE_ID,
+        COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT
+      FROM ISSUE A
+      LEFT OUTER JOIN (
+        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+        WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+      ) B
+      ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
+      LEFT OUTER JOIN (
+        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
+        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+      ) C
+      ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID)
+  </sql>
+
+</changeSet>

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

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

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

@@ -35,4 +35,28 @@
     <column name="URL" type="varchar(200)" nullable="false"/>
     <column name="EVENT" type="varchar(30)" nullable="false"/>
   </createTable>
+
+  <sql>
+    CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+      SELECT
+        A.USER_NAME,
+        A.REPOSITORY_NAME,
+        A.ISSUE_ID,
+        COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT,
+        COALESCE(D.ORDERING, 9999) AS PRIORITY
+      FROM ISSUE A
+      LEFT OUTER JOIN (
+        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+        WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+      ) B
+      ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
+      LEFT OUTER JOIN (
+        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
+        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+      ) C
+      ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID)
+      LEFT OUTER JOIN PRIORITY D
+      ON (A.PRIORITY_ID = D.PRIORITY_ID);
+  </sql>
 </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/resources/update/gitbucket-core_4.37.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT"/>
+  <modifyDataType columnName="URL" newDataType="varchar(400)" tableName="WEB_HOOK_EVENT"/>
+  <modifyDataType columnName="URL" newDataType="varchar(400)" tableName="WEB_HOOK"/>
+  <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"/>
+</changeSet>

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

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <!--================================================================================================-->
+  <!-- CUSTOM_FIELD -->
+  <!--================================================================================================-->
+  <createTable tableName="CUSTOM_FIELD">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="FIELD_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="FIELD_NAME" type="varchar(100)" nullable="false"/>
+    <column name="FIELD_TYPE" type="varchar(100)" nullable="false"/>
+    <column name="ENABLE_FOR_ISSUES" type="boolean" nullable="false"/>
+    <column name="ENABLE_FOR_PULL_REQUESTS" type="boolean" nullable="false"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_CUSTOM_FIELD_PK" tableName="CUSTOM_FIELD" columnNames="USER_NAME, REPOSITORY_NAME, FIELD_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_CUSTOM_FIELD_FK0" baseTableName="CUSTOM_FIELD" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+
+  <!--================================================================================================-->
+  <!-- ISSUE_CUSTOM_FIELD -->
+  <!--================================================================================================-->
+  <createTable tableName="ISSUE_CUSTOM_FIELD">
+    <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="FIELD_ID" type="int" nullable="false"/>
+    <column name="VALUE" type="varchar(200)" nullable="true"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_ISSUE_CUSTOM_FIELD_PK" tableName="ISSUE_CUSTOM_FIELD" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID, FIELD_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_ISSUE_CUSTOM_FIELD_FK0" baseTableName="ISSUE_CUSTOM_FIELD" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_ISSUE_CUSTOM_FIELD_FK1" baseTableName="ISSUE_CUSTOM_FIELD" baseColumnNames="USER_NAME, REPOSITORY_NAME, FIELD_ID" referencedTableName="CUSTOM_FIELD" referencedColumnNames="USER_NAME, REPOSITORY_NAME, FIELD_ID"/>
+
+  <!--================================================================================================-->
+  <!-- ISSUE_ASSIGNEE -->
+  <!--================================================================================================-->
+  <createTable tableName="ISSUE_ASSIGNEE">
+    <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="ASSIGNEE_USER_NAME" type="varchar(100)" nullable="false"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_ISSUE_ASSIGNEE_PK" tableName="ISSUE_ASSIGNEE" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID, ASSIGNEE_USER_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_ISSUE_ASSIGNEE_FK0" baseTableName="ISSUE_ASSIGNEE" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
+  <!--
+  <addForeignKeyConstraint constraintName="IDX_ISSUE_ASSIGNEE_FK1" baseTableName="ISSUE_ASSIGNEE" baseColumnNames="ASSIGNEE_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+  -->
+
+  <sql>
+    INSERT INTO ISSUE_ASSIGNEE (USER_NAME, REPOSITORY_NAME, ISSUE_ID, ASSIGNEE_USER_NAME)
+      SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, ASSIGNED_USER_NAME FROM ISSUE WHERE ASSIGNED_USER_NAME IS NOT NULL
+  </sql>
+
+  <dropColumn tableName="ISSUE" columnName="ASSIGNED_USER_NAME"/>
+</changeSet>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="CUSTOM_FIELD">
+    <column name="CONSTRAINTS" type="varchar(200)" nullable="true"/>
+  </addColumn>
+</changeSet>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <dropForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0" baseTableName="PROTECTED_BRANCH_REQUIRE_CONTEXT"/>
+  <dropPrimaryKey constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK" tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT"/>
+
+  <dropForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_FK0" baseTableName="PROTECTED_BRANCH"/>
+  <dropPrimaryKey constraintName="IDX_PROTECTED_BRANCH_PK" tableName="PROTECTED_BRANCH"/>
+
+  <modifyDataType columnName="DEFAULT_BRANCH" newDataType="varchar(255)" tableName="REPOSITORY"/>
+  <modifyDataType columnName="BRANCH" newDataType="varchar(255)" tableName="PULL_REQUEST"/>
+  <modifyDataType columnName="REQUEST_BRANCH" newDataType="varchar(255)" tableName="PULL_REQUEST"/>
+  <modifyDataType columnName="BRANCH" newDataType="varchar(255)" tableName="PROTECTED_BRANCH"/>
+  <modifyDataType columnName="BRANCH" newDataType="varchar(255)" tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT"/>
+
+  <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_PK" tableName="PROTECTED_BRANCH" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH"/>
+  <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_FK0" baseTableName="PROTECTED_BRANCH" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
+
+  <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>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <!--================================================================================================-->
+  <!-- PROTECTED_BRANCH -->
+  <!--================================================================================================-->
+  <addColumn tableName="PROTECTED_BRANCH">
+    <column name="REQUIRED_STATUS_CHECK" type="boolean" nullable="false" defaultValue="false"/>
+    <column name="RESTRICTIONS" type="boolean" nullable="false" defaultValue="false"/>
+  </addColumn>
+
+  <sql>
+    UPDATE PROTECTED_BRANCH SET REQUIRED_STATUS_CHECK = TRUE
+    WHERE EXISTS (SELECT * FROM PROTECTED_BRANCH_REQUIRE_CONTEXT
+    WHERE PROTECTED_BRANCH.USER_NAME       = PROTECTED_BRANCH_REQUIRE_CONTEXT.USER_NAME
+    AND PROTECTED_BRANCH.REPOSITORY_NAME = PROTECTED_BRANCH_REQUIRE_CONTEXT.REPOSITORY_NAME
+    AND PROTECTED_BRANCH.BRANCH          = PROTECTED_BRANCH_REQUIRE_CONTEXT.BRANCH)
+  </sql>
+
+  <!--================================================================================================-->
+  <!-- PROTECTED_BRANCH_RESTRICTIONS_USER -->
+  <!--================================================================================================-->
+  <createTable tableName="PROTECTED_BRANCH_RESTRICTION">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="BRANCH" type="varchar(100)" nullable="false"/>
+    <column name="ALLOWED_USER" type="varchar(255)" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_RESTRICTION_PK" tableName="PROTECTED_BRANCH_RESTRICTION" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH, ALLOWED_USER"/>
+  <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_RESTRICTION_FK0" baseTableName="PROTECTED_BRANCH_RESTRICTION" baseColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" referencedTableName="PROTECTED_BRANCH" referencedColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" onDelete="CASCADE" onUpdate="CASCADE"/>
+  <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_RESTRICTION_FK1" baseTableName="PROTECTED_BRANCH_RESTRICTION" baseColumnNames="ALLOWED_USER" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+</changeSet>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <!--================================================================================================-->
+  <!-- PULL_REQUEST -->
+  <!--================================================================================================-->
+  <addColumn tableName="PULL_REQUEST">
+    <column name="MERGED_COMMIT_IDS" type="text" nullable="true"/>
+  </addColumn>
+
+</changeSet>

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

@@ -1,2 +0,0 @@
--- DELETE COLLABORATORS IN GROUP REPOSITORIES
-DELETE FROM COLLABORATOR WHERE USER_NAME IN (SELECT USER_NAME FROM ACCOUNT WHERE GROUP_ACCOUNT = TRUE)

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

@@ -30,4 +30,9 @@
     <dropColumn tableName="REPOSITORY" columnName="ENABLE_WIKI"/>
     <dropColumn tableName="REPOSITORY" columnName="ALLOW_WIKI_EDITING"/>
     <dropColumn tableName="REPOSITORY" columnName="ENABLE_ISSUES"/>
+
+    <!-- DELETE COLLABORATORS IN GROUP REPOSITORIES -->
+    <sql>
+      DELETE FROM COLLABORATOR WHERE USER_NAME IN (SELECT USER_NAME FROM ACCOUNT WHERE GROUP_ACCOUNT = TRUE)
+    </sql>
 </changeSet>

src/main/scala/ScalatraBootstrap.scala

@@ -2,7 +2,6 @@ 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
@@ -16,7 +15,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
       context.getSessionCookieConfig.setSecure(true)
     }
 
-    // Register TransactionFilter and BasicAuthenticationFilter at first
+    // Register TransactionFilter at first
     context.addFilter("transactionFilter", new TransactionFilter)
     context
       .getFilterRegistration("transactionFilter")
@@ -28,7 +27,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
     context
       .getFilterRegistration("apiAuthenticationFilter")
-      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/*")
 
     // Register controllers
     context.mount(new PreProcessController, "/*")

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

@@ -1,16 +1,26 @@
 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
+import gitbucket.core.model.Activity
+import gitbucket.core.util.Directory.ActivityLog
+import gitbucket.core.util.JDBCUtil
+import io.github.gitbucket.solidbase.Solidbase
+import io.github.gitbucket.solidbase.migration.{LiquibaseMigration, Migration}
+import io.github.gitbucket.solidbase.model.{Module, Version}
+import org.json4s.{Formats, NoTypeHints}
+import org.json4s.jackson.Serialization
+import org.json4s.jackson.Serialization.write
+
+import java.util.logging.Level
+import scala.util.Using
 
 object GitBucketCoreModule
     extends Module(
       "gitbucket-core",
-      new Version(
+      new Version("4.0.0", new LiquibaseMigration("update/gitbucket-core_4.0.xml")),
-        "4.0.0",
-        new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
-        new SqlMigration("update/gitbucket-core_4.0.sql")
-      ),
       new Version("4.1.0"),
       new Version("4.2.0", new LiquibaseMigration("update/gitbucket-core_4.2.xml")),
       new Version("4.2.1"),
@@ -18,11 +28,7 @@ object GitBucketCoreModule
       new Version("4.4.0"),
       new Version("4.5.0"),
       new Version("4.6.0", new LiquibaseMigration("update/gitbucket-core_4.6.xml")),
-      new Version(
+      new Version("4.7.0", new LiquibaseMigration("update/gitbucket-core_4.7.xml")),
-        "4.7.0",
-        new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
-        new SqlMigration("update/gitbucket-core_4.7.sql")
-      ),
       new Version("4.7.1"),
       new Version("4.8"),
       new Version("4.9.0", new LiquibaseMigration("update/gitbucket-core_4.9.xml")),
@@ -31,11 +37,7 @@ object GitBucketCoreModule
       new Version("4.12.0"),
       new Version("4.12.1"),
       new Version("4.13.0"),
-      new Version(
+      new Version("4.14.0", new LiquibaseMigration("update/gitbucket-core_4.14.xml")),
-        "4.14.0",
-        new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
-        new SqlMigration("update/gitbucket-core_4.14.sql")
-      ),
       new Version("4.14.1"),
       new Version("4.15.0"),
       new Version("4.16.0"),
@@ -51,5 +53,78 @@ object GitBucketCoreModule
       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.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"),
+      new Version("4.37.0", new LiquibaseMigration("update/gitbucket-core_4.37.xml")),
+      new Version("4.37.1"),
+      new Version("4.37.2"),
+      new Version("4.38.0", new LiquibaseMigration("update/gitbucket-core_4.38.xml")),
+      new Version("4.38.1"),
+      new Version("4.38.2"),
+      new Version("4.38.3"),
+      new Version("4.38.4"),
+      new Version("4.39.0", new LiquibaseMigration("update/gitbucket-core_4.39.xml")),
+      new Version("4.40.0"),
+      new Version("4.41.0"),
+      new Version("4.42.0", new LiquibaseMigration("update/gitbucket-core_4.42.xml")),
+      new Version("4.42.1"),
+      new Version("4.43.0"),
+      new Version("4.44.0", new LiquibaseMigration("update/gitbucket-core_4.44.xml")),
+      new Version("4.45.0"),
+      new Version("4.46.0", new LiquibaseMigration("update/gitbucket-core_4.46.xml")),
+      new Version("4.46.1")
+    ) {
+  java.util.logging.Logger.getLogger("liquibase").setLevel(Level.SEVERE)
+}

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

@@ -0,0 +1,6 @@
+package gitbucket.core.api
+
+/**
+ * https://developer.github.com/v3/issues/labels/#add-labels-to-an-issue
+ */
+case class AddLabelsToAnIssue(labels: Seq[String])

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

@@ -6,10 +6,10 @@ 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(name: String, commit: ApiBranchCommit, protection: ApiBranchProtection)(
+case class ApiBranch(name: String, commit: ApiBranchCommit, protection: ApiBranchProtectionResponse)(
   repositoryName: RepositoryName
 ) extends FieldSerializable {
-  def _links =
+  val _links =
     Map(
       "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
       "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}")
@@ -22,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

@@ -1,54 +0,0 @@
-package gitbucket.core.api
-
-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]) {
-  def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
-}
-
-object ApiBranchProtection {
-
-  /** form for enabling-and-disabling-branch-protection */
-  case class EnablingAndDisabling(protection: ApiBranchProtection)
-
-  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection =
-    ApiBranchProtection(
-      enabled = info.enabled,
-      required_status_checks = Some(
-        Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)
-      )
-    )
-  val statusNone = Status(Off, Seq.empty)
-  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
-  sealed class EnforcementLevel(val name: String)
-  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) {
-        if (includeAdministrators) {
-          Everyone
-        } else {
-          NonAdmins
-        }
-      } else {
-        Off
-      }
-  }
-
-  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](
-    format =>
-      (
-        {
-          case JString("off")        => Off
-          case JString("non_admins") => NonAdmins
-          case JString("everyone")   => Everyone
-        }, {
-          case x: EnforcementLevel => JString(x.name)
-        }
-    )
-  )
-}

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

@@ -0,0 +1,21 @@
+package gitbucket.core.api
+
+/** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
+case class ApiBranchProtectionRequest(
+  enabled: Boolean,
+  required_status_checks: Option[ApiBranchProtectionRequest.Status],
+  restrictions: Option[ApiBranchProtectionRequest.Restrictions],
+  enforce_admins: Option[Boolean]
+)
+
+object ApiBranchProtectionRequest {
+
+  /** form for enabling-and-disabling-branch-protection */
+  case class EnablingAndDisabling(protection: ApiBranchProtectionRequest)
+
+  case class Status(
+    contexts: Seq[String]
+  )
+
+  case class Restrictions(users: Seq[String])
+}

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

@@ -0,0 +1,97 @@
+package gitbucket.core.api
+
+import gitbucket.core.service.ProtectedBranchService
+import org.json4s._
+
+/** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
+case class ApiBranchProtectionResponse(
+  url: Option[ApiPath], // for output
+  enabled: Boolean,
+  required_status_checks: Option[ApiBranchProtectionResponse.Status],
+  restrictions: Option[ApiBranchProtectionResponse.Restrictions],
+  enforce_admins: Option[ApiBranchProtectionResponse.EnforceAdmins]
+) {
+  def status: ApiBranchProtectionResponse.Status =
+    required_status_checks.getOrElse(ApiBranchProtectionResponse.statusNone)
+}
+
+object ApiBranchProtectionResponse {
+
+  case class EnforceAdmins(enabled: Boolean)
+
+//  /** form for enabling-and-disabling-branch-protection */
+//  case class EnablingAndDisabling(protection: ApiBranchProtectionResponse)
+
+  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtectionResponse =
+    ApiBranchProtectionResponse(
+      url = Some(
+        ApiPath(
+          s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection"
+        )
+      ),
+      enabled = info.enabled,
+      required_status_checks = info.contexts.map { contexts =>
+        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.enforceAdmins),
+          contexts,
+          Some(
+            ApiPath(
+              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks/contexts"
+            )
+          )
+        )
+      },
+      restrictions = info.restrictionsUsers.map { restrictionsUsers =>
+        Restrictions(restrictionsUsers)
+      },
+      enforce_admins = if (info.enabled) Some(EnforceAdmins(info.enforceAdmins)) else None
+    )
+
+  val statusNone: Status = 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) {
+        if (includeAdministrators) {
+          Everyone
+        } else {
+          NonAdmins
+        }
+      } else {
+        Off
+      }
+  }
+
+  case class Restrictions(users: Seq[String])
+
+  implicit val enforcementLevelSerializer: CustomSerializer[EnforcementLevel] =
+    new CustomSerializer[EnforcementLevel](format =>
+      (
+        {
+          case JString("off")        => Off
+          case JString("non_admins") => NonAdmins
+          case JString("everyone")   => Everyone
+        },
+        { case x: EnforcementLevel =>
+          JString(x.name)
+        }
+      )
+    )
+}

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

@@ -14,7 +14,8 @@ case class ApiComment(id: Int, user: ApiUser, body: String, created_at: Date, up
   isPullRequest: Boolean
 ) {
   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}"
   )
 }
 

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

@@ -21,23 +21,15 @@ case class ApiCommit(
   modified: List[String],
   author: ApiPersonIdent,
   committer: ApiPersonIdent
-)(repositoryName: RepositoryName, urlIsHtmlUrl: Boolean)
+)(repositoryName: RepositoryName)
     extends FieldSerializable {
-  val url = if (urlIsHtmlUrl) {
+  val url = ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
-    ApiPath(s"/${repositoryName.fullName}/commit/${id}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/commit/${id}")
-  } else {
-    ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
-  }
-  val html_url = if (urlIsHtmlUrl) {
-    None
-  } else {
-    Some(ApiPath(s"/${repositoryName.fullName}/commit/${id}"))
-  }
 }
 
 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)
+    val diffs = JGitUtil.getDiffs(git = git, from = None, to = commit.id, fetchContent = false, makePatch = false)
     ApiCommit(
       id = commit.id,
       message = commit.fullMessage,
@@ -53,8 +45,6 @@ object ApiCommit {
       },
       author = ApiPersonIdent.author(commit),
       committer = ApiPersonIdent.committer(commit)
-    )(repositoryName, urlIsHtmlUrl)
+    )(repositoryName)
   }
-  def forWebhookPayload(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit =
-    apply(git, repositoryName, commit, true)
 }

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

@@ -69,7 +69,8 @@ object ApiCommits {
       }
 
       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,
@@ -97,8 +98,8 @@ object ApiCommits {
     ApiCommits(
       url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
       sha = commitInfo.id,
-      html_url = ApiPath(s"${repositoryName.fullName}/commit/${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),
@@ -106,7 +107,9 @@ object ApiCommits {
         message = commitInfo.shortMessage,
         comment_count = commentCount,
         tree = Tree(
-          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${commitInfo.id}"), // TODO This endpoint has not been implemented yet.
+          url = ApiPath(
+            s"/api/v3/repos/${repositoryName.fullName}/tree/${commitInfo.id}"
+          ), // TODO This endpoint has not been implemented yet.
           sha = commitInfo.id
         )
       ),
@@ -114,7 +117,9 @@ object ApiCommits {
       committer = ApiUser(committer),
       parents = commitInfo.parents.map { parent =>
         Tree(
-          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${parent}"), // TODO This endpoint has not been implemented yet.
+          url = ApiPath(
+            s"/api/v3/repos/${repositoryName.fullName}/tree/${parent}"
+          ), // TODO This endpoint has not been implemented yet.
           sha = parent
         )
       },

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

@@ -22,16 +22,15 @@ object ApiContents {
       ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)
     } else {
       content
-        .map(
+        .map(arr =>
-          arr =>
+          ApiContents(
-            ApiContents(
+            "file",
-              "file",
+            fileInfo.name,
-              fileInfo.name,
+            fileInfo.path,
-              fileInfo.path,
+            fileInfo.id.getName,
-              fileInfo.commitId,
+            Some(Base64.getEncoder.encodeToString(arr)),
-              Some(Base64.getEncoder.encodeToString(arr)),
+            Some("base64")
-              Some("base64")
+          )(repositoryName)
-            )(repositoryName)
         )
         .getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
     }

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

@@ -12,14 +12,19 @@ case class ApiIssue(
   number: Int,
   title: String,
   user: ApiUser,
+  assignees: List[ApiUser],
   labels: List[ApiLabel],
   state: String,
   created_at: Date,
   updated_at: Date,
-  body: String
+  body: String,
+  milestone: Option[ApiMilestone]
 )(repositoryName: RepositoryName, isPullRequest: Boolean) {
+  val id = 0 // dummy id
+  val assignee = assignees.headOption
   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(
@@ -35,13 +40,23 @@ case class ApiIssue(
 }
 
 object ApiIssue {
-  def apply(issue: Issue, repositoryName: RepositoryName, user: ApiUser, labels: List[ApiLabel]): ApiIssue =
+  def apply(
+    issue: Issue,
+    repositoryName: RepositoryName,
+    user: ApiUser,
+    assignees: List[ApiUser],
+    labels: List[ApiLabel],
+    milestone: Option[ApiMilestone]
+  ): ApiIssue =
     ApiIssue(
       number = issue.issueId,
       title = issue.title,
       user = user,
+      assignees = assignees,
       labels = labels,
-      state = if (issue.closed) { "closed" } else { "open" },
+      milestone = milestone,
+      state = if (issue.closed) { "closed" }
+      else { "open" },
       body = issue.content.getOrElse(""),
       created_at = issue.registeredDate,
       updated_at = issue.updatedDate

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

@@ -1,6 +1,6 @@
 package gitbucket.core.api
 
-import gitbucket.core.plugin.{PluginRegistry, PluginInfo}
+import gitbucket.core.plugin.PluginInfo
 
 case class ApiPlugin(
   id: String,

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

@@ -21,13 +21,16 @@ case class ApiPullRequest(
   body: String,
   user: ApiUser,
   labels: List[ApiLabel],
-  assignee: Option[ApiUser]
+  assignees: List[ApiUser],
+  draft: Option[Boolean]
 ) {
+  val id = 0 // dummy id
+  val assignee = assignees.headOption
   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 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 patch_url           = ApiPath(s"${base.repo.html_url.path}/pull/${number}.patch")
   val url = ApiPath(s"${base.repo.url.path}/pulls/${number}")
-  //val issue_url           = ApiPath(s"${base.repo.url.path}/issues/${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 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}")
@@ -43,7 +46,7 @@ object ApiPullRequest {
     baseRepo: ApiRepository,
     user: ApiUser,
     labels: List[ApiLabel],
-    assignee: Option[ApiUser],
+    assignees: List[ApiUser],
     mergedComment: Option[(IssueComment, Account)]
   ): ApiPullRequest =
     ApiPullRequest(
@@ -61,11 +64,13 @@ object ApiPullRequest {
       body = issue.content.getOrElse(""),
       user = user,
       labels = labels,
-      assignee = assignee
+      assignees = assignees,
+      draft = Some(pullRequest.isDraft)
     )
 
   case class Commit(sha: String, ref: String, repo: ApiRepository)(baseOwner: String) {
-    val label = if (baseOwner == repo.owner.login) { ref } else { s"${repo.owner.login}:${ref}" }
+    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,7 +17,7 @@ case class ApiPullRequestReviewComment(
   commit_id: String, // "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   user: ApiUser,
-  body: String, // "Maybe you should use more emojji on this line.",
+  body: String, // "Maybe you should use more emoji on this line.",
   created_at: Date, // "2015-05-05T23:40:27Z",
   updated_at: Date // "2015-05-05T23:40:27Z",
 )(repositoryName: RepositoryName, issueId: Int)

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

@@ -1,5 +1,55 @@
 package gitbucket.core.api
 
-case class ApiObject(sha: String)
+import gitbucket.core.util.JGitUtil.TagInfo
+import gitbucket.core.util.RepositoryName
+import org.eclipse.jgit.lib.Ref
 
-case class ApiRef(ref: String, `object`: ApiObject)
+case class ApiRefCommit(
+  sha: String,
+  `type`: String,
+  url: ApiPath
+)
+
+case class ApiRef(
+  ref: String,
+  node_id: String = "",
+  url: ApiPath,
+  `object`: ApiRefCommit,
+)
+
+object ApiRef {
+
+  def fromRef(
+    repositoryName: RepositoryName,
+    ref: Ref
+  ): ApiRef =
+    ApiRef(
+      ref = ref.getName,
+      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/${ref.getName}"),
+      `object` = ApiRefCommit(
+        sha = ref.getObjectId.getName,
+        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${ref.getObjectId.getName}"),
+        `type` = "commit"
+      )
+    )
+
+  def fromTag(
+    repositoryName: RepositoryName,
+    tagInfo: TagInfo
+  ): ApiRef =
+    ApiRef(
+      ref = s"refs/tags/${tagInfo.name}",
+      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/refs/tags/${tagInfo.name}"),
+      // the GH api distinguishes between "releases" and plain git tags
+      // for "releases", the api returns a reference to the release object (with type `tag`)
+      // this would be something like s"/api/v3/repos/${repositoryName.fullName}/git/tags/<hash-of-tag>"
+      // with a hash for the tag, which I do not fully understand
+      // since this is not yet implemented in GB, we always return a link to the plain `commit` object,
+      // which GH does for tags that are not annotated
+      `object` = ApiRefCommit(
+        sha = tagInfo.objectId,
+        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${tagInfo.objectId}"),
+        `type` = "commit"
+      )
+    )
+}

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

@@ -12,19 +12,16 @@ case class ApiRepository(
   forks: Int,
   `private`: Boolean,
   default_branch: String,
-  owner: ApiUser
+  owner: ApiUser,
-)(urlIsHtmlUrl: Boolean) {
+  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 ssh_url = Some(SshPath(s":${full_name}.git"))
+  val ssh_url = Some(SshPath(s"/${full_name}.git"))
 }
 
 object ApiRepository {
@@ -32,8 +29,7 @@ object ApiRepository {
     repository: Repository,
     owner: ApiUser,
     forkedCount: Int = 0,
-    watchers: Int = 0,
+    watchers: Int = 0
-    urlIsHtmlUrl: Boolean = false
   ): ApiRepository =
     ApiRepository(
       name = repository.repositoryName,
@@ -43,17 +39,19 @@ object ApiRepository {
       forks = forkedCount,
       `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(
@@ -63,7 +61,8 @@ object ApiRepository {
       watchers = 0,
       forks = 0,
       `private` = false,
-      default_branch = "master",
+      default_branch = "main",
-      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

@@ -5,6 +5,7 @@ import gitbucket.core.model.Account
 import java.util.Date
 
 case class ApiUser(login: String, email: String, `type`: String, site_admin: Boolean, created_at: Date) {
+  val id = 0 // dummy id
   val url = ApiPath(s"/api/v3/users/${login}")
   val html_url = ApiPath(s"/${login}")
   val avatar_url = ApiPath(s"/${login}/_avatar")
@@ -23,7 +24,8 @@ object ApiUser {
   def apply(user: Account): ApiUser = ApiUser(
     login = user.userName,
     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/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/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/CreateAUser.scala

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

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

@@ -15,15 +15,15 @@ object JsonFormat {
 
   val parserISO = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
-  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](
+  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](format =>
-    format =>
+    (
-      (
+      { case JString(s) =>
-        {
+        Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date"))
-          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 x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
     )
   ) + FieldSerializer[ApiUser]() +
+    FieldSerializer[ApiGroup]() +
     FieldSerializer[ApiPullRequest]() +
     FieldSerializer[ApiRepository]() +
     FieldSerializer[ApiCommitListItem.Parent]() +
@@ -42,32 +42,37 @@ object JsonFormat {
     FieldSerializer[ApiCommits.Tree]() +
     FieldSerializer[ApiCommits.Stats]() +
     FieldSerializer[ApiCommits.File]() +
-    ApiBranchProtection.enforcementLevelSerializer
+    FieldSerializer[ApiRelease]() +
+    FieldSerializer[ApiReleaseAsset]() +
+    ApiBranchProtectionResponse.enforcementLevelSerializer
 
   def apiPathSerializer(c: Context) =
-    new CustomSerializer[ApiPath](
+    new CustomSerializer[ApiPath](_ =>
-      _ =>
+      (
-        ({
+        {
           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)
+        { case ApiPath(path) =>
-        })
+          JString(c.baseUrl + path)
+        }
+      )
     )
 
   def sshPathSerializer(c: Context) =
-    new CustomSerializer[SshPath](
+    new CustomSerializer[SshPath](_ =>
-      _ =>
+      (
-        ({
+        {
           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) =>
+        { case SshPath(path) =>
-            c.sshUrl.map { sshUrl =>
+          c.sshUrl.map { sshUrl =>
-              JString(sshUrl + path)
+            JString(sshUrl + path)
-            } getOrElse JNothing
+          } getOrElse JNothing
-        })
+        }
+      )
     )
 
   /**

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,27 +1,30 @@
 package gitbucket.core.controller
 
-import gitbucket.core.api._
+import gitbucket.core.api.*
-import gitbucket.core.model._
+import gitbucket.core.controller.api.*
-import gitbucket.core.service.IssuesService.IssueSearchCondition
+import gitbucket.core.service.*
-import gitbucket.core.service.PullRequestService._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.service._
+import gitbucket.core.util.*
-import gitbucket.core.util.Directory._
-import gitbucket.core.util.Implicits._
-import gitbucket.core.util.JGitUtil._
-import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util._
 import gitbucket.core.plugin.PluginRegistry
-import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.revwalk.RevWalk
-import org.scalatra.{Created, NoContent, UnprocessableEntity}
-
-import scala.collection.JavaConverters._
-import scala.concurrent.Await
-import scala.concurrent.duration.Duration
 
 class ApiController
     extends ApiControllerBase
+    with ApiGitReferenceControllerBase
+    with ApiIssueCommentControllerBase
+    with ApiIssueControllerBase
+    with ApiIssueLabelControllerBase
+    with ApiIssueMilestoneControllerBase
+    with ApiOrganizationControllerBase
+    with ApiPullRequestControllerBase
+    with ApiReleaseControllerBase
+    with ApiRepositoryBranchControllerBase
+    with ApiRepositoryCollaboratorControllerBase
+    with ApiRepositoryCommitControllerBase
+    with ApiRepositoryContentsControllerBase
+    with ApiRepositoryControllerBase
+    with ApiRepositoryStatusControllerBase
+    with ApiRepositoryWebhookControllerBase
+    with ApiUserControllerBase
     with RepositoryService
     with AccountService
     with ProtectedBranchService
@@ -31,42 +34,29 @@ class ApiController
     with PullRequestService
     with CommitsService
     with CommitStatusService
+    with ReleaseService
     with RepositoryCreationService
+    with RepositoryCommitFileService
     with IssueCreationService
     with HandleCommentService
+    with MergeService
     with WebHookService
     with WebHookPullRequestService
     with WebHookIssueCommentService
+    with WebHookPullRequestReviewCommentService
     with WikiService
     with ActivityService
     with PrioritiesService
+    with AdminAuthenticator
     with OwnerAuthenticator
     with UsersAuthenticator
     with GroupManagerAuthenticator
     with ReferrerAuthenticator
     with ReadableUsersAuthenticator
     with WritableUsersAuthenticator
+    with RequestCache
 
 trait ApiControllerBase extends ControllerBase {
-  self: RepositoryService
-    with AccountService
-    with ProtectedBranchService
-    with IssuesService
-    with LabelsService
-    with MilestonesService
-    with PullRequestService
-    with CommitsService
-    with CommitStatusService
-    with RepositoryCreationService
-    with IssueCreationService
-    with HandleCommentService
-    with PrioritiesService
-    with OwnerAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /**
    * 404 for non-implemented api
@@ -74,6 +64,18 @@ trait ApiControllerBase extends ControllerBase {
   get("/api/v3/*") {
     NotFound()
   }
+  post("/api/v3/*") {
+    NotFound()
+  }
+  put("/api/v3/*") {
+    NotFound()
+  }
+  delete("/api/v3/*") {
+    NotFound()
+  }
+  patch("/api/v3/*") {
+    NotFound()
+  }
 
   /**
    * https://developer.github.com/v3/#root-endpoint
@@ -82,311 +84,6 @@ trait ApiControllerBase extends ControllerBase {
     JsonFormat(ApiEndPoint())
   }
 
-  /**
-   * https://developer.github.com/v3/orgs/#get-an-organization
-   */
-  get("/api/v3/orgs/:groupName") {
-    getAccountByUserName(params("groupName")).filter(account => account.isGroupAccount).map { account =>
-      JsonFormat(ApiUser(account))
-    } getOrElse NotFound()
-  }
-
-  /**
-   * https://developer.github.com/v3/users/#get-a-single-user
-   * This API also returns group information (as GitHub).
-   */
-  get("/api/v3/users/:userName") {
-    getAccountByUserName(params("userName")).map { account =>
-      JsonFormat(ApiUser(account))
-    } getOrElse NotFound()
-  }
-
-  /**
-   * https://developer.github.com/v3/repos/#list-organization-repositories
-   */
-  get("/api/v3/orgs/:orgName/repos") {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("orgName"))).map { r =>
-      ApiRepository(r, getAccountByUserName(r.owner).get)
-    })
-  }
-
-  /**
-   * https://developer.github.com/v3/repos/#list-user-repositories
-   */
-  get("/api/v3/users/:userName/repos") {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("userName"))).map { r =>
-      ApiRepository(r, getAccountByUserName(r.owner).get)
-    })
-  }
-
-  /*
-   * https://developer.github.com/v3/repos/branches/#list-branches
-   */
-  get("/api/v3/repos/:owner/: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 =>
-    getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch))
-  })
-
-  /*
-   * https://developer.github.com/v3/repos/contents/#get-contents
-   */
-  get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
-    getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
-  })
-
-  private def getContents(repository: RepositoryService.RepositoryInfo, path: String, refStr: String) = {
-    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
-      val (dirName, fileName) = pathStr.lastIndexOf('/') match {
-        case -1 =>
-          (".", pathStr)
-        case n =>
-          (pathStr.take(n), pathStr.drop(n + 1))
-      }
-      getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
-    }
-
-    using(Git.open(getRepositoryDir(params("owner"), params("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.
@@ -397,459 +94,6 @@ trait ApiControllerBase extends ControllerBase {
     org.scalatra.NotFound(ApiError("Rate limiting is not enabled."))
   }
 
-  /**
-   * https://developer.github.com/v3/issues/#list-issues-for-a-repository
-   */
-  get("/api/v3/repos/:owner/:repository/issues")(referrersOnly { repository =>
-    val page = IssueSearchCondition.page(request)
-    // TODO: more api spec condition
-    val condition = IssueSearchCondition(request)
-    val baseOwner = getAccountByUserName(repository.owner).get
-
-    val issues: List[(Issue, Account)] =
-      searchIssueByApi(
-        condition = condition,
-        offset = (page - 1) * PullRequestLimit,
-        limit = PullRequestLimit,
-        repos = repository.owner -> repository.name
-      )
-
-    JsonFormat(issues.map {
-      case (issue, issueUser) =>
-        ApiIssue(
-          issue = issue,
-          repositoryName = RepositoryName(repository),
-          user = ApiUser(issueUser),
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-            .map(ApiLabel(_, RepositoryName(repository)))
-        )
-    })
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/#get-a-single-issue
-   */
-  get("/api/v3/repos/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      openedUser <- getAccountByUserName(issue.openedUserName)
-    } yield {
-      JsonFormat(
-        ApiIssue(
-          issue,
-          RepositoryName(repository),
-          ApiUser(openedUser),
-          getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository)))
-        )
-      )
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/#create-an-issue
-   */
-  post("/api/v3/repos/:owner/:repository/issues")(readableUsersOnly { repository =>
-    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-      (for {
-        data <- extractFromJsonBody[CreateAnIssue]
-        loginAccount <- context.loginAccount
-      } yield {
-        val milestone = data.milestone.flatMap(getMilestone(repository.owner, repository.name, _))
-        val issue = createIssue(
-          repository,
-          data.title,
-          data.body,
-          data.assignees.headOption,
-          milestone.map(_.milestoneId),
-          None,
-          data.labels,
-          loginAccount
-        )
-        JsonFormat(
-          ApiIssue(
-            issue,
-            RepositoryName(repository),
-            ApiUser(loginAccount),
-            getIssueLabels(repository.owner, repository.name, issue.issueId)
-              .map(ApiLabel(_, RepositoryName(repository)))
-          )
-        )
-      }) getOrElse NotFound()
-    } else Unauthorized()
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
-   */
-  get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      comments = getCommentsForApi(repository.owner, repository.name, issueId)
-    } yield {
-      JsonFormat(comments.map {
-        case (issueComment, user, issue) =>
-          ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest)
-      })
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/comments/#create-a-comment
-   */
-  post("/api/v3/repos/:owner/:repository/issues/:id/comments")(readableUsersOnly { repository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      body <- extractFromJsonBody[CreateAComment].map(_.body) if !body.isEmpty
-      action = params.get("action").filter(_ => isEditable(issue.userName, issue.repositoryName, issue.openedUserName))
-      (issue, id) <- handleComment(issue, Some(body), repository, action)
-      issueComment <- getComment(repository.owner, repository.name, id.toString())
-    } yield {
-      JsonFormat(
-        ApiComment(
-          issueComment,
-          RepositoryName(repository),
-          issueId,
-          ApiUser(context.loginAccount.get),
-          issue.isPullRequest
-        )
-      )
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * List all labels for this repository
-   * https://developer.github.com/v3/issues/labels/#list-all-labels-for-this-repository
-   */
-  get("/api/v3/repos/:owner/:repository/labels")(referrersOnly { repository =>
-    JsonFormat(getLabels(repository.owner, repository.name).map { label =>
-      ApiLabel(label, RepositoryName(repository))
-    })
-  })
-
-  /**
-   * Get a single label
-   * https://developer.github.com/v3/issues/labels/#get-a-single-label
-   */
-  get("/api/v3/repos/:owner/:repository/labels/:labelName")(referrersOnly { repository =>
-    getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-      JsonFormat(ApiLabel(label, RepositoryName(repository)))
-    } getOrElse NotFound()
-  })
-
-  /**
-   * Create a label
-   * https://developer.github.com/v3/issues/labels/#create-a-label
-   */
-  post("/api/v3/repos/:owner/:repository/labels")(writableUsersOnly { repository =>
-    (for {
-      data <- extractFromJsonBody[CreateALabel] if data.isValid
-    } yield {
-      LockUtil.lock(RepositoryName(repository).fullName) {
-        if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
-          val labelId = createLabel(repository.owner, repository.name, data.name, data.color)
-          getLabel(repository.owner, repository.name, labelId).map { label =>
-            Created(JsonFormat(ApiLabel(label, RepositoryName(repository))))
-          } getOrElse NotFound()
-        } else {
-          // TODO ApiError should support errors field to enhance compatibility of GitHub API
-          UnprocessableEntity(
-            ApiError(
-              "Validation Failed",
-              Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-            )
-          )
-        }
-      }
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * Update a label
-   * https://developer.github.com/v3/issues/labels/#update-a-label
-   */
-  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
-    (for {
-      data <- extractFromJsonBody[CreateALabel] if data.isValid
-    } yield {
-      LockUtil.lock(RepositoryName(repository).fullName) {
-        getLabel(repository.owner, repository.name, params("labelName")).map {
-          label =>
-            if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
-              updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
-              JsonFormat(
-                ApiLabel(
-                  getLabel(repository.owner, repository.name, label.labelId).get,
-                  RepositoryName(repository)
-                )
-              )
-            } else {
-              // TODO ApiError should support errors field to enhance compatibility of GitHub API
-              UnprocessableEntity(
-                ApiError(
-                  "Validation Failed",
-                  Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-                )
-              )
-            }
-        } getOrElse NotFound()
-      }
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * Delete a label
-   * https://developer.github.com/v3/issues/labels/#delete-a-label
-   */
-  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
-    LockUtil.lock(RepositoryName(repository).fullName) {
-      getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-        deleteLabel(repository.owner, repository.name, label.labelId)
-        NoContent()
-      } getOrElse NotFound()
-    }
-  })
-
-  /**
-   * https://developer.github.com/v3/pulls/#list-pull-requests
-   */
-  get("/api/v3/repos/:owner/:repository/pulls")(referrersOnly { repository =>
-    val page = IssueSearchCondition.page(request)
-    // TODO: more api spec condition
-    val condition = IssueSearchCondition(request)
-    val baseOwner = getAccountByUserName(repository.owner).get
-
-    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] =
-      searchPullRequestByApi(
-        condition = condition,
-        offset = (page - 1) * PullRequestLimit,
-        limit = PullRequestLimit,
-        repos = repository.owner -> repository.name
-      )
-
-    JsonFormat(issues.map {
-      case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
-        ApiPullRequest(
-          issue = issue,
-          pullRequest = pullRequest,
-          headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
-          baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
-          user = ApiUser(issueUser),
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-            .map(ApiLabel(_, RepositoryName(repository))),
-          assignee = assignee.map(ApiUser.apply),
-          mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-        )
-    })
-  })
-
-  /**
-   * https://developer.github.com/v3/pulls/#get-a-single-pull-request
-   */
-  get("/api/v3/repos/:owner/:repository/pulls/:id")(referrersOnly { repository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
-      users = getAccountsByUserNames(
-        Set(repository.owner, pullRequest.requestUserName, issue.openedUserName),
-        Set.empty
-      )
-      baseOwner <- users.get(repository.owner)
-      headOwner <- users.get(pullRequest.requestUserName)
-      issueUser <- users.get(issue.openedUserName)
-      assignee = issue.assignedUserName.flatMap { userName =>
-        getAccountByUserName(userName, false)
-      }
-      headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
-    } yield {
-      JsonFormat(
-        ApiPullRequest(
-          issue = issue,
-          pullRequest = pullRequest,
-          headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
-          baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
-          user = ApiUser(issueUser),
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-            .map(ApiLabel(_, RepositoryName(repository))),
-          assignee = assignee.map(ApiUser.apply),
-          mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-        )
-      )
-    }) getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
-   */
-  get("/api/v3/repos/:owner/:repository/pulls/:id/commits")(referrersOnly { repository =>
-    val owner = repository.owner
-    val name = repository.name
-    params("id").toIntOpt.flatMap {
-      issueId =>
-        getPullRequest(owner, name, issueId) map {
-          case (issue, pullreq) =>
-            using(Git.open(getRepositoryDir(owner, name))) { git =>
-              val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
-              val newId = git.getRepository.resolve(pullreq.commitIdTo)
-              val repoFullName = RepositoryName(repository)
-              val commits = git.log
-                .addRange(oldId, newId)
-                .call
-                .iterator
-                .asScala
-                .map { c =>
-                  ApiCommitListItem(new CommitInfo(c), repoFullName)
-                }
-                .toList
-              JsonFormat(commits)
-            }
-        }
-    } getOrElse NotFound()
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/#get
-   */
-  get("/api/v3/repos/:owner/:repository")(referrersOnly { repository =>
-    JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(repository.owner).get)))
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/statuses/#create-a-status
-   */
-  post("/api/v3/repos/:owner/: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()
-    }
-  })
-
   /**
    * non-GitHub compatible API for listing plugins
    */

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

@@ -1,32 +1,36 @@
 package gitbucket.core.controller
 
-import java.io.FileInputStream
+import java.io.{File, FileInputStream, FileOutputStream}
-
+import gitbucket.core.api.{ApiError, JsonFormat}
-import gitbucket.core.api.ApiError
 import gitbucket.core.model.Account
 import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.SyntaxSugars.*
-import gitbucket.core.util.Directory._
+import gitbucket.core.util.Directory.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util._
+import gitbucket.core.util.*
-import org.json4s._
+import org.json4s.*
-import org.scalatra._
+import org.scalatra.{MultiParams, *}
-import org.scalatra.i18n._
+import org.scalatra.i18n.*
-import org.scalatra.json._
+import org.scalatra.json.*
-import org.scalatra.forms._
+import org.scalatra.forms.*
+
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 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
 import org.eclipse.jgit.revwalk.RevCommit
-import org.eclipse.jgit.treewalk._
+import org.eclipse.jgit.treewalk.*
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
+import org.json4s.Formats
+import org.json4s.jackson.Serialization
+
+import java.nio.charset.StandardCharsets
 
 /**
  * Provides generic features for controller implementations.
@@ -42,10 +46,21 @@ abstract class ControllerBase
 
   private val logger = LoggerFactory.getLogger(getClass)
 
-  implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
+  implicit val jsonFormats: Formats = gitbucket.core.api.JsonFormat.jsonFormats
+
+  private case class HttpException(status: Int) extends RuntimeException
 
   before("/api/v3/*") {
     contentType = formats("json")
+    request.setAttribute(Keys.Request.APIv3, true)
+  }
+
+  override def multiParams(implicit request: HttpServletRequest): MultiParams = {
+    try {
+      super.multiParams
+    } catch {
+      case _: Exception => throw HttpException(400)
+    }
   }
 
   override def requestPath(uri: String, idx: Int): String = {
@@ -67,14 +82,11 @@ abstract class ControllerBase
         // Git repository
         chain.doFilter(request, response)
       } else {
-        if (path.startsWith("/api/v3/")) {
-          httpRequest.setAttribute(Keys.Request.APIv3, true)
-        }
         // Scalatra actions
         super.doFilter(request, response, chain)
       }
     } finally {
-      contextCache.remove();
+      contextCache.remove()
     }
 
   private val contextCache = new java.lang.ThreadLocal[Context]()
@@ -84,17 +96,24 @@ abstract class ControllerBase
    */
   implicit def context: Context = {
     contextCache.get match {
-      case null => {
+      case null =>
         val context = Context(loadSystemSettings(), LoginAccount, request)
         contextCache.set(context)
         context
-      }
       case context => context
     }
   }
 
-  private def LoginAccount: Option[Account] =
+  private def LoginAccount: Option[Account] = {
-    request.getAs[Account](Keys.Session.LoginAccount).orElse(session.getAs[Account](Keys.Session.LoginAccount))
+    request
+      .getAs[Account](Keys.Session.LoginAccount)
+      .orElse(session.getAs[Account](Keys.Session.LoginAccount))
+      .orElse {
+        if (isDevFeatureEnabled(DevFeatures.KeepSession)) {
+          getLoginAccountFromLocalFile()
+        } else None
+      }
+  }
 
   def ajaxGet(path: String)(action: => Any): Route =
     super.get(path) {
@@ -120,12 +139,12 @@ abstract class ControllerBase
       action(form)
     }
 
-  protected def NotFound() =
+  protected def NotFound(): ActionResult =
     if (request.hasAttribute(Keys.Request.Ajax)) {
       org.scalatra.NotFound()
     } 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"))
     }
@@ -140,12 +159,12 @@ abstract class ControllerBase
     }
   }
 
-  protected def Unauthorized()(implicit context: Context) =
+  protected def Unauthorized()(implicit context: Context): ActionResult =
     if (request.hasAttribute(Keys.Request.Ajax)) {
       org.scalatra.Unauthorized()
     } 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"))) {
       org.scalatra.Unauthorized()
     } else {
@@ -158,11 +177,8 @@ abstract class ControllerBase
           org.scalatra.Unauthorized(
             redirect(
               "/signin?redirect=" + StringUtil.urlEncode(
-                defining(request.getQueryString) { queryString =>
+                request.getRequestURI
-                  request.getRequestURI.substring(request.getContextPath.length) + (if (queryString != null)
+                  .substring(request.getContextPath.length) + Option(request.getQueryString).map("?" + _).getOrElse("")
-                                                                                      "?" + queryString
-                                                                                    else "")
-                }
               )
             )
           )
@@ -171,17 +187,18 @@ abstract class ControllerBase
     }
 
   error {
-    case e => {
+    case e: HttpException =>
+      ActionResult(e.status, (), Map.empty)
+    case e =>
       logger.error(s"Catch unhandled error in request: ${request}", e)
       if (request.hasAttribute(Keys.Request.Ajax)) {
         org.scalatra.InternalServerError()
       } else if (request.hasAttribute(Keys.Request.APIv3)) {
         contentType = formats("json")
-        org.scalatra.InternalServerError(ApiError("Internal Server Error"))
+        org.scalatra.InternalServerError(JsonFormat(ApiError("Internal Server Error")))
       } else {
         org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
       }
-    }
   }
 
   override def url(
@@ -193,7 +210,7 @@ abstract class ControllerBase
     withSessionId: Boolean = true
   )(implicit request: HttpServletRequest, response: HttpServletResponse): String =
     if (path.startsWith("http")) path
-    else baseUrl + super.url(path, params, false, false, false)
+    else baseUrl + super.url(path, params, includeContextPath = false, includeServletPath = false, absolutize = false)
 
   /**
    * Extends scalatra-form's trim rule to eliminate CR and LF.
@@ -237,12 +254,12 @@ abstract class ControllerBase
   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)
@@ -256,7 +273,7 @@ abstract class ControllerBase
     repository: RepositoryService.RepositoryInfo
   ): Unit = {
     JGitUtil.getObjectLoaderFromId(git, objectId) { loader =>
-      contentType = FileUtil.getMimeType(path)
+      contentType = FileUtil.getSafeMimeType(path, repository.repository.options.safeMode)
 
       if (loader.isLarge) {
         response.setContentLength(loader.getSize.toInt)
@@ -270,7 +287,7 @@ abstract class ControllerBase
           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 {
@@ -280,6 +297,47 @@ abstract class ControllerBase
       }
     }
   }
+
+  protected object DevFeatures {
+    val KeepSession = "keep-session"
+  }
+
+  private val loginAccountFile = new File(".tmp/login_account.json")
+
+  protected def isDevFeatureEnabled(feature: String): Boolean = {
+    Option(System.getProperty("dev-features")).getOrElse("").split(",").map(_.trim).contains(feature)
+  }
+
+  protected def getLoginAccountFromLocalFile(): Option[Account] = {
+    if (isDevFeatureEnabled(DevFeatures.KeepSession)) {
+      if (loginAccountFile.exists()) {
+        Using.resource(new FileInputStream(loginAccountFile)) { in =>
+          val json = IOUtils.toString(in, StandardCharsets.UTF_8)
+          val account = parse(json).extract[Account]
+          session.setAttribute(Keys.Session.LoginAccount, account)
+          Some(parse(json).extract[Account])
+        }
+      } else None
+
+    } else None
+  }
+
+  protected def saveLoginAccountToLocalFile(account: Account): Unit = {
+    if (isDevFeatureEnabled(DevFeatures.KeepSession)) {
+      if (!loginAccountFile.getParentFile.exists()) {
+        loginAccountFile.getParentFile.mkdirs()
+      }
+      Using.resource(new FileOutputStream(loginAccountFile)) { in =>
+        in.write(Serialization.write(account).getBytes(StandardCharsets.UTF_8))
+      }
+    }
+  }
+
+  protected def deleteLoginAccountFromLocalFile(): Unit = {
+    if (isDevFeatureEnabled(DevFeatures.KeepSession)) {
+      loginAccountFile.delete()
+    }
+  }
 }
 
 /**
@@ -290,18 +348,25 @@ case class Context(
   loginAccount: Option[Account],
   request: HttpServletRequest
 ) {
-  val path = settings.baseUrl.getOrElse(request.getContextPath)
+  val path: String = settings.baseUrl.getOrElse(request.getContextPath)
-  val currentPath = request.getRequestURI.substring(request.getContextPath.length)
+  val currentPath: String = request.getRequestURI.substring(request.getContextPath.length)
-  val baseUrl = settings.baseUrl(request)
+  val baseUrl: String = settings.baseUrl(request)
-  val host = new java.net.URL(baseUrl).getHost
+  val host: String = new java.net.URI(baseUrl).toURL.getHost
-  val platform = request.getHeader("User-Agent") match {
+  val platform: String = request.getHeader("User-Agent") match {
     case null                             => null
     case agent if agent.contains("Mac")   => "mac"
     case agent if agent.contains("Linux") => "linux"
     case agent if agent.contains("Win")   => "windows"
     case _                                => null
   }
-  val sidebarCollapse = request.getSession.getAttribute("sidebar-collapse") != null
+  val sidebarCollapse: Boolean = 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.
@@ -309,14 +374,14 @@ case class Context(
    * 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
-      }
     }
+  }
 
 }
 
@@ -326,30 +391,36 @@ case class Context(
 trait AccountManagementControllerBase extends ControllerBase {
   self: AccountService =>
 
+  private val logger = LoggerFactory.getLogger(getClass)
+
   protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
     if (clearImage) {
-      getAccountByUserName(userName).flatMap(_.image).map { image =>
+      getAccountByUserName(userName).flatMap(_.image).foreach { image =>
-        new 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
+      } catch {
-          .of(new java.io.File(getTemporaryDir(session.getId), fileId))
+        case e: Exception => logger.info("Error while updateImage" + e.getMessage)
-          .size(324, 324)
-          .toFile(new java.io.File(uploadDir, filename))
-        updateAvatarImage(userName, Some(filename))
       }
     }
 
   protected def uniqueUserName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value, true).map { _ =>
+      getAccountByUserNameIgnoreCase(value, true).map { _ =>
         "User already exists."
       }
   }
@@ -361,17 +432,48 @@ trait AccountManagementControllerBase extends ControllerBase {
       params: Map[String, Seq[String]],
       messages: Messages
     ): Option[String] = {
-      getAccountByMailAddress(value, true)
+      val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
-        .filter { x =>
+      if (
-          if (paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName)
+        extraMailAddresses.exists { case (k, v) =>
-        }
+          v.contains(value)
-        .map { _ =>
-          "Mail address is already registered."
         }
+      ) {
+        Some("These mail addresses are duplicated.")
+      } else {
+        getAccountByMailAddress(value, includeRemoved = true)
+          .collect {
+            case x if paramName.isEmpty || !params.optionValue(paramName).contains(x.userName) =>
+              "Mail address is already registered."
+          }
+      }
     }
   }
 
-  val allReservedNames = Set(
+  protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() {
+    override def validate(
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
+      if (
+        params.optionValue("mailAddress").contains(value) || extraMailAddresses.count { case (k, v) =>
+          v.contains(value)
+        } > 1
+      ) {
+        Some("These mail addresses are duplicated.")
+      } else {
+        getAccountByMailAddress(value, includeRemoved = true)
+          .collect {
+            case x if paramName.isEmpty || !params.optionValue(paramName).contains(x.userName) =>
+              "Mail address is already registered."
+          }
+      }
+    }
+  }
+
+  private val allReservedNames = Set(
     "git",
     "admin",
     "upload",
@@ -386,13 +488,13 @@ trait AccountManagementControllerBase extends ControllerBase {
     "groups",
     "new"
   )
-  protected def reservedNames(): Constraint = new Constraint() {
+
+  protected def reservedNames: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if (allReservedNames.contains(value)) {
+      if (allReservedNames.contains(value.toLowerCase)) {
-        Some(s"${value} is reserved")
+        Some(s"$value is reserved")
       } else {
         None
       }
   }
-
 }