Support for revert pull request

Update scalafmt-core to 3.9.7

.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

@@ -2,3 +2,4 @@
 
 build.sbt @xuwei-k
 project/* @xuwei-k
+.github/workflows/* @xuwei-k

.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 as you can*
-- *describe the problem and its symptoms*
-- *explain how to reproduce*
-- *attach whatever information that can help understanding the context (screen capture, log files)*

.github/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/workflows/build.yml

@@ -7,12 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
+      fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        java: [17, 21]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Cache
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v4
       env:
         cache-name: cache-sbt-libs
       with:
@@ -22,18 +23,20 @@ jobs:
           ~/.cache/coursier/v1
         key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }}
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: adopt
+    - name: Setup sbt launcher
+      uses: sbt/setup-sbt@v1
     - name: Run tests
-      run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
+      run: sbt scalafmtSbtCheck scalafmtCheckAll test
     - name: Scala 3
-      run: sbt '++ 3.0.1!' update # TODO
+      run: sbt '++ 3.x' update # TODO
     - name: Build executable
       run: sbt executable
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       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/*

.scala-steward.conf

@@ -3,5 +3,6 @@ updates.limit = 3
 updates.includeScala = true
 
 updates.pin = [
-  { groupId = "org.eclipse.jetty", version = "9." }
+  { groupId = "org.eclipse.jetty", version = "10." }
+  { groupId = "org.mariadb.jdbc", version = "2." }
 ]

.scalafmt.conf

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

CHANGELOG.md

@@ -1,32 +1,131 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-### 4.36.2 - 16 Aug 2021
+## 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 asignees
+
+## 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
+## 4.36.1 - 22 Jul 2021
 - Bump gitbucket-gist-plugin to 4.21.0
 
-### 4.36.0 - 17 Jul 2021
+## 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
+## 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
+## 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
+## 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
+## 4.35.0 - 25 Dec 2020
 - Editor and source viewer color theme
 - Auto completion for issues and pull requests
 - Upload image from clipboard

README.md

@@ -1,4 +1,4 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket/actions?query=workflow%3Abuild+branch%3Amaster) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
+GitBucket [![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:
@@ -10,8 +10,6 @@ GitBucket is a Git web platform powered by Scala offering:
 
 ![GitBucket](https://gitbucket.github.io/img/screenshots/screenshot-repository_viewer.png)
 
-You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/).
-
 Features
 --------
 The current version of GitBucket provides many features such as:
@@ -26,12 +24,12 @@ The current version of GitBucket provides many features such as:
 
 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 also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
+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.
 
 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).
 
@@ -58,21 +56,33 @@ 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 our [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.36.x
+What's New in 4.43.x
 -------------
-### 4.36.2 - 16 Aug 2021
+## 4.43.0 - 29 Jun 2025
-- Escape user name in avatar image tag
+- Upgrade H2 database from 1.x to 2.x
 
-### 4.36.1 - 22 Jul 2021
+Note that upgrading from h2 1.x to 2.x requires data file migration: https://www.h2database.com/html/migration-to-v2.html
-- Bump gitbucket-gist-plugin to 4.21.0
 
-### 4.36.0 - 17 Jul 2021
+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:
-- Tag selector in the repository viewer
+```bash
-- Link issues/pull requests of other repositories
+# Export database using the current version of H2
-- Files and lines can be linked in the diff view
+$ curl -O https://repo1.maven.org/maven2/com/h2database/h2/1.4.199/h2-1.4.199.jar
-- Option to disable XSS protection
+$ java -cp h2-1.4.199.jar org.h2.tools.Script -url "jdbc:h2:~/.gitbucket/data" -user sa -password sa -script dump.sql
 
-See the [change log](CHANGELOG.md) for all of the updates.
+# 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,86 +1,76 @@
-import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
 import com.jsuereth.sbtpgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.36.2"
+val GitBucketVersion = "4.43.0"
-val ScalatraVersion = "2.8.2"
+val ScalatraVersion = "3.1.2"
-val JettyVersion = "9.4.44.v20210927"
+val JettyVersion = "10.0.25"
-val JgitVersion = "5.13.0.202109080827-r"
+val JgitVersion = "6.10.1.202505221210-r"
 
 lazy val root = (project in file("."))
-  .enablePlugins(SbtTwirl, ScalatraPlugin)
+  .enablePlugins(SbtTwirl, ContainerPlugin)
 
 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.13.7"
+scalaVersion := "2.13.16"
 
-scalafmtOnCompile := true
+crossScalaVersions += "3.7.2"
+
+// scalafmtOnCompile := true
 
 coverageExcludedPackages := ".*\\.html\\..*"
 
-// dependency settings
-resolvers ++= Seq(
-  Classpaths.typesafeReleases,
-  Resolver.jcenterRepo,
-  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
-)
-
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
+  "org.eclipse.jgit"          % "org.eclipse.jgit.http.server" % JgitVersion,
-  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
+  "org.eclipse.jgit"          % "org.eclipse.jgit.archive"     % JgitVersion,
-  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"             %% "scalatra-javax"               % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"             %% "scalatra-json-javax"          % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"             %% "scalatra-forms-javax"         % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"              % "4.0.3" cross CrossVersion.for3Use2_13,
+  "org.json4s"               %% "json4s-jackson"               % "4.1.0-M8",
-  "commons-io"                      % "commons-io"                   % "2.11.0",
+  "commons-io"                % "commons-io"                   % "2.20.0",
-  "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
+  "io.github.gitbucket"       % "solidbase"                    % "1.1.0",
-  "io.github.gitbucket"             % "markedj"                      % "1.0.16",
+  "io.github.gitbucket"       % "markedj"                      % "1.0.20",
-  "org.apache.commons"              % "commons-compress"             % "1.21",
+  "org.tukaani"               % "xz"                           % "1.10",
-  "org.apache.commons"              % "commons-email"                % "1.5",
+  "org.apache.commons"        % "commons-compress"             % "1.28.0",
-  "commons-net"                     % "commons-net"                  % "3.8.0",
+  "org.apache.commons"        % "commons-email"                % "1.6.0",
-  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.13",
+  "commons-net"               % "commons-net"                  % "3.12.0",
-  "org.apache.sshd"                 % "apache-sshd"                  % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
+  "org.apache.httpcomponents" % "httpclient"                   % "4.5.14",
-  "org.apache.tika"                 % "tika-core"                    % "2.1.0",
+  "org.apache.sshd"           % "apache-sshd"                  % "2.15.0" exclude ("org.slf4j", "slf4j-jdk14") exclude (
-  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
+    "org.apache.sshd",
-  "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
+    "sshd-mina"
-  "com.h2database"                  % "h2"                           % "1.4.199",
+  ) exclude ("org.apache.sshd", "sshd-netty")
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.4",
+    exclude ("org.apache.sshd", "sshd-spring-sftp"),
-  "org.postgresql"                  % "postgresql"                   % "42.3.1",
+  "org.apache.tika"                 % "tika-core"                % "3.2.2",
-  "ch.qos.logback"                  % "logback-classic"              % "1.2.6",
+  "com.github.takezoe"             %% "blocking-slick"           % "0.0.14",
-  "com.zaxxer"                      % "HikariCP"                     % "4.0.3" exclude ("org.slf4j", "slf4j-api"),
+  "com.novell.ldap"                 % "jldap"                    % "2009-10-07",
-  "com.typesafe"                    % "config"                       % "1.4.1",
+  "com.h2database"                  % "h2"                       % "2.3.232",
-  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
+  "org.mariadb.jdbc"                % "mariadb-java-client"      % "2.7.12",
-  "io.github.java-diff-utils"       % "java-diff-utils"              % "4.11",
+  "org.postgresql"                  % "postgresql"               % "42.7.7",
-  "org.cache2k"                     % "cache2k-all"                  % "1.6.0.Final",
+  "ch.qos.logback"                  % "logback-classic"          % "1.5.18",
-  "net.coobird"                     % "thumbnailator"                % "0.4.14",
+  "com.zaxxer"                      % "HikariCP"                 % "7.0.1" exclude ("org.slf4j", "slf4j-api"),
-  "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
+  "com.typesafe"                    % "config"                   % "1.4.4",
-  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "9.19",
+  "fr.brouillard.oss.security.xhub" % "xhub4j-core"              % "1.1.0",
-  "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
+  "io.github.java-diff-utils"       % "java-diff-utils"          % "4.16",
-  "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
+  "org.cache2k"                     % "cache2k-all"              % "1.6.0.Final",
-  "junit"                           % "junit"                        % "4.13.2" % "test",
+  "net.coobird"                     % "thumbnailator"            % "0.4.20",
-  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
+  "com.github.zafarkhaja"           % "java-semver"              % "0.10.2",
-  "org.mockito"                     % "mockito-core"                 % "4.0.0" % "test",
+  "com.nimbusds"                    % "oauth2-oidc-sdk"          % "11.27",
-  "com.dimafeng"                    %% "testcontainers-scala"        % "0.39.11" % "test",
+  "org.eclipse.jetty"               % "jetty-webapp"             % JettyVersion    % "provided",
-  "org.testcontainers"              % "mysql"                        % "1.16.2" % "test",
+  "javax.servlet"                   % "javax.servlet-api"        % "3.1.0"         % "provided",
-  "org.testcontainers"              % "postgresql"                   % "1.16.2" % "test",
+  "junit"                           % "junit"                    % "4.13.2"        % "test",
-  "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
+  "org.scalatra"                   %% "scalatra-scalatest-javax" % ScalatraVersion % "test",
-  "is.tagomor.woothee"              % "woothee-java"                 % "1.11.0",
+  "org.mockito"                     % "mockito-core"             % "5.18.0"        % "test",
-  "org.ec4j.core"                   % "ec4j-core"                    % "0.3.0",
+  "com.dimafeng"                   %% "testcontainers-scala"     % "0.43.0"        % "test",
-  "org.kohsuke"                     % "github-api"                   % "1.135" % "test"
+  "org.testcontainers"              % "mysql"                    % "1.21.3"        % "test",
+  "org.testcontainers"              % "postgresql"               % "1.21.3"        % "test",
+  "net.i2p.crypto"                  % "eddsa"                    % "0.3.0",
+  "is.tagomor.woothee"              % "woothee-java"             % "1.11.0",
+  "org.ec4j.core"                   % "ec4j-core"                % "1.1.1",
+  "org.kohsuke"                     % "github-api"               % "1.329"         % "test"
 )
 
-libraryDependencies ~= {
-  _.map {
-    case x if x.name == "twirl-api" =>
-      x cross CrossVersion.for3Use2_13
-    case x =>
-      x
-  }
-}
-
 // Compiler settings
 scalacOptions := Seq(
   "-deprecation",
@@ -90,8 +80,16 @@ scalacOptions := Seq(
   "-Wunused:imports",
   "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s"
 )
-compile / javacOptions ++= Seq("-target", "8", "-source", "8")
+scalacOptions ++= {
-Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml"
+  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")
@@ -115,8 +113,8 @@ assembly / assemblyMergeStrategy := {
 
 // 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")
   }
 }
 
@@ -124,15 +122,14 @@ 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
@@ -159,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
@@ -186,7 +185,7 @@ executableKey := {
         val url = "https://github.com/" +
           s"gitbucket/gitbucket-${pluginId}-plugin/releases/download/${pluginVersion}/gitbucket-${pluginId}-plugin-${pluginVersion}.jar"
         log info s"Download: ${url}"
-        IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
+        IO transfer (new java.net.URI(url).toURL.openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
       case _ => ()
     }
   }
@@ -207,10 +206,9 @@ executableKey := {
     "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
@@ -218,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 := { _ =>
@@ -286,7 +284,12 @@ Test / testOptions ++= {
   }
 }
 
-Jetty / javaOptions ++= Seq(
+Container / javaOptions ++= Seq(
+  "-Dlogback.configurationFile=/logback-dev.xml",
   "-Xdebug",
-  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+  "-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/build.md

@@ -1,7 +1,7 @@
 How to build and run from the source tree
 ========
 
-First of all, Install [sbt](http://www.scala-sbt.org/index.html).
+First of all, Install [sbt](https://www.scala-sbt.org/index.html).
 
 ```shell
 $ brew install sbt
@@ -13,12 +13,26 @@ Run for Development
 If you want to test GitBucket, type the following command in the root directory of the source tree.
 
 ```shell
-$ sbt ~jetty:start
+$ 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`.
+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
 --------
@@ -37,7 +51,8 @@ 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.
+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
 ---------

doc/debug.md

@@ -1,6 +1,6 @@
 Debug GitBucket on IntelliJ
 ========
-Add following configuration for allowing remote debugging to `buils.sbt`:
+Add following configuration for allowing remote debugging to `build.sbt`:
 
 ```scala
 javaOptions in Jetty ++= Seq(
@@ -12,7 +12,7 @@ javaOptions in Jetty ++= Seq(
 Run GitBucket:
 
 ```shell
-$ sbt ~jetty:start
+$ sbt ~container:start
 ```
 
 In IntelliJ, create remote debug configuration as follows. Make sure port number is same as above configuration.

doc/directory.md

@@ -5,13 +5,17 @@ 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.wiki.git (wiki repository)
       * /REPO_NAME
-        * /issues (files which are attached to issue)
+        * /issues (files attached to issue)
         * /lfs (LFS managed files)
   * /data
     * /USER_NAME
@@ -20,6 +24,8 @@ This directory has following structure:
   * /plugins
     * plugin.jar
     * /.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/release.md

@@ -38,15 +38,26 @@ Generate release files
 
 For plug-in development, we have to publish the GitBucket jar file to the Maven central repository before release GitBucket itself.
  
-First, hit following command to publish artifacts to the sonatype OSS repository:
+First, start the sbt shell:
 
 ```bash
 $ sbt publishSigned
 ```
 
-Then logged-in to https://oss.sonatype.org/, close and release the repository.
+Next, upload artifacts to Sonatype's Central Portal with the following command:
 
-You need to wait up to a day until [gitbucket-notification-plugin](https://plugins.gitbucket-community.org/) which is default bundled plugin is built for new version of GitBucket.
+```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
 
@@ -55,5 +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.

doc/validation.md

@@ -1,6 +1,6 @@
 Mapping and Validation
 ========
-GitBucket uses [scalatra-forms](http://scalatra.org/guides/2.6/formats/forms.html) to validate request parameters and map them to the scala object. This is inspired by Play2 form mapping / validation.
+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:
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.11.4

project/plugins.sbt

@@ -1,11 +1,11 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("org.scalameta"    % "sbt-scalafmt"       % "2.4.3")
+addSbtPlugin("org.scalameta"           % "sbt-scalafmt"       % "2.5.5")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"          % "1.5.1")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl"          % "2.0.9")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly"       % "1.1.0")
+addSbtPlugin("com.eed3si9n"            % "sbt-assembly"       % "2.3.1")
-addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"       % "1.0.4")
+addSbtPlugin("org.scalatra.sbt"        % "sbt-scalatra"       % "1.0.4")
-addSbtPlugin("com.github.sbt"   % "sbt-pgp"            % "2.1.2")
+addSbtPlugin("com.github.sbt"          % "sbt-pgp"            % "2.3.1")
-addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
+addSbtPlugin("com.github.sbt"          % "sbt-license-report" % "1.7.0")
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"      % "1.9.2")
+addSbtPlugin("org.scoverage"           % "sbt-scoverage"      % "2.3.1")
 
 addDependencyTreePlugin

src/main/java/JettyLauncher.java

@@ -61,12 +61,19 @@ public class JettyLauncher {
         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")) {
+            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("=", 2);
                 if(dim.length == 2) {
@@ -107,6 +114,9 @@ public class JettyLauncher {
                         case "--plugin_dir":
                             System.setProperty("gitbucket.pluginDir", dim[1]);
                             break;
+                        case "--jetty_idle_timeout":
+                            jettyIdleTimeout = dim[1];
+                            break;
                     }
                 }
             }
@@ -130,6 +140,11 @@ public class JettyLauncher {
         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 {
+            httpConfig.setIdleTimeout(300000L); // default is 5min
+        }
 
         if (connectorsSet.contains(Connectors.HTTP)) {
             final ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
@@ -140,7 +155,7 @@ public class JettyLauncher {
         }
 
         if (connectorsSet.contains(Connectors.HTTPS)) {
-            final SslContextFactory sslContextFactory = new SslContextFactory.Server();
+            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" +

src/main/resources/bundle-plugins.txt

@@ -1,4 +1,4 @@
-notifications:1.10.0
+notifications:1.11.0
-gist:4.21.0
+gist:4.23.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

@@ -237,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"/>
@@ -343,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"/>
 
+  <!--================================================================================================-->
+  <!-- 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.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,40 @@
+<?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"/>
+
+  <!--================================================================================================-->
+  <!-- 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/gitbucket/core/GitBucketCoreModule.scala

@@ -4,27 +4,23 @@ import java.io.FileOutputStream
 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, SqlMigration}
+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"),
@@ -32,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")),
@@ -45,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"),
@@ -88,21 +76,20 @@ object GitBucketCoreModule
             import JDBCUtil._
 
             val conn = context.get(Solidbase.CONNECTION).asInstanceOf[Connection]
-            val list = conn.select("SELECT * FROM ACTIVITY ORDER BY ACTIVITY_ID") {
+            val list = conn.select("SELECT * FROM ACTIVITY ORDER BY ACTIVITY_ID") { rs =>
-              rs =>
+              Activity(
-                Activity(
+                activityId = UUID.randomUUID().toString,
-                  activityId = UUID.randomUUID().toString,
+                userName = rs.getString("USER_NAME"),
-                  userName = rs.getString("USER_NAME"),
+                repositoryName = rs.getString("REPOSITORY_NAME"),
-                  repositoryName = rs.getString("REPOSITORY_NAME"),
+                activityUserName = rs.getString("ACTIVITY_USER_NAME"),
-                  activityUserName = rs.getString("ACTIVITY_USER_NAME"),
+                activityType = rs.getString("ACTIVITY_TYPE"),
-                  activityType = rs.getString("ACTIVITY_TYPE"),
+                message = rs.getString("MESSAGE"),
-                  message = rs.getString("MESSAGE"),
+                additionalInfo = {
-                  additionalInfo = {
+                  val additionalInfo = rs.getString("ADDITIONAL_INFO")
-                    val additionalInfo = rs.getString("ADDITIONAL_INFO")
+                  if (rs.wasNull()) None else Some(additionalInfo)
-                    if (rs.wasNull()) None else Some(additionalInfo)
+                },
-                  },
+                activityDate = rs.getTimestamp("ACTIVITY_DATE")
-                  activityDate = rs.getTimestamp("ACTIVITY_DATE")
+              )
-                )
             }
             Using.resource(new FileOutputStream(ActivityLog, true)) { out =>
               list.foreach { activity =>
@@ -119,5 +106,22 @@ object GitBucketCoreModule
       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.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"))
+    ) {
+  java.util.logging.Logger.getLogger("liquibase").setLevel(Level.SEVERE)
+}

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,7 +6,7 @@ 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 {
   val _links =

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

@@ -4,55 +4,68 @@ import gitbucket.core.service.ProtectedBranchService
 import org.json4s._
 
 /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(
+case class ApiBranchProtectionResponse(
   url: Option[ApiPath], // for output
   enabled: Boolean,
-  required_status_checks: Option[ApiBranchProtection.Status]
+  required_status_checks: Option[ApiBranchProtectionResponse.Status],
+  restrictions: Option[ApiBranchProtectionResponse.Restrictions],
+  enforce_admins: Option[ApiBranchProtectionResponse.EnforceAdmins]
 ) {
-  def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
+  def status: ApiBranchProtectionResponse.Status =
+    required_status_checks.getOrElse(ApiBranchProtectionResponse.statusNone)
 }
 
-object ApiBranchProtection {
+object ApiBranchProtectionResponse {
 
-  /** form for enabling-and-disabling-branch-protection */
+  case class EnforceAdmins(enabled: Boolean)
-  case class EnablingAndDisabling(protection: ApiBranchProtection)
 
-  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection =
+//  /** form for enabling-and-disabling-branch-protection */
-    ApiBranchProtection(
+//  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 = Some(
+      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.includeAdministrators),
+          EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.enforceAdmins),
-          info.contexts,
+          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(None, Off, Seq.empty, 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) {
@@ -66,16 +79,19 @@ object ApiBranchProtection {
       }
   }
 
-  implicit val enforcementLevelSerializer: CustomSerializer[EnforcementLevel] = new CustomSerializer[EnforcementLevel](
+  case class Restrictions(users: Seq[String])
-    format =>
+
+  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)
+        { 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

@@ -29,7 +29,7 @@ case class ApiCommit(
 
 object 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,

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,7 +98,7 @@ 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(""), // TODO no API for commit comment
       commit = Commit(
         url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
@@ -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.id.getName,
+            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/ApiIssue.scala

@@ -12,7 +12,7 @@ case class ApiIssue(
   number: Int,
   title: String,
   user: ApiUser,
-  assignee: Option[ApiUser],
+  assignees: List[ApiUser],
   labels: List[ApiLabel],
   state: String,
   created_at: Date,
@@ -21,9 +21,10 @@ case class ApiIssue(
   milestone: Option[ApiMilestone]
 )(repositoryName: RepositoryName, isPullRequest: Boolean) {
   val id = 0 // dummy id
-  val assignees = List(assignee).flatten
+  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(
@@ -43,7 +44,7 @@ object ApiIssue {
     issue: Issue,
     repositoryName: RepositoryName,
     user: ApiUser,
-    assignee: Option[ApiUser],
+    assignees: List[ApiUser],
     labels: List[ApiLabel],
     milestone: Option[ApiMilestone]
   ): ApiIssue =
@@ -51,10 +52,11 @@ object ApiIssue {
       number = issue.issueId,
       title = issue.title,
       user = user,
-      assignee = assignee,
+      assignees = assignees,
       labels = labels,
       milestone = milestone,
-      state = if (issue.closed) { "closed" } else { "open" },
+      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/ApiPullRequest.scala

@@ -21,15 +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}")
@@ -45,7 +46,7 @@ object ApiPullRequest {
     baseRepo: ApiRepository,
     user: ApiUser,
     labels: List[ApiLabel],
-    assignee: Option[ApiUser],
+    assignees: List[ApiUser],
     mergedComment: Option[(IssueComment, Account)]
   ): ApiPullRequest =
     ApiPullRequest(
@@ -63,12 +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/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/ApiRepository.scala

@@ -21,7 +21,7 @@ case class ApiRepository(
   val url = ApiPath(s"/api/v3/repos/${full_name}")
   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 {
@@ -61,7 +61,7 @@ object ApiRepository {
       watchers = 0,
       forks = 0,
       `private` = false,
-      default_branch = "master",
+      default_branch = "main",
       owner = owner,
       has_issues = true
     )

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

@@ -24,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/JsonFormat.scala

@@ -15,13 +15,12 @@ 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]() +
@@ -45,32 +44,35 @@ object JsonFormat {
     FieldSerializer[ApiCommits.File]() +
     FieldSerializer[ApiRelease]() +
     FieldSerializer[ApiReleaseAsset]() +
-    ApiBranchProtection.enforcementLevelSerializer
+    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/controller/AccountController.scala

@@ -38,23 +38,11 @@ class AccountController
     with RequestCache
 
 trait AccountControllerBase extends AccountManagementControllerBase {
-  self: AccountService
+  self: AccountService & RepositoryService & ActivityService & WikiService & LabelsService & SshKeyService &
-    with RepositoryService
+    GpgKeyService & OneselfAuthenticator & UsersAuthenticator & GroupManagerAuthenticator & ReadableUsersAuthenticator &
-    with ActivityService
+    AccessTokenService & WebHookService & PrioritiesService & RepositoryCreationService =>
-    with WikiService
-    with LabelsService
-    with SshKeyService
-    with GpgKeyService
-    with OneselfAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ReadableUsersAuthenticator
-    with AccessTokenService
-    with WebHookService
-    with PrioritiesService
-    with RepositoryCreationService =>
 
-  case class AccountNewForm(
+  private case class AccountNewForm(
     userName: String,
     password: String,
     fullName: String,
@@ -65,7 +53,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     fileId: Option[String]
   )
 
-  case class AccountEditForm(
+  private case class AccountEditForm(
     password: Option[String],
     fullName: String,
     mailAddress: String,
@@ -76,15 +64,15 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     clearImage: Boolean
   )
 
-  case class SshKeyForm(title: String, publicKey: String)
+  private case class SshKeyForm(title: String, publicKey: String)
 
-  case class GpgKeyForm(title: String, publicKey: String)
+  private case class GpgKeyForm(title: String, publicKey: String)
 
-  case class PersonalTokenForm(note: String)
+  private case class PersonalTokenForm(note: String)
 
-  case class SyntaxHighlighterThemeForm(theme: String)
+  private case class SyntaxHighlighterThemeForm(theme: String)
 
-  val newForm = mapping(
+  private val newForm = mapping(
     "userName" -> trim(label("User name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "password" -> trim(label("Password", text(required, maxlength(40)))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
@@ -97,7 +85,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "fileId" -> trim(label("File ID", optional(text())))
   )(AccountNewForm.apply)
 
-  val editForm = mapping(
+  private val editForm = mapping(
     "password" -> trim(label("Password", optional(text(maxlength(40))))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
@@ -110,32 +98,41 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "clearImage" -> trim(label("Clear image", boolean()))
   )(AccountEditForm.apply)
 
-  val sshKeyForm = mapping(
+  private val sshKeyForm = mapping(
     "title" -> trim(label("Title", text(required, maxlength(100)))),
     "publicKey" -> trim2(label("Key", text(required, validPublicKey)))
   )(SshKeyForm.apply)
 
-  val gpgKeyForm = mapping(
+  private val gpgKeyForm = mapping(
     "title" -> trim(label("Title", text(required, maxlength(100)))),
     "publicKey" -> label("Key", text(required, validGpgPublicKey))
   )(GpgKeyForm.apply)
 
-  val personalTokenForm = mapping(
+  private val personalTokenForm = mapping(
     "note" -> trim(label("Token", text(required, maxlength(100))))
   )(PersonalTokenForm.apply)
 
-  val syntaxHighlighterThemeForm = mapping(
+  private val syntaxHighlighterThemeForm = mapping(
     "highlighterTheme" -> trim(label("Theme", text(required)))
   )(SyntaxHighlighterThemeForm.apply)
 
-  case class NewGroupForm(
+  private val resetPasswordEmailForm = mapping(
+    "mailAddress" -> trim(label("Email", text(required)))
+  )(ResetPasswordEmailForm.apply)
+
+  private val resetPasswordForm = mapping(
+    "token" -> trim(label("Token", text(required))),
+    "password" -> trim(label("Password", text(required, maxlength(40))))
+  )(ResetPasswordForm.apply)
+
+  private case class NewGroupForm(
     groupName: String,
     description: Option[String],
     url: Option[String],
     fileId: Option[String],
     members: String
   )
-  case class EditGroupForm(
+  private case class EditGroupForm(
     groupName: String,
     description: Option[String],
     url: Option[String],
@@ -143,8 +140,15 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     members: String,
     clearImage: Boolean
   )
+  private case class ResetPasswordEmailForm(
+    mailAddress: String
+  )
+  private case class ResetPasswordForm(
+    token: String,
+    password: String
+  )
 
-  val newGroupForm = mapping(
+  private val newGroupForm = mapping(
     "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "description" -> trim(label("Group description", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
@@ -152,7 +156,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "members" -> trim(label("Members", text(required, members)))
   )(NewGroupForm.apply)
 
-  val editGroupForm = mapping(
+  private val editGroupForm = mapping(
     "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier))),
     "description" -> trim(label("Group description", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
@@ -161,7 +165,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "clearImage" -> trim(label("Clear image", boolean()))
   )(EditGroupForm.apply)
 
-  case class RepositoryCreationForm(
+  private case class RepositoryCreationForm(
     owner: String,
     name: String,
     description: Option[String],
@@ -169,9 +173,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     initOption: String,
     sourceUrl: Option[String]
   )
-  case class ForkRepositoryForm(owner: String, name: String)
 
-  val newRepositoryForm = mapping(
+  private val newRepositoryForm = mapping(
     "owner" -> trim(label("Owner", text(required, maxlength(100), identifier, existsAccount))),
     "name" -> trim(label("Repository name", text(required, maxlength(100), repository, uniqueRepository))),
     "description" -> trim(label("Description", optional(text()))),
@@ -180,34 +183,27 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "sourceUrl" -> trim(label("Source URL", optionalRequired(_.value("initOption") == "COPY", text())))
   )(RepositoryCreationForm.apply)
 
-  val forkRepositoryForm = mapping(
+  private case class AccountForm(accountName: String)
-    "owner" -> trim(label("Repository owner", text(required))),
-    "name" -> trim(label("Repository name", text(required)))
-  )(ForkRepositoryForm.apply)
 
-  case class AccountForm(accountName: String)
+  private val accountForm = mapping(
-
-  val accountForm = mapping(
     "account" -> trim(label("Group/User name", text(required, validAccountName)))
   )(AccountForm.apply)
 
   // for account web hook url addition.
-  case class AccountWebHookForm(
+  private case class AccountWebHookForm(
     url: String,
     events: Set[WebHook.Event],
     ctype: WebHookContentType,
     token: Option[String]
   )
 
-  def accountWebHookForm(update: Boolean) =
+  private def accountWebHookForm(update: Boolean) =
     mapping(
       "url" -> trim(label("url", text(required, accountWebHook(update)))),
       "events" -> accountWebhookEvents,
       "ctype" -> label("ctype", text()),
       "token" -> optional(trim(label("token", text(maxlength(100)))))
-    )(
+    )((url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token))
-      (url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
-    )
 
   /**
    * Provides duplication check for web hook url. duplicated from RepositorySettingsController.scala
@@ -252,12 +248,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
           gitbucket.core.account.html.activity(
             account,
             if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getActivitiesByUser(userName, true),
+            getActivitiesByUser(userName, publicOnly = true),
             extraMailAddresses
           )
 
         // Members
-        case "members" if (account.isGroupAccount) => {
+        case "members" if account.isGroupAccount =>
           val members = getGroupMembers(account.userName)
           gitbucket.core.account.html.members(
             account,
@@ -265,10 +261,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             extraMailAddresses,
             isGroupManager(context.loginAccount, members)
           )
-        }
 
         // Repositories
-        case _ => {
+        case _ =>
           val members = getGroupMembers(account.userName)
           gitbucket.core.account.html.repositories(
             account,
@@ -277,7 +272,6 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             extraMailAddresses,
             isGroupManager(context.loginAccount, members)
           )
-        }
       }
     } getOrElse NotFound()
   }
@@ -285,7 +279,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName.atom") {
     val userName = params("userName")
     contentType = "application/atom+xml; type=feed"
-    helper.xml.feed(getActivitiesByUser(userName, true))
+    helper.xml.feed(getActivitiesByUser(userName, publicOnly = true))
   }
 
   get("/:userName.keys") {
@@ -330,22 +324,21 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   post("/:userName/_edit", editForm)(oneselfOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName).map {
+    getAccountByUserName(userName).map { account =>
-      account =>
+      updateAccount(
-        updateAccount(
+        account.copy(
-          account.copy(
+          password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
-            password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
+          fullName = form.fullName,
-            fullName = form.fullName,
+          mailAddress = form.mailAddress,
-            mailAddress = form.mailAddress,
+          description = form.description,
-            description = form.description,
+          url = form.url
-            url = form.url
-          )
         )
+      )
 
-        updateImage(userName, form.fileId, form.clearImage)
+      updateImage(userName, form.fileId, form.clearImage)
-        updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
+      updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
-        flash.update("info", "Account information has been updated.")
+      flash.update("info", "Account information has been updated.")
-        redirect(s"/${userName}/_edit")
+      redirect(s"/$userName/_edit")
 
     } getOrElse NotFound()
   })
@@ -353,12 +346,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_delete")(oneselfOnly {
     val userName = params("userName")
 
-    getAccountByUserName(userName, true).map {
+    getAccountByUserName(userName, includeRemoved = true).map { account =>
-      account =>
+      if (isLastAdministrator(account)) {
-        if (isLastAdministrator(account)) {
+        flash.update("error", "Account can't be removed because this is last one administrator.")
-          flash.update("error", "Account can't be removed because this is last one administrator.")
+        redirect(s"/$userName/_edit")
-          redirect(s"/${userName}/_edit")
+      } else {
-        } else {
 //      // Remove repositories
 //      getRepositoryNamesOfUser(userName).foreach { repositoryName =>
 //        deleteRepository(userName, repositoryName)
@@ -366,10 +358,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
 //        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
 //      }
-          suspendAccount(account)
+        suspendAccount(account)
-          session.invalidate
+        session.invalidate()
-          redirect("/")
+        redirect("/")
-        }
+      }
     } getOrElse NotFound()
   })
 
@@ -383,20 +375,20 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   post("/:userName/_ssh", sshKeyForm)(oneselfOnly { form =>
     val userName = params("userName")
     addPublicKey(userName, form.title, form.publicKey)
-    redirect(s"/${userName}/_ssh")
+    redirect(s"/$userName/_ssh")
   })
 
   get("/:userName/_ssh/delete/:id")(oneselfOnly {
     val userName = params("userName")
     val sshKeyId = params("id").toInt
     deletePublicKey(userName, sshKeyId)
-    redirect(s"/${userName}/_ssh")
+    redirect(s"/$userName/_ssh")
   })
 
   get("/:userName/_gpg")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
-      //html.ssh(x, getPublicKeys(x.userName))
+      // html.ssh(x, getPublicKeys(x.userName))
       html.gpg(x, getGpgPublicKeys(x.userName))
     } getOrElse NotFound()
   })
@@ -404,14 +396,14 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   post("/:userName/_gpg", gpgKeyForm)(oneselfOnly { form =>
     val userName = params("userName")
     addGpgPublicKey(userName, form.title, form.publicKey)
-    redirect(s"/${userName}/_gpg")
+    redirect(s"/$userName/_gpg")
   })
 
   get("/:userName/_gpg/delete/:id")(oneselfOnly {
     val userName = params("userName")
     val keyId = params("id").toInt
     deleteGpgPublicKey(userName, keyId)
-    redirect(s"/${userName}/_gpg")
+    redirect(s"/$userName/_gpg")
   })
 
   get("/:userName/_application")(oneselfOnly {
@@ -419,13 +411,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(userName).map { x =>
       var tokens = getAccessTokens(x.userName)
       val generatedToken = flash.get("generatedToken") match {
-        case Some((tokenId: Int, token: String)) => {
+        case Some((tokenId: Int, token: String)) =>
           val gt = tokens.find(_.accessTokenId == tokenId)
           gt.map { t =>
             tokens = tokens.filterNot(_ == t)
             (t, token)
           }
-        }
         case _ => None
       }
       html.application(x, tokens, generatedToken)
@@ -434,18 +425,18 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   post("/:userName/_personalToken", personalTokenForm)(oneselfOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName).foreach { x =>
+    getAccountByUserName(userName).foreach { _ =>
       val (tokenId, token) = generateAccessToken(userName, form.note)
       flash.update("generatedToken", (tokenId, token))
     }
-    redirect(s"/${userName}/_application")
+    redirect(s"/$userName/_application")
   })
 
   get("/:userName/_personalToken/delete/:id")(oneselfOnly {
     val userName = params("userName")
     val tokenId = params("id").toInt
     deleteAccessToken(userName, tokenId)
-    redirect(s"/${userName}/_application")
+    redirect(s"/$userName/_application")
   })
 
   /**
@@ -468,7 +459,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   post("/:userName/_preferences/highlighter", syntaxHighlighterThemeForm)(oneselfOnly { form =>
     val userName = params("userName")
     addOrUpdateAccountPreference(userName, form.theme)
-    redirect(s"/${userName}/_preferences")
+    redirect(s"/$userName/_preferences")
   })
 
   get("/:userName/_hooks")(managersOnly {
@@ -485,7 +476,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       val webhook = AccountWebHook(userName, "", WebHookContentType.FORM, None)
-      html.edithook(webhook, Set(WebHook.Push), account, true)
+      html.edithook(webhook, Set(WebHook.Push), account, create = true)
     } getOrElse NotFound()
   })
 
@@ -496,7 +487,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     addAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
     flash.update("info", s"Webhook ${form.url} created")
-    redirect(s"/${userName}/_hooks")
+    redirect(s"/$userName/_hooks")
   })
 
   /**
@@ -506,7 +497,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     deleteAccountWebHook(userName, params("url"))
     flash.update("info", s"Webhook ${params("url")} deleted")
-    redirect(s"/${userName}/_hooks")
+    redirect(s"/$userName/_hooks")
   })
 
   /**
@@ -515,9 +506,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_hooks/edit")(managersOnly {
     val userName = params("userName")
     getAccountByUserName(userName).flatMap { account =>
-      getAccountWebHook(userName, params("url")).map {
+      getAccountWebHook(userName, params("url")).map { case (webhook, events) =>
-        case (webhook, events) =>
+        html.edithook(webhook, events, account, create = false)
-          html.edithook(webhook, events, account, false)
       }
     } getOrElse NotFound()
   })
@@ -529,7 +519,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     updateAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
     flash.update("info", s"webhook ${form.url} updated")
-    redirect(s"/${userName}/_hooks")
+    redirect(s"/$userName/_hooks")
   })
 
   /**
@@ -537,8 +527,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    */
   ajaxPost("/:userName/_hooks/test")(managersOnly {
     // TODO Is it possible to merge with [[RepositorySettingsController.ajaxPost]]?
-    import scala.concurrent.duration._
+    import scala.concurrent.duration.*
-    import scala.concurrent._
+    import scala.concurrent.*
     import scala.util.control.NonFatal
     import org.apache.http.util.EntityUtils
     import scala.concurrent.ExecutionContext.Implicits.global
@@ -562,10 +552,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload, context.settings).head
 
     val toErrorMap: PartialFunction[Throwable, Map[String, String]] = {
-      case e: java.net.UnknownHostException                  => Map("error" -> ("Unknown host " + e.getMessage))
+      case e: java.net.UnknownHostException                  => Map("error" -> s"Unknown host ${e.getMessage}")
-      case e: java.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
+      case _: java.lang.IllegalArgumentException             => Map("error" -> "invalid url")
-      case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
+      case _: org.apache.http.client.ClientProtocolException => Map("error" -> "invalid url")
-      case NonFatal(e)                                       => Map("error" -> (s"${e.getClass} ${e.getMessage}"))
+      case NonFatal(e)                                       => Map("error" -> s"${e.getClass} ${e.getMessage}")
     }
 
     contentType = formats("json")
@@ -574,11 +564,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         "url" -> url,
         "request" -> Await.result(
           reqFuture
-            .map(
+            .map(req =>
-              req =>
+              Map(
-                Map(
+                "headers" -> _headers(req.getAllHeaders),
-                  "headers" -> _headers(req.getAllHeaders),
+                "payload" -> json
-                  "payload" -> json
               )
             )
             .recover(toErrorMap),
@@ -586,12 +575,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         ),
         "response" -> Await.result(
           resFuture
-            .map(
+            .map(res =>
-              res =>
+              Map(
-                Map(
+                "status" -> res.getStatusLine,
-                  "status" -> res.getStatusLine(),
+                "body" -> EntityUtils.toString(res.getEntity),
-                  "body" -> EntityUtils.toString(res.getEntity()),
+                "headers" -> _headers(res.getAllHeaders)
-                  "headers" -> _headers(res.getAllHeaders())
               )
             )
             .recover(toErrorMap),
@@ -602,7 +590,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   get("/register") {
-    if (context.settings.allowAccountRegistration) {
+    if (context.settings.basicBehavior.allowAccountRegistration) {
       if (context.loginAccount.isDefined) {
         redirect("/")
       } else {
@@ -612,25 +600,82 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   }
 
   post("/register", newForm) { form =>
-    if (context.settings.allowAccountRegistration) {
+    if (context.settings.basicBehavior.allowAccountRegistration) {
       createAccount(
         form.userName,
         pbkdf2_sha256(form.password),
         form.fullName,
         form.mailAddress,
-        false,
+        isAdmin = false,
         form.description,
         form.url
       )
-      updateImage(form.userName, form.fileId, false)
+      updateImage(form.userName, form.fileId, clearImage = false)
       updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != ""))
       redirect("/signin")
     } else NotFound()
   }
 
+  get("/reset") {
+    if (context.settings.basicBehavior.allowResetPassword) {
+      html.reset()
+    } else NotFound()
+  }
+
+  post("/reset", resetPasswordEmailForm) { form =>
+    if (context.settings.basicBehavior.allowResetPassword) {
+      getAccountByMailAddress(form.mailAddress).foreach { account =>
+        val token = generateResetPasswordToken(form.mailAddress)
+        val mailer = new Mailer(context.settings)
+        mailer.send(
+          form.mailAddress,
+          "Reset password",
+          s"""Hello, ${account.fullName}!
+            |
+            |You requested to reset the password for your GitBucket account.
+            |If you are not sure about the request, you can ignore this email.
+            |Otherwise, click the following link to set the new password:
+            |${context.baseUrl}/reset/form/$token
+            |""".stripMargin
+        )
+      }
+      redirect("/reset/sent")
+    } else NotFound()
+  }
+
+  get("/reset/sent") {
+    if (context.settings.basicBehavior.allowResetPassword) {
+      html.resetsent()
+    } else NotFound()
+  }
+
+  get("/reset/form/:token") {
+    if (context.settings.basicBehavior.allowResetPassword) {
+      val token = params("token")
+      decodeResetPasswordToken(token)
+        .map { _ =>
+          html.resetform(token)
+        }
+        .getOrElse(NotFound())
+    } else NotFound()
+  }
+
+  post("/reset/form", resetPasswordForm) { form =>
+    if (context.settings.basicBehavior.allowResetPassword) {
+      decodeResetPasswordToken(form.token)
+        .flatMap { mailAddress =>
+          getAccountByMailAddress(mailAddress).map { account =>
+            updateAccount(account.copy(password = pbkdf2_sha256(form.password)))
+            html.resetcomplete()
+          }
+        }
+        .getOrElse(NotFound())
+    } else NotFound()
+  }
+
   get("/groups/new")(usersOnly {
     context.withLoginAccount { loginAccount =>
-      html.creategroup(List(GroupMember("", loginAccount.userName, true)))
+      html.creategroup(List(GroupMember("", loginAccount.userName, isManager = true)))
     }
   })
 
@@ -647,13 +692,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         }
         .toList
     )
-    updateImage(form.groupName, form.fileId, false)
+    updateImage(form.groupName, form.fileId, clearImage = false)
     redirect(s"/${form.groupName}")
   })
 
   get("/:groupName/_editgroup")(managersOnly {
     val groupName = params("groupName")
-    getAccountByUserName(groupName, true).map { account =>
+    getAccountByUserName(groupName, includeRemoved = true).map { account =>
       html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
     } getOrElse NotFound()
   })
@@ -663,8 +708,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     // Remove from GROUP_MEMBER
     updateGroupMembers(groupName, Nil)
     // Disable group
-    getAccountByUserName(groupName, false).foreach { account =>
+    getAccountByUserName(groupName, includeRemoved = false).foreach { account =>
-      updateGroup(groupName, account.description, account.url, true)
+      updateGroup(groupName, account.description, account.url, removed = true)
     }
 //      // Remove repositories
 //      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
@@ -687,8 +732,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       }
       .toList
 
-    getAccountByUserName(groupName, true).map { account =>
+    getAccountByUserName(groupName, includeRemoved = true).map { _ =>
-      updateGroup(groupName, form.description, form.url, false)
+      updateGroup(groupName, form.description, form.url, removed = false)
 
       // Update GROUP_MEMBER
       updateGroupMembers(form.groupName, members)
@@ -703,7 +748,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       updateImage(form.groupName, form.fileId, form.clearImage)
 
       flash.update("info", "Account information has been updated.")
-      redirect(s"/${groupName}/_editgroup")
+      redirect(s"/$groupName/_editgroup")
 
     } getOrElse NotFound()
   })
@@ -713,7 +758,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    */
   get("/new")(usersOnly {
     context.withLoginAccount { loginAccount =>
-      html.newrepo(getGroupsByUserName(loginAccount.userName), context.settings.isCreateRepoOptionPublic)
+      html.newrepo(getGroupsByUserName(loginAccount.userName), context.settings.basicBehavior.isCreateRepoOptionPublic)
     }
   })
 
@@ -721,82 +766,83 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    * Create new repository.
    */
   post("/new", newRepositoryForm)(usersOnly { form =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (context.settings.basicBehavior.repositoryOperation.create || loginAccount.isAdmin) {
-        if (context.settings.repositoryOperation.create || loginAccount.isAdmin) {
+        LockUtil.lock(s"${form.owner}/${form.name}") {
-          LockUtil.lock(s"${form.owner}/${form.name}") {
+          if (getRepository(form.owner, form.name).isDefined) {
-            if (getRepository(form.owner, form.name).isDefined) {
+            // redirect to the repository if repository already exists
-              // redirect to the repository if repository already exists
+            redirect(s"/${form.owner}/${form.name}")
-              redirect(s"/${form.owner}/${form.name}")
+          } else if (!canCreateRepository(form.owner, loginAccount)) {
-            } else if (!canCreateRepository(form.owner, loginAccount)) {
+            // Permission error
-              // Permission error
+            Forbidden()
-              Forbidden()
+          } else {
-            } else {
+            // create repository asynchronously
-              // create repository asynchronously
+            createRepository(
-              createRepository(
+              loginAccount,
-                loginAccount,
+              form.owner,
-                form.owner,
+              form.name,
-                form.name,
+              form.description,
-                form.description,
+              form.isPrivate,
-                form.isPrivate,
+              form.initOption,
-                form.initOption,
+              form.sourceUrl,
-                form.sourceUrl
+              context.settings.defaultBranch
-              )
+            )
-              // redirect to the repository
+            // redirect to the repository
-              redirect(s"/${form.owner}/${form.name}")
+            redirect(s"/${form.owner}/${form.name}")
-            }
           }
-        } else Forbidden()
+        }
+      } else Forbidden()
     }
   })
 
   get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (
-        if (repository.repository.options.allowFork && (context.settings.repositoryOperation.fork || loginAccount.isAdmin)) {
+        repository.repository.options.allowFork && (context.settings.basicBehavior.repositoryOperation.fork || loginAccount.isAdmin)
-          val loginUserName = loginAccount.userName
+      ) {
-          val groups = getGroupsByUserName(loginUserName)
+        val loginUserName = loginAccount.userName
-          groups match {
+        val groups = getGroupsByUserName(loginUserName)
-            case _: List[String] =>
+        groups match {
-              val managerPermissions = groups.map { group =>
+          case _: List[String] =>
-                val members = getGroupMembers(group)
+            val managerPermissions = groups.map { group =>
-                context.loginAccount.exists(
+              val members = getGroupMembers(group)
-                  x =>
+              context.loginAccount.exists(x =>
-                    members.exists { member =>
+                members.exists { member =>
-                      member.userName == x.userName && member.isManager
+                  member.userName == x.userName && member.isManager
-                  }
+                }
-                )
-              }
-              helper.html.forkrepository(
-                repository,
-                (groups zip managerPermissions).sortBy(_._1)
               )
-            case _ => redirect(s"/${loginUserName}")
+            }
-          }
+            helper.html.forkrepository(
-        } else BadRequest()
+              repository,
+              (groups zip managerPermissions).sortBy(_._1)
+            )
+          case _ => redirect(s"/$loginUserName")
+        }
+      } else BadRequest()
     }
   })
 
   post("/:owner/:repository/fork", accountForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (
-        if (repository.repository.options.allowFork && (context.settings.repositoryOperation.fork || loginAccount.isAdmin)) {
+        repository.repository.options.allowFork && (context.settings.basicBehavior.repositoryOperation.fork || loginAccount.isAdmin)
-          val loginUserName = loginAccount.userName
+      ) {
-          val accountName = form.accountName
+        val loginUserName = loginAccount.userName
+        val accountName = form.accountName
 
-          if (getRepository(accountName, repository.name).isDefined) {
+        if (getRepository(accountName, repository.name).isDefined) {
-            // redirect to the repository if repository already exists
+          // redirect to the repository if repository already exists
-            redirect(s"/${accountName}/${repository.name}")
+          redirect(s"/$accountName/${repository.name}")
-          } else if (!canCreateRepository(accountName, loginAccount)) {
+        } else if (!canCreateRepository(accountName, loginAccount)) {
-            // Permission error
+          // Permission error
-            Forbidden()
+          Forbidden()
-          } else {
+        } else {
-            // fork repository asynchronously
+          // fork repository asynchronously
-            forkRepository(accountName, repository, loginUserName)
+          forkRepository(accountName, repository, loginUserName)
-            // redirect to the repository
+          // redirect to the repository
-            redirect(s"/${accountName}/${repository.name}")
+          redirect(s"/$accountName/${repository.name}")
-          }
+        }
-        } else Forbidden()
+      } else Forbidden()
     }
   })
 
@@ -823,9 +869,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   private def members: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      if (value.split(",").exists {
+      if (
-            _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+        value.split(",").exists {
-          }) None
+          _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+        }
+      ) None
       else Some("Must select one manager at least.")
     }
   }

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

@@ -1,10 +1,10 @@
 package gitbucket.core.controller
 
-import gitbucket.core.api._
+import gitbucket.core.api.*
-import gitbucket.core.controller.api._
+import gitbucket.core.controller.api.*
-import gitbucket.core.service._
+import gitbucket.core.service.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util._
+import gitbucket.core.util.*
 import gitbucket.core.plugin.PluginRegistry
 
 class ApiController

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

@@ -1,22 +1,21 @@
 package gitbucket.core.controller
 
-import java.io.{File, FileInputStream}
+import java.io.{File, FileInputStream, FileOutputStream}
-
 import gitbucket.core.api.{ApiError, JsonFormat}
 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
@@ -25,10 +24,13 @@ 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.
@@ -46,11 +48,21 @@ abstract class ControllerBase
 
   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 = {
     val path = super.requestPath(uri, idx)
     if (path != "/" && path.endsWith("/")) {
@@ -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,7 +139,7 @@ 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)) {
@@ -140,7 +159,7 @@ 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)) {
@@ -168,7 +187,9 @@ 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()
@@ -178,7 +199,6 @@ abstract class ControllerBase
       } else {
         org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
       }
-    }
   }
 
   override def url(
@@ -190,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.
@@ -234,9 +254,9 @@ 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.resource(new TreeWalk(git.getRepository)) { treeWalk =>
@@ -277,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()
+    }
+  }
 }
 
 /**
@@ -287,18 +348,18 @@ 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.URL(baseUrl).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 {
@@ -372,15 +433,16 @@ trait AccountManagementControllerBase extends ControllerBase {
       messages: Messages
     ): Option[String] = {
       val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
-      if (extraMailAddresses.exists {
+      if (
-            case (k, v) =>
+        extraMailAddresses.exists { case (k, v) =>
-              v.contains(value)
+          v.contains(value)
-          }) {
+        }
+      ) {
         Some("These mail addresses are duplicated.")
       } else {
-        getAccountByMailAddress(value, true)
+        getAccountByMailAddress(value, includeRemoved = true)
           .collect {
-            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
+            case x if paramName.isEmpty || !params.optionValue(paramName).contains(x.userName) =>
               "Mail address is already registered."
           }
       }
@@ -395,22 +457,23 @@ trait AccountManagementControllerBase extends ControllerBase {
       messages: Messages
     ): Option[String] = {
       val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
-      if (Some(value) == params.optionValue("mailAddress") || extraMailAddresses.count {
+      if (
-            case (k, v) =>
+        params.optionValue("mailAddress").contains(value) || extraMailAddresses.count { case (k, v) =>
-              v.contains(value)
+          v.contains(value)
-          } > 1) {
+        } > 1
+      ) {
         Some("These mail addresses are duplicated.")
       } else {
-        getAccountByMailAddress(value, true)
+        getAccountByMailAddress(value, includeRemoved = true)
           .collect {
-            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
+            case x if paramName.isEmpty || !params.optionValue(paramName).contains(x.userName) =>
               "Mail address is already registered."
           }
       }
     }
   }
 
-  val allReservedNames = Set(
+  private val allReservedNames = Set(
     "git",
     "admin",
     "upload",
@@ -429,10 +492,9 @@ trait AccountManagementControllerBase extends ControllerBase {
   protected def reservedNames: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       if (allReservedNames.contains(value.toLowerCase)) {
-        Some(s"${value} is reserved")
+        Some(s"$value is reserved")
       } else {
         None
       }
   }
-
 }

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

@@ -2,10 +2,11 @@ package gitbucket.core.controller
 
 import gitbucket.core.dashboard.html
 import gitbucket.core.model.Account
-import gitbucket.core.service._
+import gitbucket.core.service.*
-import gitbucket.core.util.{Keys, UsersAuthenticator}
+import gitbucket.core.util.UsersAuthenticator
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.service.IssuesService._
+import gitbucket.core.service.IssuesService.*
+import gitbucket.core.service.ActivityService.*
 
 class DashboardController
     extends DashboardControllerBase
@@ -27,12 +28,8 @@ class DashboardController
     with RequestCache
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService
+  self: IssuesService & PullRequestService & RepositoryService & AccountService & CommitStatusService &
-    with PullRequestService
+    UsersAuthenticator =>
-    with RepositoryService
-    with AccountService
-    with CommitStatusService
-    with UsersAuthenticator =>
 
   get("/dashboard/repos")(usersOnly {
     context.withLoginAccount { loginAccount =>
@@ -40,9 +37,9 @@ trait DashboardControllerBase extends ControllerBase {
         context.loginAccount,
         None,
         withoutPhysicalInfo = true,
-        limit = context.settings.limitVisibleRepositories
+        limit = context.settings.basicBehavior.limitVisibleRepositories
       )
-      html.repos(getGroupNames(loginAccount.userName), repos, repos)
+      html.repos(getGroupNames(loginAccount.userName), repos, repos, isNewsFeedEnabled)
     }
   })
 
@@ -94,7 +91,7 @@ trait DashboardControllerBase extends ControllerBase {
     }
   })
 
-  private def getOrCreateCondition(key: String, filter: String, userName: String) = {
+  private def getOrCreateCondition(filter: String, userName: String) = {
     val condition = IssueSearchCondition(request)
 
     filter match {
@@ -105,19 +102,19 @@ trait DashboardControllerBase extends ControllerBase {
   }
 
   private def searchIssues(loginAccount: Account, filter: String) = {
-    import IssuesService._
+    import IssuesService.*
 
     val userName = loginAccount.userName
-    val condition = getOrCreateCondition(Keys.Session.DashboardIssues, filter, userName)
+    val condition = getOrCreateCondition(filter, userName)
-    val userRepos = getUserRepositories(userName, true).map(repo => repo.owner -> repo.name)
+    val userRepos = getUserRepositories(userName, withoutPhysicalInfo = true).map(repo => repo.owner -> repo.name)
     val page = IssueSearchCondition.page(request)
-    val issues = searchIssue(condition, IssueSearchOption.Issues, (page - 1) * IssueLimit, IssueLimit, userRepos: _*)
+    val issues = searchIssue(condition, IssueSearchOption.Issues, (page - 1) * IssueLimit, IssueLimit, userRepos*)
 
     html.issues(
       issues.map(issue => (issue, None)),
       page,
-      countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, userRepos: _*),
+      countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, userRepos*),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, userRepos: _*),
+      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, userRepos*),
       filter match {
         case "assigned"  => condition.copy(assigned = Some(Some(userName)))
         case "mentioned" => condition.copy(mentioned = Some(userName))
@@ -129,17 +126,18 @@ trait DashboardControllerBase extends ControllerBase {
         context.loginAccount,
         None,
         withoutPhysicalInfo = true,
-        limit = context.settings.limitVisibleRepositories
+        limit = context.settings.basicBehavior.limitVisibleRepositories
-      )
+      ),
+      isNewsFeedEnabled
     )
   }
 
   private def searchPullRequests(loginAccount: Account, filter: String) = {
-    import IssuesService._
+    import IssuesService.*
-    import PullRequestService._
+    import PullRequestService.*
 
     val userName = loginAccount.userName
-    val condition = getOrCreateCondition(Keys.Session.DashboardPulls, filter, userName)
+    val condition = getOrCreateCondition(filter, userName)
     val allRepos = getAllRepositories(userName)
     val page = IssueSearchCondition.page(request)
     val issues = searchIssue(
@@ -147,7 +145,7 @@ trait DashboardControllerBase extends ControllerBase {
       IssueSearchOption.PullRequests,
       (page - 1) * PullRequestLimit,
       PullRequestLimit,
-      allRepos: _*
+      allRepos*
     )
     val status = issues.map { issue =>
       issue.commitId.flatMap { commitId =>
@@ -158,8 +156,8 @@ trait DashboardControllerBase extends ControllerBase {
     html.pulls(
       issues.zip(status),
       page,
-      countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, allRepos: _*),
+      countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, allRepos*),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, allRepos: _*),
+      countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, allRepos*),
       filter match {
         case "assigned"  => condition.copy(assigned = Some(Some(userName)))
         case "mentioned" => condition.copy(mentioned = Some(userName))
@@ -171,8 +169,9 @@ trait DashboardControllerBase extends ControllerBase {
         context.loginAccount,
         None,
         withoutPhysicalInfo = true,
-        limit = context.settings.limitVisibleRepositories
+        limit = context.settings.basicBehavior.limitVisibleRepositories
-      )
+      ),
+      isNewsFeedEnabled
     )
   }
 

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

@@ -75,59 +75,57 @@ class FileUploadController
   post("/wiki/:owner/:repository") {
     setMultipartConfig()
     // Don't accept not logged-in users
-    session.get(Keys.Session.LoginAccount).collect {
+    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account =>
-      case loginAccount: Account =>
+      val owner = params("owner")
-        val owner = params("owner")
+      val repository = params("repository")
-        val repository = params("repository")
 
-        // Check whether logged-in user is collaborator
+      // Check whether logged-in user is collaborator
-        onlyWikiEditable(owner, repository, loginAccount) {
+      onlyWikiEditable(owner, repository, loginAccount) {
-          execute(
+        execute(
-            { (file, fileId) =>
+          { (file, fileId) =>
-              val fileName = file.getName
+            val fileName = file.getName
-              LockUtil.lock(s"${owner}/${repository}/wiki") {
+            LockUtil.lock(s"$owner/$repository/wiki") {
-                Using.resource(Git.open(Directory.getWikiRepositoryDir(owner, repository))) {
+              Using.resource(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
-                  git =>
+                val builder = DirCache.newInCore.builder()
-                    val builder = DirCache.newInCore.builder()
+                val inserter = git.getRepository.newObjectInserter()
-                    val inserter = git.getRepository.newObjectInserter()
+                val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-                    val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
 
-                    if (headId != null) {
+                if (headId != null) {
-                      JGitUtil.processTree(git, headId) { (path, tree) =>
+                  JGitUtil.processTree(git, headId) { (path, tree) =>
-                        if (path != fileName) {
+                    if (path != fileName) {
-                          builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+                      builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                        }
-                      }
                     }
-
+                  }
-                    val bytes = IOUtils.toByteArray(file.getInputStream)
-                    builder.add(
-                      JGitUtil.createDirCacheEntry(
-                        fileName,
-                        FileMode.REGULAR_FILE,
-                        inserter.insert(Constants.OBJ_BLOB, bytes)
-                      )
-                    )
-                    builder.finish()
-
-                    val newHeadId = JGitUtil.createNewCommit(
-                      git,
-                      inserter,
-                      headId,
-                      builder.getDirCache.writeTree(inserter),
-                      Constants.HEAD,
-                      loginAccount.fullName,
-                      loginAccount.mailAddress,
-                      s"Uploaded ${fileName}"
-                    )
-
-                    fileName
                 }
+
+                val bytes = IOUtils.toByteArray(file.getInputStream)
+                builder.add(
+                  JGitUtil.createDirCacheEntry(
+                    fileName,
+                    FileMode.REGULAR_FILE,
+                    inserter.insert(Constants.OBJ_BLOB, bytes)
+                  )
+                )
+                builder.finish()
+
+                JGitUtil.createNewCommit(
+                  git,
+                  inserter,
+                  headId,
+                  builder.getDirCache.writeTree(inserter),
+                  Constants.HEAD,
+                  loginAccount.fullName,
+                  loginAccount.mailAddress,
+                  s"Uploaded $fileName"
+                )
+
+                fileName
               }
-            },
+            }
-            _ => true
+          },
-          )
+          _ => true
-        }
+        )
+      }
     } getOrElse BadRequest()
   }
 
@@ -135,32 +133,34 @@ class FileUploadController
     setMultipartConfigForLargeFile()
     session
       .get(Keys.Session.LoginAccount)
-      .collect {
+      .collect { case _: Account =>
-        case _: Account =>
+        val owner = params("owner")
-          val owner = params("owner")
+        val repository = params("repository")
-          val repository = params("repository")
+        val tag = multiParams("splat").head
-          val tag = multiParams("splat").head
+        execute(
-          execute(
+          { (file, fileId) =>
-            { (file, fileId) =>
+            FileUtils.writeByteArrayToFile(
-              FileUtils.writeByteArrayToFile(
+              new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)),
-                new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)),
+              file.get()
-                file.get()
+            )
-              )
+          },
-            },
+          _ => true
-            _ => true
+        )
-          )
       }
       .getOrElse(BadRequest())
   }
 
   post("/import") {
-    import JDBCUtil._
+    import JDBCUtil.*
     setMultipartConfig()
     session.get(Keys.Session.LoginAccount).collect {
       case loginAccount: Account if loginAccount.isAdmin =>
-        execute({ (file, fileId) =>
+        execute(
-          request2Session(request).conn.importAsSQL(file.getInputStream)
+          { (file, fileId) =>
-        }, _ => true)
+            request2Session(request).conn.importAsSQL(file.getInputStream)
+          },
+          _ => true
+        )
     }
     redirect("/admin/data")
   }
@@ -168,13 +168,13 @@ class FileUploadController
   private def setMultipartConfig(): Unit = {
     val settings = loadSystemSettings()
     val config = MultipartConfig(maxFileSize = Some(settings.upload.maxFileSize))
-    config.apply(request.getServletContext())
+    config.apply(request.getServletContext)
   }
 
   private def setMultipartConfigForLargeFile(): Unit = {
     val settings = loadSystemSettings()
     val config = MultipartConfig(maxFileSize = Some(settings.upload.largeMaxFileSize))
-    config.apply(request.getServletContext())
+    config.apply(request.getServletContext)
   }
 
   private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
@@ -191,7 +191,7 @@ class FileUploadController
     }
   }
 
-  private def execute(f: (FileItem, String) => Unit, mimeTypeChecker: (String) => Boolean) =
+  private def execute(f: (FileItem, String) => Unit, mimeTypeChecker: String => Boolean) =
     fileParams.get("file") match {
       case Some(file) if mimeTypeChecker(file.name) =>
         val fileId = FileUtil.generateFileId

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

@@ -1,17 +1,20 @@
 package gitbucket.core.controller
 
-import java.net.URI
+import com.nimbusds.jwt.JWT
 
+import java.net.URI
 import com.nimbusds.oauth2.sdk.id.State
 import com.nimbusds.openid.connect.sdk.Nonce
 import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
-import gitbucket.core.service._
+import gitbucket.core.service.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util._
+import gitbucket.core.util.*
-import gitbucket.core.view.helpers._
+import gitbucket.core.view.helpers.*
 import org.scalatra.Ok
-import org.scalatra.forms._
+import org.scalatra.forms.*
+
+import gitbucket.core.service.ActivityService.*
 
 class IndexController
     extends IndexControllerBase
@@ -31,19 +34,12 @@ class IndexController
     with RequestCache
 
 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & ActivityService & AccountService & RepositorySearchService & UsersAuthenticator &
-    with ActivityService
+    ReferrerAuthenticator & AccessTokenService & AccountFederationService & OpenIDConnectService =>
-    with AccountService
-    with RepositorySearchService
-    with UsersAuthenticator
-    with ReferrerAuthenticator
-    with AccessTokenService
-    with AccountFederationService
-    with OpenIDConnectService =>
 
-  case class SignInForm(userName: String, password: String, hash: Option[String])
+  private case class SignInForm(userName: String, password: String, hash: Option[String])
 
-  val signinForm = mapping(
+  private val signinForm = mapping(
     "userName" -> trim(label("Username", text(required))),
     "password" -> trim(label("Password", text(required))),
     "hash" -> trim(optional(text()))
@@ -57,38 +53,53 @@ trait IndexControllerBase extends ControllerBase {
 //
 //  case class SearchForm(query: String, owner: String, repository: String)
 
-  case class OidcContext(state: State, nonce: Nonce, redirectBackURI: String)
+  private case class OidcAuthContext(state: State, nonce: Nonce, redirectBackURI: String)
+  private case class OidcSessionContext(token: JWT)
 
   get("/") {
     context.loginAccount
       .map { account =>
-        val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
+        // val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
-        gitbucket.core.html.index(
+        if (!isNewsFeedEnabled) {
-          getRecentActivitiesByOwners(visibleOwnerSet),
+          redirect("/dashboard/repos")
-          getVisibleRepositories(
+        } else {
+          val repos = getVisibleRepositories(
             Some(account),
             None,
             withoutPhysicalInfo = true,
-            limit = context.settings.limitVisibleRepositories
+            limit = false
-          ),
-          showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
-            account.userName
           )
-        )
+
+          gitbucket.core.html.index(
+            activities = getRecentActivitiesByRepos(repos.map(x => (x.owner, x.name)).toSet),
+            recentRepositories = if (context.settings.basicBehavior.limitVisibleRepositories) {
+              repos.filter(x => x.owner == account.userName)
+            } else repos,
+            showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
+              account.userName
+            ),
+            enableNewsFeed = isNewsFeedEnabled
+          )
+        }
       }
       .getOrElse {
         gitbucket.core.html.index(
-          getRecentPublicActivities(),
+          activities = getRecentPublicActivities(),
-          getVisibleRepositories(None, withoutPhysicalInfo = true),
+          recentRepositories = getVisibleRepositories(None, withoutPhysicalInfo = true),
-          showBannerToCreatePersonalAccessToken = false
+          showBannerToCreatePersonalAccessToken = false,
+          enableNewsFeed = isNewsFeedEnabled
         )
       }
   }
 
   get("/signin") {
-    val redirect = params.get("redirect")
+    if (context.loginAccount.nonEmpty) {
-    if (redirect.isDefined && redirect.get.startsWith("/")) {
+      redirect("/")
-      flash.update(Keys.Flash.Redirect, redirect.get)
+    }
+    params.get("redirect").foreach { redirect =>
+      if (redirect.startsWith("/")) {
+        flash.update(Keys.Flash.Redirect, redirect)
+      }
     }
     gitbucket.core.html.signin(flash.get("userName"), flash.get("password"), flash.get("error"))
   }
@@ -120,8 +131,8 @@ trait IndexControllerBase extends ControllerBase {
         case _                             => "/"
       }
       session.setAttribute(
-        Keys.Session.OidcContext,
+        Keys.Session.OidcAuthContext,
-        OidcContext(authenticationRequest.getState, authenticationRequest.getNonce, redirectBackURI)
+        OidcAuthContext(authenticationRequest.getState, authenticationRequest.getNonce, redirectBackURI)
       )
       redirect(authenticationRequest.toURI.toString)
     } getOrElse {
@@ -135,9 +146,10 @@ trait IndexControllerBase extends ControllerBase {
   get("/signin/oidc") {
     context.settings.oidc.map { oidc =>
       val redirectURI = new URI(s"$baseUrl/signin/oidc")
-      session.get(Keys.Session.OidcContext) match {
+      session.get(Keys.Session.OidcAuthContext) match {
-        case Some(context: OidcContext) =>
+        case Some(context: OidcAuthContext) =>
-          authenticate(params.toMap, redirectURI, context.state, context.nonce, oidc).map { account =>
+          authenticate(params.toMap, redirectURI, context.state, context.nonce, oidc).map { case (jwt, account) =>
+            session.setAttribute(Keys.Session.OidcSessionContext, OidcSessionContext(jwt))
             signin(account, context.redirectBackURI)
           } orElse {
             flash.update("error", "Sorry, authentication failed. Please try again.")
@@ -155,7 +167,18 @@ trait IndexControllerBase extends ControllerBase {
   }
 
   get("/signout") {
-    session.invalidate
+    context.settings.oidc.foreach { oidc =>
+      session.get(Keys.Session.OidcSessionContext).foreach { case context: OidcSessionContext =>
+        val redirectURI = new URI(baseUrl)
+        val authenticationRequest = createOIDLogoutRequest(oidc.issuer, oidc.clientID, redirectURI, context.token)
+        session.invalidate()
+        redirect(authenticationRequest.toURI.toString)
+      }
+    }
+    session.invalidate()
+    if (isDevFeatureEnabled(DevFeatures.KeepSession)) {
+      deleteLoginAccountFromLocalFile()
+    }
     redirect("/")
   }
 
@@ -173,11 +196,24 @@ trait IndexControllerBase extends ControllerBase {
     Ok()
   }
 
+  get("/user.css") {
+    context.settings.userDefinedCss match {
+      case Some(css) =>
+        contentType = "text/css"
+        css
+      case None =>
+        NotFound()
+    }
+  }
+
   /**
    * Set account information into HttpSession and redirect.
    */
   private def signin(account: Account, redirectUrl: String = "/") = {
     session.setAttribute(Keys.Session.LoginAccount, account)
+    if (isDevFeatureEnabled(DevFeatures.KeepSession)) {
+      saveLoginAccountToLocalFile(account)
+    }
     updateLastLoginDate(account.userName)
 
     if (LDAPUtil.isDummyMailAddress(account)) {
@@ -200,8 +236,8 @@ trait IndexControllerBase extends ControllerBase {
     val group = params("group").toBoolean
     org.json4s.jackson.Serialization.write(
       Map(
-        "options" -> (
+        "options" ->
-          getAllUsers(false)
+          getAllUsers(includeRemoved = false)
             .withFilter { t =>
               (user, group) match {
                 case (true, true)   => true
@@ -213,43 +249,54 @@ trait IndexControllerBase extends ControllerBase {
             .map { t =>
               Map(
                 "label" -> s"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(
-                  StringUtil.cutTail(t.userName, 25, "...")
+                    StringUtil.cutTail(t.userName, 25, "...")
-                )}</b> ${StringUtil
+                  )}</b> ${StringUtil
-                  .escapeHtml(StringUtil.cutTail(t.fullName, 25, "..."))}",
+                    .escapeHtml(StringUtil.cutTail(t.fullName, 25, "..."))}",
                 "value" -> t.userName
               )
             }
-        )
       )
     )
   })
 
   /**
    * JSON API for checking user or group existence.
+   *
    * Returns a single string which is any of "group", "user" or "".
+   * Additionally, check whether the user is writable to the repository
+   * if "owner" and "repository" are given,
    */
   post("/_user/existence")(usersOnly {
     getAccountByUserNameIgnoreCase(params("userName")).map { account =>
-      if (account.isGroupAccount) "group" else "user"
+      if (!account.isGroupAccount && params.get("repository").isDefined && params.get("owner").isDefined) {
+        getRepository(params("owner"), params("repository"))
+          .collect {
+            case repository if isWritable(repository.repository, Some(account)) => "user"
+          }
+          .getOrElse("")
+      } else {
+        if (account.isGroupAccount) "group" else "user"
+      }
     } getOrElse ""
   })
 
-  // TODO Move to RepositoryViewrController?
+  // TODO Move to RepositoryViewerController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
     val query = params.getOrElse("q", "").trim
     val target = params.getOrElse("type", "code")
-    val page = try {
+    val page =
-      val i = params.getOrElse("page", "1").toInt
+      try {
-      if (i <= 0) 1 else i
+        val i = params.getOrElse("page", "1").toInt
-    } catch {
+        if (i <= 0) 1 else i
-      case _: NumberFormatException => 1
+      } catch {
-    }
+        case _: NumberFormatException => 1
+      }
 
     target.toLowerCase match {
       case "issues" =>
         gitbucket.core.search.html.issues(
-          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
+          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, pullRequest = false) else Nil,
-          false,
+          pullRequest = false,
           query,
           page,
           repository
@@ -257,8 +304,8 @@ trait IndexControllerBase extends ControllerBase {
 
       case "pulls" =>
         gitbucket.core.search.html.issues(
-          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
+          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, pullRequest = true) else Nil,
-          true,
+          pullRequest = true,
           query,
           page,
           repository
@@ -289,19 +336,19 @@ trait IndexControllerBase extends ControllerBase {
         context.loginAccount,
         None,
         withoutPhysicalInfo = true,
-        limit = context.settings.limitVisibleRepositories
+        limit = context.settings.basicBehavior.limitVisibleRepositories
       )
 
     val repositories = {
-      context.settings.limitVisibleRepositories match {
+      if (context.settings.basicBehavior.limitVisibleRepositories) {
-        case true =>
+        getVisibleRepositories(
-          getVisibleRepositories(
+          context.loginAccount,
-            context.loginAccount,
+          None,
-            None,
+          withoutPhysicalInfo = true,
-            withoutPhysicalInfo = true,
+          limit = false
-            limit = false
+        )
-          )
+      } else {
-        case false => visibleRepositories
+        visibleRepositories
       }
     }.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0

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

@@ -1,14 +1,14 @@
 package gitbucket.core.controller
 
 import gitbucket.core.issues.html
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, CustomFieldBehavior}
-import gitbucket.core.service.IssuesService._
+import gitbucket.core.service.IssuesService.*
-import gitbucket.core.service._
+import gitbucket.core.service.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util._
+import gitbucket.core.util.*
 import gitbucket.core.view
 import gitbucket.core.view.Markdown
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import org.scalatra.{BadRequest, Ok}
 
 class IssuesController
@@ -21,6 +21,7 @@ class IssuesController
     with ActivityService
     with HandleCommentService
     with IssueCreationService
+    with CustomFieldsService
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
@@ -33,88 +34,88 @@ class IssuesController
     with RequestCache
 
 trait IssuesControllerBase extends ControllerBase {
-  self: IssuesService
+  self: IssuesService & RepositoryService & AccountService & LabelsService & MilestonesService & ActivityService &
-    with RepositoryService
+    HandleCommentService & IssueCreationService & CustomFieldsService & ReadableUsersAuthenticator &
-    with AccountService
+    ReferrerAuthenticator & WritableUsersAuthenticator & PullRequestService & WebHookIssueCommentService &
-    with LabelsService
+    PrioritiesService =>
-    with MilestonesService
-    with ActivityService
-    with HandleCommentService
-    with IssueCreationService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator
-    with PullRequestService
-    with WebHookIssueCommentService
-    with PrioritiesService =>
 
-  case class IssueCreateForm(
+  private case class IssueCreateForm(
     title: String,
     content: Option[String],
-    assignedUserName: Option[String],
+    assigneeUserNames: Option[String],
     milestoneId: Option[Int],
     priorityId: Option[Int],
     labelNames: Option[String]
   )
-  case class CommentForm(issueId: Int, content: String)
+  private case class CommentForm(issueId: Int, content: String)
-  case class IssueStateForm(issueId: Int, content: Option[String])
+  private case class IssueStateForm(issueId: Int, content: Option[String])
 
-  val issueCreateForm = mapping(
+  private val issueCreateForm = mapping(
     "title" -> trim(label("Title", text(required))),
     "content" -> trim(optional(text())),
-    "assignedUserName" -> trim(optional(text())),
+    "assigneeUserNames" -> trim(optional(text())),
     "milestoneId" -> trim(optional(number())),
     "priorityId" -> trim(optional(number())),
     "labelNames" -> trim(optional(text()))
   )(IssueCreateForm.apply)
 
-  val issueTitleEditForm = mapping(
+  private val issueTitleEditForm = mapping(
     "title" -> trim(label("Title", text(required)))
   )(x => x)
-  val issueEditForm = mapping(
+  private val issueEditForm = mapping(
     "content" -> trim(optional(text()))
   )(x => x)
 
-  val commentForm = mapping(
+  private val commentForm = mapping(
     "issueId" -> label("Issue Id", number()),
     "content" -> trim(label("Comment", text(required)))
   )(CommentForm.apply)
 
-  val issueStateForm = mapping(
+  private val issueStateForm = mapping(
     "issueId" -> label("Issue Id", number()),
     "content" -> trim(optional(text()))
   )(IssueStateForm.apply)
 
   get("/:owner/:repository/issues")(referrersOnly { repository =>
     val q = request.getParameter("q")
-    if (Option(q).exists(_.contains("is:pr"))) {
+    Option(q) match {
-      redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
+      case Some(filter) if filter.contains("is:pr") =>
-    } else {
+        redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
-      searchIssues(repository)
+      case Some(filter) =>
+        val condition = IssueSearchCondition(filter)
+        if (condition.isEmpty) {
+          // Redirect to keyword search
+          redirect(s"/${repository.owner}/${repository.name}/search?q=${StringUtil.urlEncode(q)}&type=issues")
+        } else {
+          searchIssues(repository, condition, IssueSearchCondition.page(request))
+        }
+      case None =>
+        searchIssues(repository, IssueSearchCondition(request), IssueSearchCondition.page(request))
     }
   })
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
     val issueId = params("id")
-    getIssue(repository.owner, repository.name, issueId) map {
+    getIssue(repository.owner, repository.name, issueId) map { issue =>
-      issue =>
+      if (issue.isPullRequest) {
-        if (issue.isPullRequest) {
+        redirect(s"/${repository.owner}/${repository.name}/pull/$issueId")
-          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+      } else {
-        } else {
+        html.issue(
-          html.issue(
+          issue,
-            issue,
+          getComments(repository.owner, repository.name, issueId.toInt),
-            getComments(repository.owner, repository.name, issueId.toInt),
+          getIssueLabels(repository.owner, repository.name, issueId.toInt),
-            getIssueLabels(repository.owner, repository.name, issueId.toInt),
+          getIssueAssignees(repository.owner, repository.name, issueId.toInt),
-            getAssignableUserNames(repository.owner, repository.name),
+          getAssignableUserNames(repository.owner, repository.name),
-            getMilestonesWithIssueCount(repository.owner, repository.name),
+          getMilestonesWithIssueCount(repository.owner, repository.name),
-            getPriorities(repository.owner, repository.name),
+          getPriorities(repository.owner, repository.name),
-            getLabels(repository.owner, repository.name),
+          getLabels(repository.owner, repository.name),
-            isIssueEditable(repository),
+          getCustomFieldsWithValue(repository.owner, repository.name, issueId.toInt).filter(_._1.enableForIssues),
-            isIssueManageable(repository),
+          isIssueEditable(repository),
-            isIssueCommentManageable(repository),
+          isIssueManageable(repository),
-            repository
+          isIssueCommentManageable(repository),
-          )
+          repository
-        }
+        )
+      }
     } getOrElse NotFound()
   })
 
@@ -126,6 +127,7 @@ trait IssuesControllerBase extends ControllerBase {
         getPriorities(repository.owner, repository.name),
         getDefaultPriority(repository.owner, repository.name),
         getLabels(repository.owner, repository.name),
+        getCustomFields(repository.owner, repository.name).filter(_.enableForIssues),
         isIssueManageable(repository),
         getContentTemplate(repository, "ISSUE_TEMPLATE"),
         repository
@@ -134,111 +136,120 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-        if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
+        val issue = createIssue(
-          val issue = createIssue(
+          repository,
-            repository,
+          form.title,
-            form.title,
+          form.content,
-            form.content,
+          form.assigneeUserNames.toSeq.flatMap(_.split(",")),
-            form.assignedUserName,
+          form.milestoneId,
-            form.milestoneId,
+          form.priorityId,
-            form.priorityId,
+          form.labelNames.toSeq.flatMap(_.split(",")),
-            form.labelNames.toSeq.flatMap(_.split(",")),
+          loginAccount
-            loginAccount
+        )
-          )
+
-          redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
+        // Insert custom field values
-        } else Unauthorized()
+        params.toMap.foreach { case (key, value) =>
+          if (key.startsWith("custom-field-")) {
+            getCustomField(
+              repository.owner,
+              repository.name,
+              key.replaceFirst("^custom-field-", "").toInt
+            ).foreach { field =>
+              CustomFieldBehavior.validate(field, value, messages) match {
+                case None =>
+                  insertOrUpdateCustomFieldValue(field, repository.owner, repository.name, issue.issueId, value)
+                case Some(_) => halt(400)
+              }
+            }
+          }
+        }
+
+        redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
+      } else Unauthorized()
     }
   })
 
   ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      getIssue(repository.owner, repository.name, params("id")).map { issue =>
-        getIssue(repository.owner, repository.name, params("id")).map {
+        if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
-          issue =>
+          if (issue.title != title) {
-            if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
+            // update issue
-              if (issue.title != title) {
+            updateIssue(repository.owner, repository.name, issue.issueId, title, issue.content)
-                // update issue
+            // extract references and create refer comment
-                updateIssue(repository.owner, repository.name, issue.issueId, title, issue.content)
+            createReferComment(repository.owner, repository.name, issue.copy(title = title), title, loginAccount)
-                // extract references and create refer comment
+            createComment(
-                createReferComment(repository.owner, repository.name, issue.copy(title = title), title, loginAccount)
+              repository.owner,
-                createComment(
+              repository.name,
-                  repository.owner,
+              loginAccount.userName,
-                  repository.name,
+              issue.issueId,
-                  loginAccount.userName,
+              issue.title + "\r\n" + title,
-                  issue.issueId,
+              "change_title"
-                  issue.title + "\r\n" + title,
+            )
-                  "change_title"
+          }
-                )
+          redirect(s"/${repository.owner}/${repository.name}/issues/_data/${issue.issueId}")
-              }
+        } else Unauthorized()
-              redirect(s"/${repository.owner}/${repository.name}/issues/_data/${issue.issueId}")
+      } getOrElse NotFound()
-            } else Unauthorized()
-        } getOrElse NotFound()
     }
   })
 
   ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (content, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      getIssue(repository.owner, repository.name, params("id")).map { issue =>
-        getIssue(repository.owner, repository.name, params("id")).map { issue =>
+        if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
-          if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
+          // update issue
-            // update issue
+          updateIssue(repository.owner, repository.name, issue.issueId, issue.title, content)
-            updateIssue(repository.owner, repository.name, issue.issueId, issue.title, content)
+          // extract references and create refer comment
-            // extract references and create refer comment
+          createReferComment(repository.owner, repository.name, issue, content.getOrElse(""), loginAccount)
-            createReferComment(repository.owner, repository.name, issue, content.getOrElse(""), loginAccount)
 
-            redirect(s"/${repository.owner}/${repository.name}/issues/_data/${issue.issueId}")
+          redirect(s"/${repository.owner}/${repository.name}/issues/_data/${issue.issueId}")
-          } else Unauthorized()
+        } else Unauthorized()
-        } getOrElse NotFound()
+      } getOrElse NotFound()
     }
   })
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
+        val actionOpt =
-          val actionOpt =
+          params
-            params
+            .get("action")
-              .get("action")
+            .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
-              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
+        handleComment(issue, Some(form.content), repository, actionOpt) map { case (issue, id) =>
-          handleComment(issue, Some(form.content), repository, actionOpt) map {
+          redirect(
-            case (issue, id) =>
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-$id"
-              redirect(
+          )
-                s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+        }
-              )
+      } getOrElse NotFound()
-          }
-        } getOrElse NotFound()
     }
   })
 
   post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
+        val actionOpt =
-          val actionOpt =
+          params
-            params
+            .get("action")
-              .get("action")
+            .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
-              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
+        handleComment(issue, form.content, repository, actionOpt) map { case (issue, id) =>
-          handleComment(issue, form.content, repository, actionOpt) map {
+          redirect(
-            case (issue, id) =>
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-$id"
-              redirect(
+          )
-                s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+        }
-              )
+      } getOrElse NotFound()
-          }
-        } getOrElse NotFound()
     }
   })
 
   ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      getComment(repository.owner, repository.name, params("id")).map { comment =>
-        getComment(repository.owner, repository.name, params("id")).map { comment =>
+        if (isEditableContent(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
-          if (isEditableContent(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
+          updateComment(repository.owner, repository.name, comment.issueId, comment.commentId, form.content)
-            updateComment(comment.issueId, comment.commentId, form.content)
+          redirect(s"/${repository.owner}/${repository.name}/issue_comments/_data/${comment.commentId}")
-            redirect(s"/${repository.owner}/${repository.name}/issue_comments/_data/${comment.commentId}")
+        } else Unauthorized()
-          } else Unauthorized()
+      } getOrElse NotFound()
-        } getOrElse NotFound()
     }
   })
 
@@ -253,65 +264,61 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      getIssue(repository.owner, repository.name, params("id")) map { x =>
-        getIssue(repository.owner, repository.name, params("id")) map {
+        if (isEditableContent(x.userName, x.repositoryName, x.openedUserName, loginAccount)) {
-          x =>
+          params.get("dataType") collect {
-            if (isEditableContent(x.userName, x.repositoryName, x.openedUserName, loginAccount)) {
+            case t if t == "html" => html.editissue(x.content, x.issueId, repository)
-              params.get("dataType") collect {
+          } getOrElse {
-                case t if t == "html" => html.editissue(x.content, x.issueId, repository)
+            contentType = formats("json")
-              } getOrElse {
+            org.json4s.jackson.Serialization.write(
-                contentType = formats("json")
+              Map(
-                org.json4s.jackson.Serialization.write(
+                "title" -> x.title,
-                  Map(
+                "content" -> Markdown.toHtml(
-                    "title" -> x.title,
+                  markdown = x.content getOrElse "No description given.",
-                    "content" -> Markdown.toHtml(
+                  repository = repository,
-                      markdown = x.content getOrElse "No description given.",
+                  branch = repository.repository.defaultBranch,
-                      repository = repository,
+                  enableWikiLink = false,
-                      branch = repository.repository.defaultBranch,
+                  enableRefsLink = true,
-                      enableWikiLink = false,
+                  enableAnchor = true,
-                      enableRefsLink = true,
+                  enableLineBreaks = true,
-                      enableAnchor = true,
+                  enableTaskList = true,
-                      enableLineBreaks = true,
+                  hasWritePermission = true
-                      enableTaskList = true,
-                      hasWritePermission = true
-                    )
-                  )
                 )
-              }
+              )
-            } else Unauthorized()
+            )
-        } getOrElse NotFound()
+          }
+        } else Unauthorized()
+      } getOrElse NotFound()
     }
   })
 
   ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      getComment(repository.owner, repository.name, params("id")) map { x =>
-        getComment(repository.owner, repository.name, params("id")) map {
+        if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName, loginAccount)) {
-          x =>
+          params.get("dataType") collect {
-            if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName, loginAccount)) {
+            case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
-              params.get("dataType") collect {
+          } getOrElse {
-                case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+            contentType = formats("json")
-              } getOrElse {
+            org.json4s.jackson.Serialization.write(
-                contentType = formats("json")
+              Map(
-                org.json4s.jackson.Serialization.write(
+                "content" -> view.Markdown.toHtml(
-                  Map(
+                  markdown = x.content,
-                    "content" -> view.Markdown.toHtml(
+                  repository = repository,
-                      markdown = x.content,
+                  branch = repository.repository.defaultBranch,
-                      repository = repository,
+                  enableWikiLink = false,
-                      branch = repository.repository.defaultBranch,
+                  enableRefsLink = true,
-                      enableWikiLink = false,
+                  enableAnchor = true,
-                      enableRefsLink = true,
+                  enableLineBreaks = true,
-                      enableAnchor = true,
+                  enableTaskList = true,
-                      enableLineBreaks = true,
+                  hasWritePermission = true
-                      enableTaskList = true,
-                      hasWritePermission = true
-                    )
-                  )
                 )
-              }
+              )
-            } else Unauthorized()
+            )
-        } getOrElse NotFound()
+          }
+        } else Unauthorized()
+      } getOrElse NotFound()
     }
   })
 
@@ -323,45 +330,80 @@ trait IssuesControllerBase extends ControllerBase {
 
   ajaxPost("/:owner/:repository/issues/:id/label/new")(writableUsersOnly { repository =>
     val issueId = params("id").toInt
-    registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+    registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, insertComment = true)
     html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/delete")(writableUsersOnly { repository =>
     val issueId = params("id").toInt
-    deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+    deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, insertComment = true)
     html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
   })
 
-  ajaxPost("/:owner/:repository/issues/:id/assign")(writableUsersOnly { repository =>
+  ajaxPost("/:owner/:repository/issues/:id/assignee/new")(writableUsersOnly { repository =>
-    updateAssignedUserName(
+    val issueId = params("id").toInt
-      repository.owner,
+    registerIssueAssignee(repository.owner, repository.name, issueId, params("assigneeUserName"), insertComment = true)
-      repository.name,
+    Ok()
-      params("id").toInt,
+  })
-      assignedUserName("assignedUserName"),
+
-      true
+  ajaxPost("/:owner/:repository/issues/:id/assignee/delete")(writableUsersOnly { repository =>
-    )
+    val issueId = params("id").toInt
-    Ok("updated")
+    deleteIssueAssignee(repository.owner, repository.name, issueId, params("assigneeUserName"), insertComment = true)
+    Ok()
   })
 
   ajaxPost("/:owner/:repository/issues/:id/milestone")(writableUsersOnly { repository =>
-    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"), true)
+    updateMilestoneId(
+      repository.owner,
+      repository.name,
+      params("id").toInt,
+      milestoneId("milestoneId"),
+      insertComment = true
+    )
     milestoneId("milestoneId").map { milestoneId =>
       getMilestonesWithIssueCount(repository.owner, repository.name)
         .find(_._1.milestoneId == milestoneId)
-        .map {
+        .map { case (_, openCount, closeCount) =>
-          case (_, openCount, closeCount) =>
+          gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
-            gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
         } getOrElse NotFound()
     } getOrElse Ok()
   })
 
   ajaxPost("/:owner/:repository/issues/:id/priority")(writableUsersOnly { repository =>
     val priority = priorityId("priorityId")
-    updatePriorityId(repository.owner, repository.name, params("id").toInt, priority, true)
+    updatePriorityId(repository.owner, repository.name, params("id").toInt, priority, insertComment = true)
     Ok("updated")
   })
 
+  ajaxPost("/:owner/:repository/issues/customfield_validation/:fieldId")(writableUsersOnly { repository =>
+    val fieldId = params("fieldId").toInt
+    val value = params("value")
+    getCustomField(repository.owner, repository.name, fieldId)
+      .flatMap { field =>
+        CustomFieldBehavior.validate(field, value, messages).map { error =>
+          Ok(error)
+        }
+      }
+      .getOrElse(Ok())
+  })
+
+  ajaxPost("/:owner/:repository/issues/:id/customfield/:fieldId")(writableUsersOnly { repository =>
+    val issueId = params("id").toInt
+    val fieldId = params("fieldId").toInt
+    val value = params("value")
+
+    for {
+      _ <- getIssue(repository.owner, repository.name, issueId.toString)
+      field <- getCustomField(repository.owner, repository.name, fieldId)
+    } {
+      CustomFieldBehavior.validate(field, value, messages) match {
+        case None    => insertOrUpdateCustomFieldValue(field, repository.owner, repository.name, issueId, value)
+        case Some(_) => halt(400)
+      }
+    }
+    Ok(value)
+  })
+
   post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
     val action = params.get("value")
     action match {
@@ -391,7 +433,7 @@ trait IssuesControllerBase extends ControllerBase {
     params("value").toIntOpt.map { labelId =>
       executeBatch(repository) { issueId =>
         getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
-          registerIssueLabel(repository.owner, repository.name, issueId, labelId, true)
+          registerIssueLabel(repository.owner, repository.name, issueId, labelId, insertComment = true)
           if (params("uri").nonEmpty) {
             redirect(params("uri"))
           }
@@ -403,7 +445,13 @@ trait IssuesControllerBase extends ControllerBase {
   post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
     val value = assignedUserName("value")
     executeBatch(repository) {
-      updateAssignedUserName(repository.owner, repository.name, _, value, true)
+      // updateAssignedUserName(repository.owner, repository.name, _, value, true)
+      value match {
+        case Some(assignedUserName) =>
+          registerIssueAssignee(repository.owner, repository.name, _, assignedUserName, insertComment = true)
+        case None =>
+          deleteAllIssueAssignees(repository.owner, repository.name, _, insertComment = true)
+      }
     }
     if (params("uri").nonEmpty) {
       redirect(params("uri"))
@@ -413,20 +461,20 @@ trait IssuesControllerBase extends ControllerBase {
   post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
     val value = milestoneId("value")
     executeBatch(repository) {
-      updateMilestoneId(repository.owner, repository.name, _, value, true)
+      updateMilestoneId(repository.owner, repository.name, _, value, insertComment = true)
     }
   })
 
   post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
     val value = priorityId("value")
     executeBatch(repository) {
-      updatePriorityId(repository.owner, repository.name, _, value, true)
+      updatePriorityId(repository.owner, repository.name, _, value, insertComment = true)
     }
   })
 
   get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
     (Directory.getAttachedDir(repository.owner, repository.name) match {
-      case dir if (dir.exists && dir.isDirectory) =>
+      case dir if dir.exists && dir.isDirectory =>
         dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file =>
           response.setHeader("Content-Disposition", f"""inline; filename=${file.getName}""")
           RawData(FileUtil.getSafeMimeType(file.getName), file)
@@ -442,27 +490,26 @@ trait IssuesControllerBase extends ControllerBase {
     contentType = formats("json")
     org.json4s.jackson.Serialization.write(
       Map(
-        "options" -> (
+        "options" ->
           getOpenIssues(repository.owner, repository.name)
             .map { t =>
               Map(
                 "label" -> s"""${if (t.isPullRequest) "<i class='octicon octicon-git-pull-request'></i>"
-                else "<i class='octicon octicon-issue-opened'></i>"}<b> #${StringUtil
+                  else "<i class='octicon octicon-issue-opened'></i>"}<b> #${StringUtil
-                  .escapeHtml(t.issueId.toString)} ${StringUtil
+                    .escapeHtml(t.issueId.toString)} ${StringUtil
-                  .escapeHtml(StringUtil.cutTail(t.title, 50, "..."))}</b>""",
+                    .escapeHtml(StringUtil.cutTail(t.title, 50, "..."))}</b>""",
                 "value" -> t.issueId.toString
               )
             }
-        )
       )
     )
   })
 
-  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
+  private val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
-  val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+  private val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
-  val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+  private val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
-  private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
+  private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit): Unit = {
     params("checked").split(',') map (_.toInt) foreach execute
     params("from") match {
       case "issues" => redirect(s"/${repository.owner}/${repository.name}/issues")
@@ -471,10 +518,7 @@ trait IssuesControllerBase extends ControllerBase {
     }
   }
 
-  private def searchIssues(repository: RepositoryService.RepositoryInfo) = {
+  private def searchIssues(repository: RepositoryService.RepositoryInfo, condition: IssueSearchCondition, page: Int) = {
-    val page = IssueSearchCondition.page(request)
-    // retrieve search condition
-    val condition = IssueSearchCondition(request)
     // search issues
     val issues =
       searchIssue(
@@ -505,8 +549,8 @@ trait IssuesControllerBase extends ControllerBase {
   /**
    * Tests whether an issue or a comment is editable by a logged-in user.
    */
-  private def isEditableContent(owner: String, repository: String, author: String, loginAccount: Account)(
+  private def isEditableContent(owner: String, repository: String, author: String, loginAccount: Account)(implicit
-    implicit context: Context
+    context: Context
   ): Boolean = {
     hasDeveloperRole(owner, repository, context.loginAccount) || author == loginAccount.userName
   }
@@ -514,8 +558,8 @@ trait IssuesControllerBase extends ControllerBase {
   /**
    * Tests whether an issue comment is deletable by a logged-in user.
    */
-  private def isDeletableComment(owner: String, repository: String, author: String, loginAccount: Account)(
+  private def isDeletableComment(owner: String, repository: String, author: String, loginAccount: Account)(implicit
-    implicit context: Context
+    context: Context
   ): Boolean = {
     hasOwnerRole(owner, repository, context.loginAccount) || author == loginAccount.userName
   }

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

@@ -10,9 +10,9 @@ import gitbucket.core.service.{
   PrioritiesService
 }
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.SyntaxSugars.*
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import org.scalatra.i18n.Messages
 import org.scalatra.Ok
 
@@ -28,15 +28,11 @@ class LabelsController
     with WritableUsersAuthenticator
 
 trait LabelsControllerBase extends ControllerBase {
-  self: LabelsService
+  self: LabelsService & IssuesService & RepositoryService & ReferrerAuthenticator & WritableUsersAuthenticator =>
-    with IssuesService
-    with RepositoryService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
-  case class LabelForm(labelName: String, color: String)
+  private case class LabelForm(labelName: String, color: String)
 
-  val labelForm = mapping(
+  private val labelForm = mapping(
     "labelName" -> trim(label("Label name", text(required, labelName, uniqueLabelName, maxlength(100)))),
     "labelColor" -> trim(label("Color", text(required, color)))
   )(LabelForm.apply)
@@ -44,7 +40,7 @@ trait LabelsControllerBase extends ControllerBase {
   get("/:owner/:repository/issues/labels")(referrersOnly { repository =>
     html.list(
       getLabels(repository.owner, repository.name),
-      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
       repository,
       hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
     )
@@ -59,7 +55,7 @@ trait LabelsControllerBase extends ControllerBase {
     html.label(
       getLabel(repository.owner, repository.name, labelId).get,
       // TODO futility
-      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
       repository,
       hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
     )
@@ -76,7 +72,7 @@ trait LabelsControllerBase extends ControllerBase {
     html.label(
       getLabel(repository.owner, repository.name, params("labelId").toInt).get,
       // TODO futility
-      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
       repository,
       hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
     )
@@ -93,9 +89,9 @@ trait LabelsControllerBase extends ControllerBase {
   private def labelName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       if (value.contains(',')) {
-        Some(s"${name} contains invalid character.")
+        Some(s"$name contains invalid character.")
       } else if (value.startsWith("_") || value.startsWith("-")) {
-        Some(s"${name} starts with invalid character.")
+        Some(s"$name starts with invalid character.")
       } else {
         None
       }

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

@@ -9,11 +9,11 @@ import gitbucket.core.service.{
   MilestonesService,
   RepositoryService
 }
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.SyntaxSugars.*
 import gitbucket.core.view.helpers.{getAssignableUserNames, getLabels, getPriorities, searchIssue}
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import org.scalatra.i18n.Messages
 
 class MilestonesController
@@ -26,15 +26,12 @@ class MilestonesController
     with WritableUsersAuthenticator
 
 trait MilestonesControllerBase extends ControllerBase {
-  self: MilestonesService
+  self: MilestonesService & RepositoryService & CommitStatusService & ReferrerAuthenticator &
-    with RepositoryService
+    WritableUsersAuthenticator =>
-    with CommitStatusService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
-  case class MilestoneForm(title: String, description: Option[String], dueDate: Option[java.util.Date])
+  private case class MilestoneForm(title: String, description: Option[String], dueDate: Option[java.util.Date])
 
-  val milestoneForm = mapping(
+  private val milestoneForm = mapping(
     "title" -> trim(label("Title", text(required, maxlength(100), uniqueMilestone))),
     "description" -> trim(label("Description", optional(text()))),
     "dueDate" -> trim(label("Due Date", optional(date())))

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

@@ -29,13 +29,15 @@ trait PreProcessControllerBase extends ControllerBase {
    * If anonymous access is allowed, pass all requests.
    * But if it's not allowed, demands authentication except some paths.
    */
-  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
+  get(!context.settings.basicBehavior.allowAnonymousAccess, context.loginAccount.isEmpty) {
-    if (!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
+    if (
-        !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs") &&
+      !context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
-        !context.currentPath.startsWith("/plugin-assets") &&
+      !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs") &&
-        !PluginRegistry().getAnonymousAccessiblePaths().exists { path =>
+      !context.currentPath.startsWith("/plugin-assets") && !context.currentPath.equals("/user.css") &&
-          context.currentPath.startsWith(path)
+      !PluginRegistry().getAnonymousAccessiblePaths().exists { path =>
-        }) {
+        context.currentPath.startsWith(path)
+      }
+    ) {
       Unauthorized()
     } else {
       pass()

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

@@ -28,15 +28,11 @@ class PrioritiesController
     with WritableUsersAuthenticator
 
 trait PrioritiesControllerBase extends ControllerBase {
-  self: PrioritiesService
+  self: PrioritiesService & IssuesService & RepositoryService & ReferrerAuthenticator & WritableUsersAuthenticator =>
-    with IssuesService
-    with RepositoryService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
-  case class PriorityForm(priorityName: String, description: Option[String], color: String)
+  private case class PriorityForm(priorityName: String, description: Option[String], color: String)
 
-  val priorityForm = mapping(
+  private val priorityForm = mapping(
     "priorityName" -> trim(label("Priority name", text(required, priorityName, uniquePriorityName, maxlength(100)))),
     "description" -> trim(label("Description", optional(text(maxlength(255))))),
     "priorityColor" -> trim(label("Color", text(required, color)))
@@ -45,7 +41,7 @@ trait PrioritiesControllerBase extends ControllerBase {
   get("/:owner/:repository/issues/priorities")(referrersOnly { repository =>
     html.list(
       getPriorities(repository.owner, repository.name),
-      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
       repository,
       hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
     )
@@ -60,7 +56,7 @@ trait PrioritiesControllerBase extends ControllerBase {
       createPriority(repository.owner, repository.name, form.priorityName, form.description, form.color.substring(1))
     html.priority(
       getPriority(repository.owner, repository.name, priorityId).get,
-      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
       repository,
       hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
     )
@@ -84,13 +80,13 @@ trait PrioritiesControllerBase extends ControllerBase {
       )
       html.priority(
         getPriority(repository.owner, repository.name, params("priorityId").toInt).get,
-        countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+        countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
         repository,
         hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
       )
   })
 
-  ajaxPost("/:owner/:repository/issues/priorities/reorder")(writableUsersOnly { (repository) =>
+  ajaxPost("/:owner/:repository/issues/priorities/reorder")(writableUsersOnly { repository =>
     reorderPriorities(
       repository.owner,
       repository.name,
@@ -104,7 +100,7 @@ trait PrioritiesControllerBase extends ControllerBase {
     Ok()
   })
 
-  ajaxPost("/:owner/:repository/issues/priorities/default")(writableUsersOnly { (repository) =>
+  ajaxPost("/:owner/:repository/issues/priorities/default")(writableUsersOnly { repository =>
     setDefaultPriority(repository.owner, repository.name, priorityId("priorityId"))
     Ok()
   })
@@ -122,9 +118,9 @@ trait PrioritiesControllerBase extends ControllerBase {
   private def priorityName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       if (value.contains(',')) {
-        Some(s"${name} contains invalid character.")
+        Some(s"$name contains invalid character.")
       } else if (value.startsWith("_") || value.startsWith("-")) {
-        Some(s"${name} starts with invalid character.")
+        Some(s"$name starts with invalid character.")
       } else {
         None
       }

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

@@ -11,10 +11,10 @@ import gitbucket.core.service.{
   RepositoryService,
   RequestCache
 }
-import gitbucket.core.util._
+import gitbucket.core.util.*
-import gitbucket.core.util.Directory._
+import gitbucket.core.util.Directory.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import gitbucket.core.releases.html
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.Git
@@ -33,20 +33,15 @@ class ReleaseController
     with RequestCache
 
 trait ReleaseControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & AccountService & ReleaseService & ReadableUsersAuthenticator & ReferrerAuthenticator &
-    with AccountService
+    WritableUsersAuthenticator & ActivityService =>
-    with ReleaseService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator
-    with ActivityService =>
 
-  case class ReleaseForm(
+  private case class ReleaseForm(
     name: String,
     content: Option[String]
   )
 
-  val releaseForm = mapping(
+  private val releaseForm = mapping(
     "name" -> trim(text(required)),
     "content" -> trim(optional(text()))
   )(ReleaseForm.apply)
@@ -106,42 +101,39 @@ trait ReleaseControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/releases/*/create", releaseForm)(writableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      val tagName = multiParams("splat").head
-        val tagName = multiParams("splat").head
 
-        // Insert into RELEASE
+      // Insert into RELEASE
-        createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
+      createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
 
-        // Insert into RELEASE_ASSET
+      // Insert into RELEASE_ASSET
-        val files = params.toMap.collect {
+      val files = params.toMap.collect {
-          case (name, value) if name.startsWith("file:") =>
+        case (name, value) if name.startsWith("file:") =>
-            val Array(_, fileId) = name.split(":")
+          val Array(_, fileId) = name.split(":")
-            (fileId, value)
+          (fileId, value)
-        }
+      }
-        files.foreach {
+      files.foreach { case (fileId, fileName) =>
-          case (fileId, fileName) =>
+        val size =
-            val size =
+          new File(
-              new File(
+            getReleaseFilesDir(repository.owner, repository.name),
-                getReleaseFilesDir(repository.owner, repository.name),
+            FileUtil.checkFilename(tagName + "/" + fileId)
-                FileUtil.checkFilename(tagName + "/" + fileId)
+          ).length
-              ).length
+        createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
-            createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+      }
-        }
 
-        val releaseInfo = ReleaseInfo(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
+      val releaseInfo = ReleaseInfo(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
-        recordActivity(releaseInfo)
+      recordActivity(releaseInfo)
 
-        redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
+      redirect(s"/${repository.owner}/${repository.name}/releases/$tagName")
     }
   })
 
   get("/:owner/:repository/changelog/*...*")(writableUsersOnly { repository =>
-    val Seq(previousTag, currentTag) = multiParams("splat")
-    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")
-
     val commitLog = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
+      val Seq(previousTag, currentTag) = multiParams("splat")
+
+      val commits = JGitUtil.getCommitLog(git, previousTag, currentTag).reverse
       commits
         .map { commit =>
           s"- ${commit.shortMessage} ${commit.id}"
@@ -171,48 +163,45 @@ trait ReleaseControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/releases/*/edit", releaseForm)(writableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      val tagName = multiParams("splat").head
-        val tagName = multiParams("splat").head
 
-        getRelease(repository.owner, repository.name, tagName)
+      getRelease(repository.owner, repository.name, tagName)
-          .map {
+        .map { release =>
-            release =>
+          // Update RELEASE
-              // Update RELEASE
+          updateRelease(repository.owner, repository.name, tagName, form.name, form.content)
-              updateRelease(repository.owner, repository.name, tagName, form.name, form.content)
 
-              // Delete and Insert RELEASE_ASSET
+          // Delete and Insert RELEASE_ASSET
-              val assets = getReleaseAssets(repository.owner, repository.name, tagName)
+          val assets = getReleaseAssets(repository.owner, repository.name, tagName)
-              deleteReleaseAssets(repository.owner, repository.name, tagName)
+          deleteReleaseAssets(repository.owner, repository.name, tagName)
 
-              val files = params.toMap.collect {
+          val files = params.toMap.collect {
-                case (name, value) if name.startsWith("file:") =>
+            case (name, value) if name.startsWith("file:") =>
-                  val Array(_, fileId) = name.split(":")
+              val Array(_, fileId) = name.split(":")
-                  (fileId, value)
+              (fileId, value)
-              }
-              files.foreach {
-                case (fileId, fileName) =>
-                  val size =
-                    new File(
-                      getReleaseFilesDir(repository.owner, repository.name),
-                      FileUtil.checkFilename(tagName + "/" + fileId)
-                    ).length
-                  createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
-              }
-
-              assets.foreach { asset =>
-                if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
-                  val file = new File(
-                    getReleaseFilesDir(repository.owner, repository.name),
-                    FileUtil.checkFilename(release.tag + "/" + asset.fileName)
-                  )
-                  FileUtils.forceDelete(file)
-                }
-              }
-
-              redirect(s"/${release.userName}/${release.repositoryName}/releases/${tagName}")
           }
-          .getOrElse(NotFound())
+          files.foreach { case (fileId, fileName) =>
+            val size =
+              new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(tagName + "/" + fileId)
+              ).length
+            createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+          }
+
+          assets.foreach { asset =>
+            if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
+              val file = new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(release.tag + "/" + asset.fileName)
+              )
+              FileUtils.forceDelete(file)
+            }
+          }
+
+          redirect(s"/${release.userName}/${release.repositoryName}/releases/$tagName")
+        }
+        .getOrElse(NotFound())
     }
   })
 
@@ -228,7 +217,7 @@ trait ReleaseControllerBase extends ControllerBase {
   })
 
   private def fetchReleases(repository: RepositoryService.RepositoryInfo, page: Int) = {
-    import gitbucket.core.service.ReleaseService._
+    import gitbucket.core.service.ReleaseService.*
 
     val (offset, limit) = ((page - 1) * ReleaseLimit, ReleaseLimit)
     val tagsToDisplay = repository.tags.reverse.slice(offset, offset + limit)
@@ -237,9 +226,12 @@ trait ReleaseControllerBase extends ControllerBase {
     val assets = getReleaseAssetsMap(repository.owner, repository.name, releases)
 
     val tagsWithReleases = tagsToDisplay.map { tag =>
-      (tag, releases.find(_.tag == tag.name).map { release =>
+      (
-        (release, assets(release))
+        tag,
-      })
+        releases.find(_.tag == tag.name).map { release =>
+          (release, assets(release))
+        }
+      )
     }
     tagsWithReleases
   }

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

@@ -2,26 +2,25 @@ package gitbucket.core.controller
 
 import java.time.{LocalDateTime, ZoneOffset}
 import java.util.Date
-
 import gitbucket.core.settings.html
 import gitbucket.core.model.{RepositoryWebHook, WebHook}
-import gitbucket.core.service._
+import gitbucket.core.service.*
-import gitbucket.core.service.WebHookService._
+import gitbucket.core.service.WebHookService.*
-import gitbucket.core.util._
+import gitbucket.core.util.*
-import gitbucket.core.util.JGitUtil._
+import gitbucket.core.util.JGitUtil.*
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.SyntaxSugars.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util.Directory._
+import gitbucket.core.util.Directory.*
 import gitbucket.core.model.WebHookContentType
 import gitbucket.core.model.activity.RenameRepositoryInfo
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import org.scalatra.i18n.Messages
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.Constants
 import org.eclipse.jgit.lib.ObjectId
 
 import scala.util.Using
-import org.scalatra.Forbidden
+import org.scalatra.{Forbidden, Ok}
 
 class RepositorySettingsController
     extends RepositorySettingsControllerBase
@@ -31,24 +30,18 @@ class RepositorySettingsController
     with ProtectedBranchService
     with CommitStatusService
     with DeployKeyService
+    with CustomFieldsService
     with ActivityService
     with OwnerAuthenticator
     with UsersAuthenticator
     with RequestCache
 
 trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & AccountService & WebHookService & ProtectedBranchService & CommitStatusService &
-    with AccountService
+    DeployKeyService & CustomFieldsService & ActivityService & OwnerAuthenticator & UsersAuthenticator =>
-    with WebHookService
-    with ProtectedBranchService
-    with CommitStatusService
-    with DeployKeyService
-    with ActivityService
-    with OwnerAuthenticator
-    with UsersAuthenticator =>
 
   // for repository options
-  case class OptionsForm(
+  private case class OptionsForm(
     description: Option[String],
     isPrivate: Boolean,
     issuesOption: String,
@@ -61,7 +54,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     safeMode: Boolean
   )
 
-  val optionsForm = mapping(
+  private val optionsForm = mapping(
     "description" -> trim(label("Description", optional(text()))),
     "isPrivate" -> trim(label("Repository Type", boolean())),
     "issuesOption" -> trim(label("Issues Option", text(required, featureOption))),
@@ -79,25 +72,30 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   }
 
   // for default branch
-  case class DefaultBranchForm(defaultBranch: String)
+  private case class DefaultBranchForm(defaultBranch: String)
 
-  val defaultBranchForm = mapping(
+  private val defaultBranchForm = mapping(
     "defaultBranch" -> trim(label("Default Branch", text(required, maxlength(100))))
   )(DefaultBranchForm.apply)
 
   // for deploy key
-  case class DeployKeyForm(title: String, publicKey: String, allowWrite: Boolean)
+  private case class DeployKeyForm(title: String, publicKey: String, allowWrite: Boolean)
 
-  val deployKeyForm = mapping(
+  private val deployKeyForm = mapping(
     "title" -> trim(label("Title", text(required, maxlength(100)))),
     "publicKey" -> trim2(label("Key", text(required))), // TODO duplication check in the repository?
     "allowWrite" -> trim(label("Key", boolean()))
   )(DeployKeyForm.apply)
 
   // for web hook url addition
-  case class WebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
+  private case class WebHookForm(
+    url: String,
+    events: Set[WebHook.Event],
+    ctype: WebHookContentType,
+    token: Option[String]
+  )
 
-  def webHookForm(update: Boolean) =
+  private def webHookForm(update: Boolean) =
     mapping(
       "url" -> trim(label("url", text(required, webHook(update)))),
       "events" -> webhookEvents,
@@ -106,21 +104,38 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     )((url, events, ctype, token) => WebHookForm(url, events, WebHookContentType.valueOf(ctype), token))
 
   // for rename repository
-  case class RenameRepositoryForm(repositoryName: String)
+  private case class RenameRepositoryForm(repositoryName: String)
 
-  val renameForm = mapping(
+  private val renameForm = mapping(
     "repositoryName" -> trim(
       label("New repository name", text(required, maxlength(100), repository, renameRepositoryName))
     )
   )(RenameRepositoryForm.apply)
 
   // for transfer ownership
-  case class TransferOwnerShipForm(newOwner: String)
+  private case class TransferOwnerShipForm(newOwner: String)
 
-  val transferForm = mapping(
+  private val transferForm = mapping(
     "newOwner" -> trim(label("New owner", text(required, transferUser)))
   )(TransferOwnerShipForm.apply)
 
+  // for custom field
+  private case class CustomFieldForm(
+    fieldName: String,
+    fieldType: String,
+    constraints: Option[String],
+    enableForIssues: Boolean,
+    enableForPullRequests: Boolean
+  )
+
+  private val customFieldForm = mapping(
+    "fieldName" -> trim(label("Field name", text(required, maxlength(100)))),
+    "fieldType" -> trim(label("Field type", text(required))),
+    "constraints" -> trim(label("Constraints", optional(text()))),
+    "enableForIssues" -> trim(label("Enable for issues", boolean(required))),
+    "enableForPullRequests" -> trim(label("Enable for pull requests", boolean(required))),
+  )(CustomFieldForm.apply)
+
   /**
    * Redirect to the Options page.
    */
@@ -168,7 +183,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /** Update default branch */
   post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) =>
     if (!repository.branchList.contains(form.defaultBranch)) {
-      redirect(s"/${repository.owner}/${repository.name}/settings/options")
+      redirect(s"/${repository.owner}/${repository.name}/settings/branches")
     } else {
       saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch)
       // Change repository HEAD
@@ -182,13 +197,13 @@ trait RepositorySettingsControllerBase extends ControllerBase {
 
   /** Branch protection for branch */
   get("/:owner/:repository/settings/branches/*")(ownerOnly { repository =>
-    import gitbucket.core.api._
+    import gitbucket.core.api.*
     val branch = params("splat")
 
     if (!repository.branchList.contains(branch)) {
       redirect(s"/${repository.owner}/${repository.name}/settings/branches")
     } else {
-      val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch))
+      val protection = ApiBranchProtectionResponse(getProtectedBranchInfo(repository.owner, repository.name, branch))
       val lastWeeks = getRecentStatusContexts(
         repository.owner,
         repository.name,
@@ -238,7 +253,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       ctype = WebHookContentType.FORM,
       token = None
     )
-    html.edithook(webhook, Set(WebHook.Push), repository, true)
+    html.edithook(webhook, Set(WebHook.Push), repository, create = true)
   })
 
   /**
@@ -268,93 +283,90 @@ trait RepositorySettingsControllerBase extends ControllerBase {
         Array(h.getName, h.getValue)
       }
 
-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      git =>
+      import scala.concurrent.duration.*
-        import scala.concurrent.duration._
+      import scala.concurrent.*
-        import scala.concurrent._
+      import scala.jdk.CollectionConverters.*
-        import scala.jdk.CollectionConverters._
+      import scala.util.control.NonFatal
-        import scala.util.control.NonFatal
+      import org.apache.http.util.EntityUtils
-        import org.apache.http.util.EntityUtils
+      import scala.concurrent.ExecutionContext.Implicits.global
-        import scala.concurrent.ExecutionContext.Implicits.global
 
-        val url = params("url")
+      val url = params("url")
-        val token = Some(params("token"))
+      val token = Some(params("token"))
-        val ctype = WebHookContentType.valueOf(params("ctype"))
+      val ctype = WebHookContentType.valueOf(params("ctype"))
-        val dummyWebHookInfo = RepositoryWebHook(
+      val dummyWebHookInfo = RepositoryWebHook(
-          userName = repository.owner,
+        userName = repository.owner,
-          repositoryName = repository.name,
+        repositoryName = repository.name,
-          url = url,
+        url = url,
-          ctype = ctype,
+        ctype = ctype,
-          token = token
+        token = token
+      )
+      val dummyPayload = {
+        val ownerAccount = getAccountByUserName(repository.owner).get
+        val commits =
+          if (JGitUtil.isEmpty(git)) List.empty
+          else
+            git.log
+              .add(git.getRepository.resolve(repository.repository.defaultBranch))
+              .setMaxCount(4)
+              .call
+              .iterator
+              .asScala
+              .map(new CommitInfo(_))
+              .toList
+        val pushedCommit = commits.drop(1)
+
+        WebHookPushPayload(
+          git = git,
+          sender = ownerAccount,
+          refName = "refs/heads/" + repository.repository.defaultBranch,
+          repositoryInfo = repository,
+          commits = pushedCommit,
+          repositoryOwner = ownerAccount,
+          oldId = commits.lastOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId()),
+          newId = commits.headOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId())
         )
-        val dummyPayload = {
+      }
-          val ownerAccount = getAccountByUserName(repository.owner).get
-          val commits =
-            if (JGitUtil.isEmpty(git)) List.empty
-            else
-              git.log
-                .add(git.getRepository.resolve(repository.repository.defaultBranch))
-                .setMaxCount(4)
-                .call
-                .iterator
-                .asScala
-                .map(new CommitInfo(_))
-                .toList
-          val pushedCommit = commits.drop(1)
 
-          WebHookPushPayload(
+      val (webHook, json, reqFuture, resFuture) =
-            git = git,
+        callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload, context.settings).head
-            sender = ownerAccount,
-            refName = "refs/heads/" + repository.repository.defaultBranch,
-            repositoryInfo = repository,
-            commits = pushedCommit,
-            repositoryOwner = ownerAccount,
-            oldId = commits.lastOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId()),
-            newId = commits.headOption.map(_.id).map(ObjectId.fromString).getOrElse(ObjectId.zeroId())
-          )
-        }
 
-        val (webHook, json, reqFuture, resFuture) =
+      val toErrorMap: PartialFunction[Throwable, Map[String, String]] = {
-          callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload, context.settings).head
+        case e: java.net.UnknownHostException                  => Map("error" -> s"Unknown host ${e.getMessage}")
+        case _: java.lang.IllegalArgumentException             => Map("error" -> "invalid url")
+        case _: org.apache.http.client.ClientProtocolException => Map("error" -> "invalid url")
+        case NonFatal(e)                                       => Map("error" -> s"${e.getClass} ${e.getMessage}")
+      }
 
-        val toErrorMap: PartialFunction[Throwable, Map[String, String]] = {
+      contentType = formats("json")
-          case e: java.net.UnknownHostException                  => Map("error" -> ("Unknown host " + e.getMessage))
+      org.json4s.jackson.Serialization.write(
-          case e: java.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
+        Map(
-          case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
+          "url" -> url,
-          case NonFatal(e)                                       => Map("error" -> (s"${e.getClass} ${e.getMessage}"))
+          "request" -> Await.result(
-        }
+            reqFuture
-
+              .map(req =>
-        contentType = formats("json")
+                Map(
-        org.json4s.jackson.Serialization.write(
+                  "headers" -> _headers(req.getAllHeaders),
-          Map(
+                  "payload" -> json
-            "url" -> url,
-            "request" -> Await.result(
-              reqFuture
-                .map(
-                  req =>
-                    Map(
-                      "headers" -> _headers(req.getAllHeaders),
-                      "payload" -> json
-                  )
                 )
-                .recover(toErrorMap),
+              )
-              20 seconds
+              .recover(toErrorMap),
-            ),
+            20 seconds
-            "response" -> Await.result(
+          ),
-              resFuture
+          "response" -> Await.result(
-                .map(
+            resFuture
-                  res =>
+              .map(res =>
-                    Map(
+                Map(
-                      "status" -> res.getStatusLine.getStatusCode,
+                  "status" -> res.getStatusLine.getStatusCode,
-                      "body" -> EntityUtils.toString(res.getEntity()),
+                  "body" -> EntityUtils.toString(res.getEntity),
-                      "headers" -> _headers(res.getAllHeaders())
+                  "headers" -> _headers(res.getAllHeaders)
-                  )
                 )
-                .recover(toErrorMap),
+              )
-              20 seconds
+              .recover(toErrorMap),
-            )
+            20 seconds
           )
         )
+      )
     }
   })
 
@@ -362,9 +374,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Display the web hook edit page.
    */
   get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
-    getWebHook(repository.owner, repository.name, params("url")).map {
+    getWebHook(repository.owner, repository.name, params("url")).map { case (webhook, events) =>
-      case (webhook, events) =>
+      html.edithook(webhook, events, repository, create = false)
-        html.edithook(webhook, events, repository, false)
     } getOrElse NotFound()
   })
 
@@ -388,23 +399,22 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Rename repository.
    */
   post("/:owner/:repository/settings/rename", renameForm)(ownerOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (context.settings.basicBehavior.repositoryOperation.rename || loginAccount.isAdmin) {
-        if (context.settings.repositoryOperation.rename || loginAccount.isAdmin) {
+        if (repository.name != form.repositoryName) {
-          if (repository.name != form.repositoryName) {
+          // Update database and move git repository
-            // Update database and move git repository
+          renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
-            renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+          // Record activity log
-            // Record activity log
+          val renameInfo = RenameRepositoryInfo(
-            val renameInfo = RenameRepositoryInfo(
+            repository.owner,
-              repository.owner,
+            form.repositoryName,
-              form.repositoryName,
+            loginAccount.userName,
-              loginAccount.userName,
+            repository.name
-              repository.name
+          )
-            )
+          recordActivity(renameInfo)
-            recordActivity(renameInfo)
+        }
-          }
+        redirect(s"/${repository.owner}/${form.repositoryName}")
-          redirect(s"/${repository.owner}/${form.repositoryName}")
+      } else Forbidden()
-        } else Forbidden()
     }
   })
 
@@ -412,24 +422,23 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Transfer repository ownership.
    */
   post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (context.settings.basicBehavior.repositoryOperation.transfer || loginAccount.isAdmin) {
-        if (context.settings.repositoryOperation.transfer || loginAccount.isAdmin) {
+        // Change repository owner
-          // Change repository owner
+        if (repository.owner != form.newOwner) {
-          if (repository.owner != form.newOwner) {
+          // Update database and move git repository
-            // Update database and move git repository
+          renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
-            renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+          // Record activity log
-            // Record activity log
+          val renameInfo = RenameRepositoryInfo(
-            val renameInfo = RenameRepositoryInfo(
+            form.newOwner,
-              form.newOwner,
+            repository.name,
-              repository.name,
+            loginAccount.userName,
-              loginAccount.userName,
+            repository.owner
-              repository.owner
+          )
-            )
+          recordActivity(renameInfo)
-            recordActivity(renameInfo)
+        }
-          }
+        redirect(s"/${form.newOwner}/${repository.name}")
-          redirect(s"/${form.newOwner}/${repository.name}")
+      } else Forbidden()
-        } else Forbidden()
     }
   })
 
@@ -438,7 +447,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
     context.withLoginAccount { loginAccount =>
-      if (context.settings.repositoryOperation.delete || loginAccount.isAdmin) {
+      if (context.settings.basicBehavior.repositoryOperation.delete || loginAccount.isAdmin) {
         // Delete the repository and related files
         deleteRepository(repository.repository)
         redirect(s"/${repository.owner}")
@@ -477,6 +486,60 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     redirect(s"/${repository.owner}/${repository.name}/settings/deploykey")
   })
 
+  /** Custom fields for issues and pull requests */
+  get("/:owner/:repository/settings/issues")(ownerOnly { repository =>
+    val customFields = getCustomFields(repository.owner, repository.name)
+    html.issues(customFields, repository)
+  })
+
+  /** New custom field form */
+  get("/:owner/:repository/settings/issues/fields/new")(ownerOnly { repository =>
+    html.issuesfieldform(None, repository)
+  })
+
+  /** Add custom field */
+  ajaxPost("/:owner/:repository/settings/issues/fields/new", customFieldForm)(ownerOnly { (form, repository) =>
+    val fieldId = createCustomField(
+      repository.owner,
+      repository.name,
+      form.fieldName,
+      form.fieldType,
+      if (form.fieldType == "enum") form.constraints else None,
+      form.enableForIssues,
+      form.enableForPullRequests
+    )
+    html.issuesfield(getCustomField(repository.owner, repository.name, fieldId).get)
+  })
+
+  /** Edit custom field form */
+  ajaxGet("/:owner/:repository/settings/issues/fields/:fieldId/edit")(ownerOnly { repository =>
+    getCustomField(repository.owner, repository.name, params("fieldId").toInt).map { customField =>
+      html.issuesfieldform(Some(customField), repository)
+    } getOrElse NotFound()
+  })
+
+  /** Update custom field */
+  ajaxPost("/:owner/:repository/settings/issues/fields/:fieldId/edit", customFieldForm)(ownerOnly {
+    (form, repository) =>
+      updateCustomField(
+        repository.owner,
+        repository.name,
+        params("fieldId").toInt,
+        form.fieldName,
+        form.fieldType,
+        if (form.fieldType == "enum") form.constraints else None,
+        form.enableForIssues,
+        form.enableForPullRequests
+      )
+      html.issuesfield(getCustomField(repository.owner, repository.name, params("fieldId").toInt).get)
+  })
+
+  /** Delete custom field */
+  ajaxPost("/:owner/:repository/settings/issues/fields/:fieldId/delete")(ownerOnly { repository =>
+    deleteCustomField(repository.owner, repository.name, params("fieldId").toInt)
+    Ok()
+  })
+
   /**
    * Provides duplication check for web hook url.
    */
@@ -565,7 +628,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     new Constraint() {
       override def validate(name: String, value: String, messages: Messages): Option[String] =
         getAccountByUserName(value) match {
-          case None => Some("User does not exist.")
+          case None    => Some("User does not exist.")
           case Some(x) =>
             if (x.userName == params("owner")) {
               Some("This is current repository owner.")

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

@@ -1,20 +1,19 @@
 package gitbucket.core.controller
 
 import java.io.FileInputStream
-
 import gitbucket.core.admin.html
 import gitbucket.core.plugin.PluginRegistry
-import gitbucket.core.service.SystemSettingsService._
+import gitbucket.core.service.SystemSettingsService.*
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.ssh.SshServer
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util.StringUtil._
+import gitbucket.core.util.StringUtil.*
 import gitbucket.core.util.{AdminAuthenticator, Mailer}
 import org.apache.commons.io.IOUtils
 import org.apache.commons.mail.EmailException
 import org.json4s.jackson.Serialization
-import org.scalatra._
+import org.scalatra.*
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import org.scalatra.i18n.Messages
 
 import scala.collection.mutable.ListBuffer
@@ -30,28 +29,41 @@ case class Table(name: String, columns: Seq[Column])
 case class Column(name: String, primaryKey: Boolean)
 
 trait SystemSettingsControllerBase extends AccountManagementControllerBase {
-  self: AccountService with RepositoryService with AdminAuthenticator =>
+  self: AccountService & RepositoryService & AdminAuthenticator =>
 
   private val form = mapping(
     "baseUrl" -> trim(label("Base URL", optional(text()))),
     "information" -> trim(label("Information", optional(text()))),
-    "allowAccountRegistration" -> trim(label("Account registration", boolean())),
+    "basicBehavior" -> mapping(
-    "allowAnonymousAccess" -> trim(label("Anonymous access", boolean())),
+      "allowAccountRegistration" -> trim(label("Account registration", boolean())),
-    "isCreateRepoOptionPublic" -> trim(label("Default visibility of new repository", boolean())),
+      "allowResetPassword" -> trim(label("Reset password", boolean())),
-    "repositoryOperation" -> mapping(
+      "allowAnonymousAccess" -> trim(label("Anonymous access", boolean())),
-      "create" -> trim(label("Allow all users to create repository", boolean())),
+      "isCreateRepoOptionPublic" -> trim(label("Default visibility of new repository", boolean())),
-      "delete" -> trim(label("Allow all users to delete repository", boolean())),
+      "repositoryOperation" -> mapping(
-      "rename" -> trim(label("Allow all users to rename repository", boolean())),
+        "create" -> trim(label("Allow all users to create repository", boolean())),
-      "transfer" -> trim(label("Allow all users to transfer repository", boolean())),
+        "delete" -> trim(label("Allow all users to delete repository", boolean())),
-      "fork" -> trim(label("Allow all users to fork repository", boolean()))
+        "rename" -> trim(label("Allow all users to rename repository", boolean())),
-    )(RepositoryOperation.apply),
+        "transfer" -> trim(label("Allow all users to transfer repository", boolean())),
-    "gravatar" -> trim(label("Gravatar", boolean())),
+        "fork" -> trim(label("Allow all users to fork repository", boolean()))
-    "notification" -> trim(label("Notification", boolean())),
+      )(RepositoryOperation.apply),
-    "limitVisibleRepositories" -> trim(label("limitVisibleRepositories", boolean())),
+      "gravatar" -> trim(label("Gravatar", boolean())),
+      "notification" -> trim(label("Notification", boolean())),
+      "limitVisibleRepositories" -> trim(label("limitVisibleRepositories", boolean())),
+    )(BasicBehavior.apply),
     "ssh" -> mapping(
       "enabled" -> trim(label("SSH access", boolean())),
-      "host" -> trim(label("SSH host", optional(text()))),
+      "bindAddress" -> mapping(
-      "port" -> trim(label("SSH port", optional(number())))
+        "host" -> trim(label("Bind SSH host", optional(text()))),
+        "port" -> trim(label("Bind SSH port", optional(number()))),
+      )((hostOption, portOption) =>
+        hostOption.map(h => SshAddress(h, portOption.getOrElse(DefaultSshPort), GenericSshUser))
+      ),
+      "publicAddress" -> mapping(
+        "host" -> trim(label("Public SSH host", optional(text()))),
+        "port" -> trim(label("Public SSH port", optional(number()))),
+      )((hostOption, portOption) =>
+        hostOption.map(h => SshAddress(h, portOption.getOrElse(PublicSshPort), GenericSshUser))
+      ),
     )(Ssh.apply),
     "useSMTP" -> trim(label("SMTP", boolean())),
     "smtp" -> optionalIfNotChecked(
@@ -109,15 +121,18 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       "largeTimeout" -> trim(label("Timeout for large file", long(required)))
     )(Upload.apply),
     "repositoryViewer" -> mapping(
-      "maxFiles" -> trim(label("Max files", number(required)))
+      "maxFiles" -> trim(label("Max files", number(required))),
-    )(RepositoryViewerSettings.apply)
+      "maxDiffFiles" -> trim(label("Max diff files", number(required))),
+      "maxDiffLines" -> trim(label("Max diff lines", number(required)))
+    )(RepositoryViewerSettings.apply),
+    "defaultBranch" -> trim(label("Default branch", text(required)))
   )(SystemSettings.apply).verifying { settings =>
     Vector(
       if (settings.ssh.enabled && settings.baseUrl.isEmpty) {
         Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
       } else None,
-      if (settings.ssh.enabled && settings.ssh.sshHost.isEmpty) {
+      if (settings.ssh.enabled && settings.ssh.bindAddress.isEmpty) {
-        Some("sshHost" -> "SSH host is required if SSH access is enabled.")
+        Some("ssh.bindAddress.host" -> "SSH bind host is required if SSH access is enabled.")
       } else None
     ).flatten
   }
@@ -136,11 +151,11 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "testAddress" -> trim(label("", text(required)))
   )(SendMailForm.apply)
 
-  case class SendMailForm(smtp: Smtp, testAddress: String)
+  private case class SendMailForm(smtp: Smtp, testAddress: String)
 
-  case class DataExportForm(tableNames: List[String])
+//  case class DataExportForm(tableNames: List[String])
 
-  case class NewUserForm(
+  private case class NewUserForm(
     userName: String,
     password: String,
     fullName: String,
@@ -152,7 +167,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     fileId: Option[String]
   )
 
-  case class EditUserForm(
+  private case class EditUserForm(
     userName: String,
     password: Option[String],
     fullName: String,
@@ -166,7 +181,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     isRemoved: Boolean
   )
 
-  case class NewGroupForm(
+  private case class NewGroupForm(
     groupName: String,
     description: Option[String],
     url: Option[String],
@@ -174,7 +189,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     members: String
   )
 
-  case class EditGroupForm(
+  private case class EditGroupForm(
     groupName: String,
     description: Option[String],
     url: Option[String],
@@ -184,7 +199,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     isRemoved: Boolean
   )
 
-  val newUserForm = mapping(
+  private val newUserForm = mapping(
     "userName" -> trim(label("Username", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "password" -> trim(label("Password", text(required, maxlength(40)))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
@@ -198,7 +213,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "fileId" -> trim(label("File ID", optional(text())))
   )(NewUserForm.apply)
 
-  val editUserForm = mapping(
+  private val editUserForm = mapping(
     "userName" -> trim(label("Username", text(required, maxlength(100), identifier))),
     "password" -> trim(label("Password", optional(text(maxlength(40))))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
@@ -214,7 +229,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "removed" -> trim(label("Disable", boolean(disableByNotYourself("userName"))))
   )(EditUserForm.apply)
 
-  val newGroupForm = mapping(
+  private val newGroupForm = mapping(
     "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "description" -> trim(label("Group description", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
@@ -222,7 +237,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "members" -> trim(label("Members", text(required, members)))
   )(NewGroupForm.apply)
 
-  val editGroupForm = mapping(
+  private val editGroupForm = mapping(
     "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier))),
     "description" -> trim(label("Group description", optional(text()))),
     "url" -> trim(label("URL", optional(text(maxlength(200))))),
@@ -236,28 +251,27 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     val conn = request2Session(request).conn
     val meta = conn.getMetaData
     val tables = ListBuffer[Table]()
-    Using.resource(meta.getTables(null, "%", "%", Array("TABLE", "VIEW"))) {
+    Using.resource(meta.getTables(null, "%", "%", Array("TABLE", "VIEW"))) { rs =>
-      rs =>
+      while (rs.next()) {
-        while (rs.next()) {
+        val tableName = rs.getString("TABLE_NAME")
-          val tableName = rs.getString("TABLE_NAME")
 
-          val pkColumns = ListBuffer[String]()
+        val pkColumns = ListBuffer[String]()
-          Using.resource(meta.getPrimaryKeys(null, null, tableName)) { rs =>
+        Using.resource(meta.getPrimaryKeys(null, null, tableName)) { rs =>
-            while (rs.next()) {
+          while (rs.next()) {
-              pkColumns += rs.getString("COLUMN_NAME").toUpperCase
+            pkColumns += rs.getString("COLUMN_NAME").toUpperCase
-            }
           }
-
-          val columns = ListBuffer[Column]()
-          Using.resource(meta.getColumns(null, "%", tableName, "%")) { rs =>
-            while (rs.next()) {
-              val columnName = rs.getString("COLUMN_NAME").toUpperCase
-              columns += Column(columnName, pkColumns.contains(columnName))
-            }
-          }
-
-          tables += Table(tableName.toUpperCase, columns.toSeq)
         }
+
+        val columns = ListBuffer[Column]()
+        Using.resource(meta.getColumns(null, "%", tableName, "%")) { rs =>
+          while (rs.next()) {
+            val columnName = rs.getString("COLUMN_NAME").toUpperCase
+            columns += Column(columnName, pkColumns.contains(columnName))
+          }
+        }
+
+        tables += Table(tableName.toUpperCase, columns.toSeq)
+      }
     }
     html.dbviewer(tables.toSeq)
   })
@@ -270,28 +284,26 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         if (trimmedQuery.nonEmpty) {
           try {
             val conn = request2Session(request).conn
-            Using.resource(conn.prepareStatement(query)) {
+            Using.resource(conn.prepareStatement(query)) { stmt =>
-              stmt =>
+              if (trimmedQuery.toUpperCase.startsWith("SELECT")) {
-                if (trimmedQuery.toUpperCase.startsWith("SELECT")) {
+                Using.resource(stmt.executeQuery()) { rs =>
-                  Using.resource(stmt.executeQuery()) {
+                  val meta = rs.getMetaData
-                    rs =>
+                  val columns = for (i <- 1 to meta.getColumnCount) yield {
-                      val meta = rs.getMetaData
+                    meta.getColumnName(i)
-                      val columns = for (i <- 1 to meta.getColumnCount) yield {
-                        meta.getColumnName(i)
-                      }
-                      val result = ListBuffer[Map[String, String]]()
-                      while (rs.next()) {
-                        val row = columns.map { columnName =>
-                          columnName -> Option(rs.getObject(columnName)).map(_.toString).getOrElse("<NULL>")
-                        }.toMap
-                        result += row
-                      }
-                      Ok(Serialization.write(Map("type" -> "query", "columns" -> columns, "rows" -> result)))
                   }
-                } else {
+                  val result = ListBuffer[Map[String, String]]()
-                  val rows = stmt.executeUpdate()
+                  while (rs.next()) {
-                  Ok(Serialization.write(Map("type" -> "update", "rows" -> rows)))
+                    val row = columns.map { columnName =>
+                      columnName -> Option(rs.getObject(columnName)).map(_.toString).getOrElse("<NULL>")
+                    }.toMap
+                    result += row
+                  }
+                  Ok(Serialization.write(Map("type" -> "query", "columns" -> columns, "rows" -> result)))
                 }
+              } else {
+                val rows = stmt.executeUpdate()
+                Ok(Serialization.write(Map("type" -> "update", "rows" -> rows)))
+              }
             }
           } catch {
             case e: Exception =>
@@ -308,12 +320,15 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   post("/admin/system", form)(adminOnly { form =>
     saveSystemSettings(form)
 
-    if (form.sshAddress != context.settings.sshAddress) {
+    if (
+      form.ssh.bindAddress != context.settings.sshBindAddress || form.ssh.publicAddress != context.settings.sshPublicAddress
+    ) {
       SshServer.stop()
       for {
-        sshAddress <- form.sshAddress
+        bindAddress <- form.ssh.bindAddress
+        publicAddress <- form.ssh.publicAddress.orElse(form.ssh.bindAddress)
         baseUrl <- form.baseUrl
-      } SshServer.start(sshAddress, baseUrl)
+      } SshServer.start(bindAddress, publicAddress, baseUrl)
     }
 
     flash.update("info", "System settings has been updated.")
@@ -322,7 +337,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
     try {
-      new Mailer(context.settings.copy(smtp = Some(form.smtp), notification = true)).send(
+      new Mailer(
+        context.settings.copy(
+          smtp = Some(form.smtp),
+          basicBehavior = context.settings.basicBehavior.copy(notification = true)
+        )
+      ).send(
         to = form.testAddress,
         subject = "Test message from GitBucket",
         textMsg = "This is a test message from GitBucket.",
@@ -343,7 +363,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   })
 
   post("/admin/plugins/_reload")(adminOnly {
-    PluginRegistry.reload(request.getServletContext(), loadSystemSettings(), request2Session(request).conn)
+    PluginRegistry.reload(request.getServletContext, loadSystemSettings(), request2Session(request).conn)
     flash.update("info", "All plugins were reloaded.")
     redirect("/admin/plugins")
   })
@@ -365,7 +385,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     val includeGroups = params.get("includeGroups").exists(_.toBoolean)
     val users = getAllUsers(includeRemoved, includeGroups)
     val members = users.collect {
-      case account if (account.isGroupAccount) =>
+      case account if account.isGroupAccount =>
         account.userName -> getGroupMembers(account.userName).map(_.userName)
     }.toMap
 
@@ -386,7 +406,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       form.description,
       form.url
     )
-    updateImage(form.userName, form.fileId, false)
+    updateImage(form.userName, form.fileId, clearImage = false)
     updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != ""))
     redirect("/admin/users")
   })
@@ -394,49 +414,48 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   get("/admin/users/:userName/_edituser")(adminOnly {
     val userName = params("userName")
     val extraMails = getAccountExtraMailAddresses(userName)
-    html.user(getAccountByUserName(userName, true), extraMails, flash.get("error"))
+    html.user(getAccountByUserName(userName, includeRemoved = true), extraMails, flash.get("error"))
   })
 
   post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName, true).map {
+    getAccountByUserName(userName, includeRemoved = true).map { account =>
-      account =>
+      if (account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)) {
-        if (account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)) {
+        flash.update("error", "Account can't be turned off because this is last one administrator.")
-          flash.update("error", "Account can't be turned off because this is last one administrator.")
+        redirect(s"/admin/users/${userName}/_edituser")
-          redirect(s"/admin/users/${userName}/_edituser")
+      } else {
-        } else {
+        if (form.isRemoved) {
-          if (form.isRemoved) {
+          // Remove repositories
-            // Remove repositories
+          //        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
-            //        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
+          //          deleteRepository(userName, repositoryName)
-            //          deleteRepository(userName, repositoryName)
+          //          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
-            //          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
+          //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
-            //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
+          //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
-            //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
+          //        }
-            //        }
+          // Remove from GROUP_MEMBER and COLLABORATOR
-            // Remove from GROUP_MEMBER and COLLABORATOR
+          removeUserRelatedData(userName)
-            removeUserRelatedData(userName)
-          }
-
-          updateAccount(
-            account.copy(
-              password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
-              fullName = form.fullName,
-              mailAddress = form.mailAddress,
-              isAdmin = form.isAdmin,
-              description = form.description,
-              url = form.url,
-              isRemoved = form.isRemoved
-            )
-          )
-
-          updateImage(userName, form.fileId, form.clearImage)
-          updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
-
-          // call hooks
-          if (form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
-
-          redirect("/admin/users")
         }
+
+        updateAccount(
+          account.copy(
+            password = form.password.map(pbkdf2_sha256).getOrElse(account.password),
+            fullName = form.fullName,
+            mailAddress = form.mailAddress,
+            isAdmin = form.isAdmin,
+            description = form.description,
+            url = form.url,
+            isRemoved = form.isRemoved
+          )
+        )
+
+        updateImage(userName, form.fileId, form.clearImage)
+        updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
+
+        // call hooks
+        if (form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
+        redirect("/admin/users")
+      }
     } getOrElse NotFound()
   })
 
@@ -457,13 +476,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         }
         .toList
     )
-    updateImage(form.groupName, form.fileId, false)
+    updateImage(form.groupName, form.fileId, clearImage = false)
     redirect("/admin/users")
   })
 
   get("/admin/users/:groupName/_editgroup")(adminOnly {
     val groupName = params("groupName")
-    html.usergroup(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+    html.usergroup(getAccountByUserName(groupName, includeRemoved = true), getGroupMembers(groupName))
   })
 
   post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
@@ -477,13 +496,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       }
       .toList
 
-    getAccountByUserName(groupName, true).map {
+    getAccountByUserName(groupName, includeRemoved = true).map { account =>
-      account =>
+      updateGroup(groupName, form.description, form.url, form.isRemoved)
-        updateGroup(groupName, form.description, form.url, form.isRemoved)
 
-        if (form.isRemoved) {
+      if (form.isRemoved) {
-          // Remove from GROUP_MEMBER
+        // Remove from GROUP_MEMBER
-          updateGroupMembers(form.groupName, Nil)
+        updateGroupMembers(form.groupName, Nil)
 //          // Remove repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            deleteRepository(groupName, repositoryName)
@@ -491,9 +509,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
 //            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
 //          }
-        } else {
+      } else {
-          // Update GROUP_MEMBER
+        // Update GROUP_MEMBER
-          updateGroupMembers(form.groupName, members)
+        updateGroupMembers(form.groupName, members)
 //          // Update COLLABORATOR for group repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            removeCollaborators(form.groupName, repositoryName)
@@ -501,22 +519,22 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //              addCollaborator(form.groupName, repositoryName, userName)
 //            }
 //          }
-        }
+      }
 
-        updateImage(form.groupName, form.fileId, form.clearImage)
+      updateImage(form.groupName, form.fileId, form.clearImage)
-        redirect("/admin/users")
+      redirect("/admin/users")
 
     } getOrElse NotFound()
   })
 
   get("/admin/data")(adminOnly {
-    import gitbucket.core.util.JDBCUtil._
+    import gitbucket.core.util.JDBCUtil.*
     val session = request2Session(request)
     html.data(session.conn.allTableNames())
   })
 
   post("/admin/export")(adminOnly {
-    import gitbucket.core.util.JDBCUtil._
+    import gitbucket.core.util.JDBCUtil.*
     val file = request2Session(request).conn.exportAsSQL(request.getParameterValues("tableNames").toSeq)
 
     contentType = "application/octet-stream"
@@ -531,7 +549,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   })
 
   private def multiLineText(constraints: Constraint*): SingleValueType[Seq[String]] =
-    new SingleValueType[Seq[String]](constraints: _*) {
+    new SingleValueType[Seq[String]](constraints*) {
       def convert(value: String, messages: Messages): Seq[String] = {
         if (value == null) {
           Nil
@@ -544,9 +562,11 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   private def members: Constraint =
     new Constraint() {
       override def validate(name: String, value: String, messages: Messages): Option[String] = {
-        if (value.split(",").exists {
+        if (
-              _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+          value.split(",").exists {
-            }) None
+            _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+          }
+        ) None
         else Some("Must select one manager at least.")
       }
     }
@@ -557,7 +577,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         for {
           userName <- params.get(paramName)
           loginAccount <- context.loginAccount
-          if userName == loginAccount.userName && params.get("removed") == Some("true")
+          if userName == loginAccount.userName && params.get("removed").contains("true")
         } yield "You can't disable your account yourself"
       }
     }

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

@@ -1,16 +1,16 @@
 package gitbucket.core.controller
 
 import org.json4s.{JField, JObject, JString}
-import org.scalatra._
+import org.scalatra.*
-import org.scalatra.json._
+import org.scalatra.json.*
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import org.scalatra.i18n.I18nSupport
 import org.scalatra.servlet.ServletBase
 
 /**
  * Extends scalatra-forms to support the client-side validation and Ajax requests as well.
  */
-trait ValidationSupport extends FormSupport { self: ServletBase with JacksonJsonSupport with I18nSupport =>
+trait ValidationSupport extends FormSupport { self: ServletBase & JacksonJsonSupport & I18nSupport =>
 
   def get[T](path: String, form: ValueType[T])(action: T => Any): Route = {
     registerValidate(path, form)
@@ -84,9 +84,8 @@ trait ValidationSupport extends FormSupport { self: ServletBase with JacksonJson
    * Converts errors to JSON.
    */
   private def toJson(errors: Seq[(String, String)]): JObject =
-    JObject(errors.map {
+    JObject(errors.map { case (key, value) =>
-      case (key, value) =>
+      JField(key, JString(value))
-        JField(key, JString(value))
     }.toList)
 
 }

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

@@ -5,13 +5,13 @@ import gitbucket.core.model.activity.{CreateWikiPageInfo, DeleteWikiInfo, EditWi
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.WebHookService.WebHookGollumPayload
 import gitbucket.core.wiki.html
-import gitbucket.core.service._
+import gitbucket.core.service.*
-import gitbucket.core.util._
+import gitbucket.core.util.*
-import gitbucket.core.util.StringUtil._
+import gitbucket.core.util.StringUtil.*
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.SyntaxSugars.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util.Directory._
+import gitbucket.core.util.Directory.*
-import org.scalatra.forms._
+import org.scalatra.forms.*
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
 
@@ -29,15 +29,10 @@ class WikiController
     with RequestCache
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService
+  self: WikiService & RepositoryService & AccountService & ActivityService & WebHookService &
-    with RepositoryService
+    ReadableUsersAuthenticator & ReferrerAuthenticator =>
-    with AccountService
-    with ActivityService
-    with WebHookService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator =>
 
-  case class WikiPageEditForm(
+  private case class WikiPageEditForm(
     pageName: String,
     content: String,
     message: Option[String],
@@ -45,16 +40,16 @@ trait WikiControllerBase extends ControllerBase {
     id: String
   )
 
-  val newForm = mapping(
+  private val newForm = mapping(
-    "pageName" -> trim(label("Page name", text(required, maxlength(40), pagename, unique))),
+    "pageName" -> trim(label("Page name", text(required, maxlength(40), pageName, unique))),
     "content" -> trim(label("Content", text(required, conflictForNew))),
     "message" -> trim(label("Message", optional(text()))),
     "currentPageName" -> trim(label("Current page name", text())),
     "id" -> trim(label("Latest commit id", text()))
   )(WikiPageEditForm.apply)
 
-  val editForm = mapping(
+  private val editForm = mapping(
-    "pageName" -> trim(label("Page name", text(required, maxlength(40), pagename))),
+    "pageName" -> trim(label("Page name", text(required, maxlength(40), pageName))),
     "content" -> trim(label("Content", text(required, conflictForEdit))),
     "message" -> trim(label("Message", optional(text()))),
     "currentPageName" -> trim(label("Current page name", text(required))),
@@ -62,46 +57,56 @@ trait WikiControllerBase extends ControllerBase {
   )(WikiPageEditForm.apply)
 
   get("/:owner/:repository/wiki")(referrersOnly { repository =>
-    getWikiPage(repository.owner, repository.name, "Home").map { page =>
+    val branch = getWikiBranch(repository.owner, repository.name)
+
+    getWikiPage(repository.owner, repository.name, "Home", branch).map { page =>
       html.page(
         "Home",
         page,
-        getWikiPageList(repository.owner, repository.name),
+        getWikiPageList(repository.owner, repository.name, branch),
         repository,
         isEditable(repository),
-        getWikiPage(repository.owner, repository.name, "_Sidebar"),
+        getWikiPage(repository.owner, repository.name, "_Sidebar", branch),
-        getWikiPage(repository.owner, repository.name, "_Footer")
+        getWikiPage(repository.owner, repository.name, "_Footer", branch)
       )
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
   })
 
   get("/:owner/:repository/wiki/:page")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
+    val branch = getWikiBranch(repository.owner, repository.name)
 
-    getWikiPage(repository.owner, repository.name, pageName).map { page =>
+    getWikiPage(repository.owner, repository.name, pageName, branch).map { page =>
       html.page(
         pageName,
         page,
-        getWikiPageList(repository.owner, repository.name),
+        getWikiPageList(repository.owner, repository.name, branch),
         repository,
         isEditable(repository),
-        getWikiPage(repository.owner, repository.name, "_Sidebar"),
+        getWikiPage(repository.owner, repository.name, "_Sidebar", branch),
-        getWikiPage(repository.owner, repository.name, "_Footer")
+        getWikiPage(repository.owner, repository.name, "_Footer", branch)
       )
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
   })
 
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
+    val branch = getWikiBranch(repository.owner, repository.name)
 
     Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
-      JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
+      JGitUtil.getCommitLog(git, branch, path = pageName + ".md") match {
         case Right((logs, hasNext)) => html.history(Some(pageName), logs, repository, isEditable(repository))
         case Left(_)                => NotFound()
       }
     }
   })
 
+  private def getWikiBranch(owner: String, repository: String): String = {
+    Using.resource(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
+      git.getRepository.getBranch
+    }
+  }
+
   get("/:owner/:repository/wiki/:page/_compare/:commitId")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
@@ -111,7 +116,17 @@ trait WikiControllerBase extends ControllerBase {
         Some(pageName),
         from,
         to,
-        JGitUtil.getDiffs(git, Some(from), to, true, false).filter(_.newPath == pageName + ".md"),
+        JGitUtil
+          .getDiffs(
+            git = git,
+            from = Some(from),
+            to = to,
+            fetchContent = true,
+            makePatch = false,
+            maxFiles = context.settings.repositoryViewer.maxDiffFiles,
+            maxLines = context.settings.repositoryViewer.maxDiffLines
+          )
+          .filter(_.newPath == pageName + ".md"),
         repository,
         isEditable(repository),
         flash.get("info")
@@ -127,7 +142,15 @@ trait WikiControllerBase extends ControllerBase {
         None,
         from,
         to,
-        JGitUtil.getDiffs(git, Some(from), to, true, false),
+        JGitUtil.getDiffs(
+          git = git,
+          from = Some(from),
+          to = to,
+          fetchContent = true,
+          makePatch = false,
+          maxFiles = context.settings.repositoryViewer.maxDiffFiles,
+          maxLines = context.settings.repositoryViewer.maxDiffLines
+        ),
         repository,
         isEditable(repository),
         flash.get("info")
@@ -136,78 +159,78 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/:page/_revert/:commitId")(readableUsersOnly { repository =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (isEditable(repository)) {
-        if (isEditable(repository)) {
+        val pageName = StringUtil.urlDecode(params("page"))
-          val pageName = StringUtil.urlDecode(params("page"))
+        val Array(from, to) = params("commitId").split("\\.\\.\\.")
-          val Array(from, to) = params("commitId").split("\\.\\.\\.")
+        val branch = getWikiBranch(repository.owner, repository.name)
 
-          if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, Some(pageName))) {
+        if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, Some(pageName), branch)) {
-            redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
+          redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
-          } else {
+        } else {
-            flash.update("info", "This patch was not able to be reversed.")
+          flash.update("info", "This patch was not able to be reversed.")
-            redirect(
+          redirect(
-              s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
+            s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/$from...$to"
-            )
+          )
-          }
+        }
-        } else Unauthorized()
+      } else Unauthorized()
     }
   })
 
   get("/:owner/:repository/wiki/_revert/:commitId")(readableUsersOnly { repository =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (isEditable(repository)) {
-        if (isEditable(repository)) {
+        val Array(from, to) = params("commitId").split("\\.\\.\\.")
-          val Array(from, to) = params("commitId").split("\\.\\.\\.")
+        val branch = getWikiBranch(repository.owner, repository.name)
 
-          if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, None)) {
+        if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, None, branch)) {
-            redirect(s"/${repository.owner}/${repository.name}/wiki")
+          redirect(s"/${repository.owner}/${repository.name}/wiki")
-          } else {
+        } else {
-            flash.update("info", "This patch was not able to be reversed.")
+          flash.update("info", "This patch was not able to be reversed.")
-            redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
+          redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/$from...$to")
-          }
+        }
-        } else Unauthorized()
+      } else Unauthorized()
     }
   })
 
   get("/:owner/:repository/wiki/:page/_edit")(readableUsersOnly { repository =>
     if (isEditable(repository)) {
       val pageName = StringUtil.urlDecode(params("page"))
-      html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
+      val branch = getWikiBranch(repository.owner, repository.name)
+
+      html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName, branch), repository)
     } else Unauthorized()
   })
 
   post("/:owner/:repository/wiki/_edit", editForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (isEditable(repository)) {
-        if (isEditable(repository)) {
+        saveWikiPage(
-          saveWikiPage(
+          repository.owner,
-            repository.owner,
+          repository.name,
-            repository.name,
+          form.currentPageName,
-            form.currentPageName,
+          form.pageName,
-            form.pageName,
+          appendNewLine(convertLineSeparator(form.content, "LF"), "LF"),
-            appendNewLine(convertLineSeparator(form.content, "LF"), "LF"),
+          loginAccount,
-            loginAccount,
+          form.message.getOrElse(""),
-            form.message.getOrElse(""),
+          Some(form.id)
-            Some(form.id)
+        ).foreach { commitId =>
-          ).foreach {
+          updateLastActivityDate(repository.owner, repository.name)
-            commitId =>
+          val wikiEditInfo =
-              updateLastActivityDate(repository.owner, repository.name)
+            EditWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
-              val wikiEditInfo =
+          recordActivity(wikiEditInfo)
-                EditWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+          callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
-              recordActivity(wikiEditInfo)
+            getAccountByUserName(repository.owner).map { repositoryUser =>
-              callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
+              WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
-                getAccountByUserName(repository.owner).map { repositoryUser =>
+            }
-                  WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
-                }
-              }
           }
-          if (notReservedPageName(form.pageName)) {
+        }
-            redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+        if (notReservedPageName(form.pageName)) {
-          } else {
+          redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-            redirect(s"/${repository.owner}/${repository.name}/wiki")
+        } else {
-          }
+          redirect(s"/${repository.owner}/${repository.name}/wiki")
-        } else Unauthorized()
+        }
+      } else Unauthorized()
     }
   })
 
@@ -218,69 +241,67 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (isEditable(repository)) {
-        if (isEditable(repository)) {
+        saveWikiPage(
-          saveWikiPage(
+          repository.owner,
-            repository.owner,
+          repository.name,
-            repository.name,
+          form.currentPageName,
-            form.currentPageName,
+          form.pageName,
-            form.pageName,
+          form.content,
-            form.content,
+          loginAccount,
-            loginAccount,
+          form.message.getOrElse(""),
-            form.message.getOrElse(""),
+          None
-            None
+        ).foreach { commitId =>
-          ).foreach {
+          updateLastActivityDate(repository.owner, repository.name)
-            commitId =>
+          val createWikiPageInfo =
-              updateLastActivityDate(repository.owner, repository.name)
+            CreateWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName)
-              val createWikiPageInfo =
+          recordActivity(createWikiPageInfo)
-                CreateWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName)
+          callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
-              recordActivity(createWikiPageInfo)
+            getAccountByUserName(repository.owner).map { repositoryUser =>
-              callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
+              WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
-                getAccountByUserName(repository.owner).map { repositoryUser =>
+            }
-                  WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
-                }
-              }
           }
+        }
 
-          if (notReservedPageName(form.pageName)) {
+        if (notReservedPageName(form.pageName)) {
-            redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+          redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-          } else {
+        } else {
-            redirect(s"/${repository.owner}/${repository.name}/wiki")
+          redirect(s"/${repository.owner}/${repository.name}/wiki")
-          }
+        }
-        } else Unauthorized()
+      } else Unauthorized()
     }
   })
 
   get("/:owner/:repository/wiki/:page/_delete")(readableUsersOnly { repository =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      if (isEditable(repository)) {
-        if (isEditable(repository)) {
+        val pageName = StringUtil.urlDecode(params("page"))
-          val pageName = StringUtil.urlDecode(params("page"))
+        deleteWikiPage(
-          deleteWikiPage(
+          repository.owner,
-            repository.owner,
+          repository.name,
-            repository.name,
+          pageName,
-            pageName,
+          loginAccount.fullName,
-            loginAccount.fullName,
+          loginAccount.mailAddress,
-            loginAccount.mailAddress,
+          s"Destroyed $pageName"
-            s"Destroyed ${pageName}"
+        )
-          )
+        val deleteWikiInfo = DeleteWikiInfo(
-          val deleteWikiInfo = DeleteWikiInfo(
+          repository.owner,
-            repository.owner,
+          repository.name,
-            repository.name,
+          loginAccount.userName,
-            loginAccount.userName,
+          pageName
-            pageName
+        )
-          )
+        recordActivity(deleteWikiInfo)
-          recordActivity(deleteWikiInfo)
+        updateLastActivityDate(repository.owner, repository.name)
-          updateLastActivityDate(repository.owner, repository.name)
 
-          redirect(s"/${repository.owner}/${repository.name}/wiki")
+        redirect(s"/${repository.owner}/${repository.name}/wiki")
-        } else Unauthorized()
+      } else Unauthorized()
     }
   })
 
   get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
-    html.pages(getWikiPageList(repository.owner, repository.name), repository, isEditable(repository))
+    val branch = getWikiBranch(repository.owner, repository.name)
+    html.pages(getWikiPageList(repository.owner, repository.name, branch), repository, isEditable(repository))
   })
 
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
@@ -309,24 +330,29 @@ trait WikiControllerBase extends ControllerBase {
       value: String,
       params: Map[String, Seq[String]],
       messages: Messages
-    ): Option[String] =
+    ): Option[String] = {
-      getWikiPageList(params.value("owner"), params.value("repository"))
+      val owner = params.value("owner")
+      val repository = params.value("repository")
+      val branch = getWikiBranch(owner, repository)
+
+      getWikiPageList(owner, repository, branch)
         .find(_ == value)
         .map(_ => "Page already exists.")
+    }
   }
 
-  private def pagename: Constraint = new Constraint() {
+  private def pageName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       if (value.exists("\\/:*?\"<>|".contains(_))) {
-        Some(s"${name} contains invalid character.")
+        Some(s"$name contains invalid character.")
       } else if (notReservedPageName(value) && (value.startsWith("_") || value.startsWith("-"))) {
-        Some(s"${name} starts with invalid character.")
+        Some(s"$name starts with invalid character.")
       } else {
         None
       }
   }
 
-  private def notReservedPageName(value: String) = !(Array[String]("_Sidebar", "_Footer") contains value)
+  private def notReservedPageName(value: String): Boolean = !(Array[String]("_Sidebar", "_Footer") contains value)
 
   private def conflictForNew: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
@@ -344,7 +370,13 @@ trait WikiControllerBase extends ControllerBase {
     }
   }
 
-  private def targetWikiPage = getWikiPage(params("owner"), params("repository"), params("pageName"))
+  private def targetWikiPage: Option[WikiService.WikiPageInfo] = {
+    val owner = params("owner")
+    val repository = params("repository")
+    val pageName = params("pageName")
+    val branch = getWikiBranch(owner, repository)
+    getWikiPage(owner, repository, pageName, branch)
+  }
 
   private def isEditable(repository: RepositoryInfo)(implicit context: Context): Boolean = {
     repository.repository.options.wikiOption match {

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

@@ -1,9 +1,10 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiObject, ApiRef, CreateARef, JsonFormat, UpdateARef}
+import gitbucket.core.api.{ApiError, ApiRef, CreateARef, JsonFormat, UpdateARef}
 import gitbucket.core.controller.ControllerBase
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Directory.getRepositoryDir
-import gitbucket.core.util.ReferrerAuthenticator
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.{ReferrerAuthenticator, RepositoryName, WritableUsersAuthenticator}
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.ObjectId
 import org.eclipse.jgit.lib.RefUpdate.Result
@@ -14,47 +15,38 @@ import scala.jdk.CollectionConverters._
 import scala.util.Using
 
 trait ApiGitReferenceControllerBase extends ControllerBase {
-  self: ReferrerAuthenticator =>
+  self: ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   private val logger = LoggerFactory.getLogger(classOf[ApiGitReferenceControllerBase])
 
+  get("/api/v3/repos/:owner/:repository/git/refs")(referrersOnly { repository =>
+    val result = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      val refs = git
+        .getRepository()
+        .getRefDatabase()
+        .getRefsByPrefix("refs")
+        .asScala
+
+      refs.map(ApiRef.fromRef(RepositoryName(s"${repository.owner}/${repository.name}"), _))
+    }
+    JsonFormat(result)
+  })
+
   /*
    * i. Get a reference
    * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#get-a-reference
    */
   get("/api/v3/repos/:owner/:repository/git/ref/*")(referrersOnly { repository =>
-    getRef()
+    val revstr = multiParams("splat").head
+    getRef(revstr, repository)
   })
 
   // Some versions of GHE support this path
   get("/api/v3/repos/:owner/:repository/git/refs/*")(referrersOnly { repository =>
     logger.warn("git/refs/ endpoint may not be compatible with GitHub API v3. Consider using git/ref/ endpoint instead")
-    getRef()
-  })
-
-  private def getRef() = {
     val revstr = multiParams("splat").head
-    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+    getRef(revstr, repository)
-      val ref = git.getRepository().findRef(revstr)
+  })
-
-      if (ref != null) {
-        val sha = ref.getObjectId().name()
-        JsonFormat(ApiRef(revstr, ApiObject(sha)))
-
-      } else {
-        val refs = git
-          .getRepository()
-          .getRefDatabase()
-          .getRefsByPrefix("refs/")
-          .asScala
-
-        JsonFormat(refs.map { ref =>
-          val sha = ref.getObjectId().name()
-          ApiRef(revstr, ApiObject(sha))
-        })
-      }
-    }
-  }
 
   /*
    * ii. Get all references
@@ -65,23 +57,26 @@ trait ApiGitReferenceControllerBase extends ControllerBase {
    * iii. Create a reference
    * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#create-a-reference
    */
-  post("/api/v3/repos/:owner/:repository/git/refs")(referrersOnly { _ =>
+  post("/api/v3/repos/:owner/:repository/git/refs")(writableUsersOnly { repository =>
-    extractFromJsonBody[CreateARef].map {
+    extractFromJsonBody[CreateARef].map { data =>
-      data =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+        val ref = git.getRepository.findRef(data.ref)
-          val ref = git.getRepository.findRef(data.ref)
+        if (ref == null) {
-          if (ref == null) {
+          val update = git.getRepository.updateRef(data.ref)
-            val update = git.getRepository.updateRef(data.ref)
+          update.setNewObjectId(ObjectId.fromString(data.sha))
-            update.setNewObjectId(ObjectId.fromString(data.sha))
+          val result = update.update()
-            val result = update.update()
+          result match {
-            result match {
+            case Result.NEW =>
-              case Result.NEW => JsonFormat(ApiRef(update.getName, ApiObject(update.getNewObjectId.getName)))
+              JsonFormat(
-              case _          => UnprocessableEntity(result.name())
+                ApiRef
-            }
+                  .fromRef(RepositoryName(repository.owner, repository.name), git.getRepository.findRef(data.ref))
-          } else {
+              )
-            UnprocessableEntity("Ref already exists.")
+            case _ => UnprocessableEntity(result.name())
           }
+        } else {
+          UnprocessableEntity("Ref already exists.")
         }
+      }
     } getOrElse BadRequest()
   })
 
@@ -89,26 +84,25 @@ trait ApiGitReferenceControllerBase extends ControllerBase {
    * iv. Update a reference
    * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#update-a-reference
    */
-  patch("/api/v3/repos/:owner/:repository/git/refs/*")(referrersOnly { _ =>
+  patch("/api/v3/repos/:owner/:repository/git/refs/*")(writableUsersOnly { repository =>
     val refName = multiParams("splat").mkString("/")
-    extractFromJsonBody[UpdateARef].map {
+    extractFromJsonBody[UpdateARef].map { data =>
-      data =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+        val ref = git.getRepository.findRef(refName)
-          val ref = git.getRepository.findRef(refName)
+        if (ref == null) {
-          if (ref == null) {
+          UnprocessableEntity("Ref does not exist.")
-            UnprocessableEntity("Ref does not exist.")
+        } else {
-          } else {
+          val update = git.getRepository.updateRef(ref.getName)
-            val update = git.getRepository.updateRef(ref.getName)
+          update.setNewObjectId(ObjectId.fromString(data.sha))
-            update.setNewObjectId(ObjectId.fromString(data.sha))
+          update.setForceUpdate(data.force)
-            update.setForceUpdate(data.force)
+          val result = update.update()
-            val result = update.update()
+          result match {
-            result match {
+            case Result.FORCED | Result.FAST_FORWARD | Result.NO_CHANGE =>
-              case Result.FORCED | Result.FAST_FORWARD | Result.NO_CHANGE =>
+              JsonFormat(ApiRef.fromRef(RepositoryName(repository), git.getRepository.findRef(refName)))
-                JsonFormat(ApiRef(update.getName, ApiObject(update.getNewObjectId.getName)))
+            case _ => UnprocessableEntity(result.name())
-              case _ => UnprocessableEntity(result.name())
-            }
           }
         }
+      }
     } getOrElse BadRequest()
   })
 
@@ -116,7 +110,7 @@ trait ApiGitReferenceControllerBase extends ControllerBase {
    * v. Delete a reference
    * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#delete-a-reference
    */
-  delete("/api/v3/repos/:owner/:repository/git/refs/*")(referrersOnly { _ =>
+  delete("/api/v3/repos/:owner/:repository/git/refs/*")(writableUsersOnly { _ =>
     val refName = multiParams("splat").mkString("/")
     Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
       val ref = git.getRepository.findRef(refName)
@@ -133,4 +127,34 @@ trait ApiGitReferenceControllerBase extends ControllerBase {
       }
     }
   })
+
+  private def notFound(): ApiError = {
+    response.setStatus(404)
+    ApiError("Not Found")
+  }
+
+  protected def getRef(revstr: String, repository: RepositoryInfo): AnyRef = {
+    logger.debug(s"getRef: path '${revstr}'")
+
+    val name = RepositoryName(repository)
+    val result = JsonFormat(revstr match {
+      case "tags"                     => repository.tags.map(ApiRef.fromTag(name, _))
+      case x if x.startsWith("tags/") =>
+        val tagName = x.substring("tags/".length)
+        repository.tags.find(_.name == tagName) match {
+          case Some(tagInfo) => ApiRef.fromTag(name, tagInfo)
+          case None          => notFound()
+        }
+      case other =>
+        Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+          git.getRepository().findRef(other) match {
+            case null => notFound()
+            case ref  => ApiRef.fromRef(name, ref)
+          }
+        }
+    })
+
+    logger.debug(s"json result: $result")
+    result
+  }
 }

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

@@ -7,13 +7,8 @@ import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, R
 import org.scalatra.ActionResult
 
 trait ApiIssueCommentControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & RepositoryService & HandleCommentService & MilestonesService &
-    with IssuesService
+    ReadableUsersAuthenticator & ReferrerAuthenticator =>
-    with RepositoryService
-    with HandleCommentService
-    with MilestonesService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator =>
   /*
    * i. List issue comments for a repository
    * https://docs.github.com/en/rest/reference/issues#list-issue-comments-for-a-repository
@@ -23,9 +18,8 @@ trait ApiIssueCommentControllerBase extends ControllerBase {
       issueId <- params("id").toIntOpt
       comments = getCommentsForApi(repository.owner, repository.name, issueId)
     } yield {
-      JsonFormat(comments.map {
+      JsonFormat(comments.map { case (issueComment, user, issue) =>
-        case (issueComment, user, issue) =>
+        ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest)
-          ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest)
       })
     }) getOrElse NotFound()
   })
@@ -85,7 +79,7 @@ trait ApiIssueCommentControllerBase extends ControllerBase {
    * iv. Delete a comment
    * https://docs.github.com/en/rest/reference/issues#delete-an-issue-comment
    */
-  delete("/api/v3/repos/:owner/:repo/issues/comments/:id")(readableUsersOnly { repository =>
+  delete("/api/v3/repos/:owner/:repository/issues/comments/:id")(readableUsersOnly { repository =>
     val maybeDeleteResponse: Option[Either[ActionResult, Option[Int]]] =
       for {
         commentId <- params("id").toIntOpt

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

@@ -9,12 +9,8 @@ import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, R
 import gitbucket.core.util.Implicits._
 
 trait ApiIssueControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & IssueCreationService & MilestonesService & ReadableUsersAuthenticator &
-    with IssuesService
+    ReferrerAuthenticator =>
-    with IssueCreationService
-    with MilestonesService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator =>
   /*
    * i. List issues
    * https://developer.github.com/v3/issues/#list-issues
@@ -29,9 +25,9 @@ trait ApiIssueControllerBase extends ControllerBase {
     val page = IssueSearchCondition.page(request)
     // TODO: more api spec condition
     val condition = IssueSearchCondition(request)
-    val baseOwner = getAccountByUserName(repository.owner).get
+    // val baseOwner = getAccountByUserName(repository.owner).get
 
-    val issues: List[(Issue, Account, Option[Account])] =
+    val issues: List[(Issue, Account, List[Account])] =
       searchIssueByApi(
         condition = condition,
         offset = (page - 1) * PullRequestLimit,
@@ -39,17 +35,16 @@ trait ApiIssueControllerBase extends ControllerBase {
         repos = repository.owner -> repository.name
       )
 
-    JsonFormat(issues.map {
+    JsonFormat(issues.map { case (issue, issueUser, assigneeUsers) =>
-      case (issue, issueUser, assignedUser) =>
+      ApiIssue(
-        ApiIssue(
+        issue = issue,
-          issue = issue,
+        repositoryName = RepositoryName(repository),
-          repositoryName = RepositoryName(repository),
+        user = ApiUser(issueUser),
-          user = ApiUser(issueUser),
+        assignees = assigneeUsers.map(ApiUser(_)),
-          assignee = assignedUser.map(ApiUser(_)),
+        labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+          .map(ApiLabel(_, RepositoryName(repository))),
-            .map(ApiLabel(_, RepositoryName(repository))),
+        issue.milestoneId.flatMap { getApiMilestone(repository, _) }
-          issue.milestoneId.flatMap { getApiMilestone(repository, _) }
+      )
-        )
     })
   })
 
@@ -61,7 +56,8 @@ trait ApiIssueControllerBase extends ControllerBase {
     (for {
       issueId <- params("id").toIntOpt
       issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      users = getAccountsByUserNames(Set(issue.openedUserName) ++ issue.assignedUserName, Set())
+      assigneeUsers = getIssueAssignees(repository.owner, repository.name, issueId)
+      users = getAccountsByUserNames(Set(issue.openedUserName) ++ assigneeUsers.map(_.assigneeUserName), Set())
       openedUser <- users.get(issue.openedUserName)
     } yield {
       JsonFormat(
@@ -69,7 +65,7 @@ trait ApiIssueControllerBase extends ControllerBase {
           issue,
           RepositoryName(repository),
           ApiUser(openedUser),
-          issue.assignedUserName.flatMap(users.get(_)).map(ApiUser(_)),
+          assigneeUsers.flatMap(x => users.get(x.assigneeUserName)).map(ApiUser(_)),
           getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository))),
           issue.milestoneId.flatMap { getApiMilestone(repository, _) }
         )
@@ -92,7 +88,7 @@ trait ApiIssueControllerBase extends ControllerBase {
           repository,
           data.title,
           data.body,
-          data.assignees.headOption,
+          data.assignees,
           milestone.map(_.milestoneId),
           None,
           data.labels,
@@ -103,7 +99,9 @@ trait ApiIssueControllerBase extends ControllerBase {
             issue,
             RepositoryName(repository),
             ApiUser(loginAccount),
-            issue.assignedUserName.flatMap(getAccountByUserName(_)).map(ApiUser(_)),
+            getIssueAssignees(repository.owner, repository.name, issue.issueId)
+              .flatMap(x => getAccountByUserName(x.assigneeUserName, false))
+              .map(ApiUser.apply),
             getIssueLabels(repository.owner, repository.name, issue.issueId)
               .map(ApiLabel(_, RepositoryName(repository))),
             issue.milestoneId.flatMap { getApiMilestone(repository, _) }
@@ -123,7 +121,7 @@ trait ApiIssueControllerBase extends ControllerBase {
    */
 
   /*
- * vii. Unlock an issue
+   * vii. Unlock an issue
- * https://developer.github.com/v3/issues/#unlock-an-issue
+   * https://developer.github.com/v3/issues/#unlock-an-issue
- */
+   */
 }

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

@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiError, ApiLabel, CreateALabel, JsonFormat}
+import gitbucket.core.api.{AddLabelsToAnIssue, ApiError, ApiLabel, CreateALabel, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
@@ -7,11 +7,7 @@ import gitbucket.core.util._
 import org.scalatra.{Created, NoContent, UnprocessableEntity}
 
 trait ApiIssueLabelControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & LabelsService & ReferrerAuthenticator & WritableUsersAuthenticator =>
-    with IssuesService
-    with LabelsService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
   /*
    * i. List all labels for this repository
@@ -69,25 +65,24 @@ trait ApiIssueLabelControllerBase extends ControllerBase {
       data <- extractFromJsonBody[CreateALabel] if data.isValid
     } yield {
       LockUtil.lock(RepositoryName(repository).fullName) {
-        getLabel(repository.owner, repository.name, params("labelName")).map {
+        getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-          label =>
+          if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
-            if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
+            updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
-              updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
+            JsonFormat(
-              JsonFormat(
+              ApiLabel(
-                ApiLabel(
+                getLabel(repository.owner, repository.name, label.labelId).get,
-                  getLabel(repository.owner, repository.name, label.labelId).get,
+                RepositoryName(repository)
-                  RepositoryName(repository)
-                )
               )
-            } else {
+            )
-              // TODO ApiError should support errors field to enhance compatibility of GitHub API
+          } else {
-              UnprocessableEntity(
+            // TODO ApiError should support errors field to enhance compatibility of GitHub API
-                ApiError(
+            UnprocessableEntity(
-                  "Validation Failed",
+              ApiError(
-                  Some("https://developer.github.com/v3/issues/labels/#create-a-label")
+                "Validation Failed",
-                )
+                Some("https://developer.github.com/v3/issues/labels/#create-a-label")
               )
-            }
+            )
+          }
         } getOrElse NotFound()
       }
     }) getOrElse NotFound()
@@ -121,10 +116,10 @@ trait ApiIssueLabelControllerBase extends ControllerBase {
    */
   post("/api/v3/repos/:owner/:repository/issues/:id/labels")(writableUsersOnly { repository =>
     JsonFormat(for {
-      data <- extractFromJsonBody[Seq[String]]
+      data <- extractFromJsonBody[AddLabelsToAnIssue]
       issueId <- params("id").toIntOpt
     } yield {
-      data.map { labelName =>
+      data.labels.map { labelName =>
         val label = getLabel(repository.owner, repository.name, labelName).getOrElse(
           getLabel(
             repository.owner,
@@ -160,11 +155,11 @@ trait ApiIssueLabelControllerBase extends ControllerBase {
    */
   put("/api/v3/repos/:owner/:repository/issues/:id/labels")(writableUsersOnly { repository =>
     JsonFormat(for {
-      data <- extractFromJsonBody[Seq[String]]
+      data <- extractFromJsonBody[AddLabelsToAnIssue]
       issueId <- params("id").toIntOpt
     } yield {
       deleteAllIssueLabels(repository.owner, repository.name, issueId, true)
-      data.map { labelName =>
+      data.labels.map { labelName =>
         val label = getLabel(repository.owner, repository.name, labelName).getOrElse(
           getLabel(
             repository.owner,
@@ -189,7 +184,7 @@ trait ApiIssueLabelControllerBase extends ControllerBase {
   })
 
   /*
- * xi Get labels for every issue in a milestone
+   * xi Get labels for every issue in a milestone
- * https://developer.github.com/v3/issues/labels/#get-labels-for-every-issue-in-a-milestone
+   * https://developer.github.com/v3/issues/labels/#get-labels-for-every-issue-in-a-milestone
- */
+   */
 }

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

@@ -2,13 +2,12 @@ package gitbucket.core.controller.api
 import gitbucket.core.api._
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.MilestonesService
-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
 import org.scalatra.NoContent
 
 trait ApiIssueMilestoneControllerBase extends ControllerBase {
-  self: MilestonesService with WritableUsersAuthenticator with ReferrerAuthenticator =>
+  self: MilestonesService & WritableUsersAuthenticator & ReferrerAuthenticator =>
 
   /*
    * i. List milestones
@@ -17,8 +16,10 @@ trait ApiIssueMilestoneControllerBase extends ControllerBase {
   get("/api/v3/repos/:owner/:repository/milestones")(referrersOnly { repository =>
     val state = params.getOrElse("state", "all")
     // TODO "sort", "direction" params should be implemented.
-    val apiMilestones = (for (milestoneWithIssue <- getMilestonesWithIssueCount(repository.owner, repository.name)
+    val apiMilestones = (for (
-                                .sortBy(p => p._1.milestoneId))
+      milestoneWithIssue <- getMilestonesWithIssueCount(repository.owner, repository.name)
+        .sortBy(p => p._1.milestoneId)
+    )
       yield {
         ApiMilestone(
           repository.repository,
@@ -28,7 +29,7 @@ trait ApiIssueMilestoneControllerBase extends ControllerBase {
         )
       }).reverse
     state match {
-      case "all" => JsonFormat(apiMilestones)
+      case "all"             => JsonFormat(apiMilestones)
       case "open" | "closed" =>
         JsonFormat(
           apiMilestones.filter(p => p.state == state)

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

@@ -6,7 +6,7 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{AdminAuthenticator, UsersAuthenticator}
 
 trait ApiOrganizationControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with AdminAuthenticator with UsersAuthenticator =>
+  self: RepositoryService & AccountService & AdminAuthenticator & UsersAuthenticator =>
 
   /*
    * i. List your organizations
@@ -71,6 +71,6 @@ trait ApiOrganizationControllerBase extends ControllerBase {
    */
 
   /*
- * should implement delete an organization API?
+   * should implement delete an organization API?
- */
+   */
 }

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

@@ -16,14 +16,8 @@ import scala.util.Using
 import scala.jdk.CollectionConverters._
 
 trait ApiPullRequestControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & PullRequestService & RepositoryService & MergeService & ReferrerAuthenticator &
-    with IssuesService
+    ReadableUsersAuthenticator & WritableUsersAuthenticator =>
-    with PullRequestService
-    with RepositoryService
-    with MergeService
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /*
    * i. Link Relations
@@ -40,7 +34,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
     val condition = IssueSearchCondition(request)
     val baseOwner = getAccountByUserName(repository.owner).get
 
-    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] =
+    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, List[Account])] =
       searchPullRequestByApi(
         condition = condition,
         offset = (page - 1) * PullRequestLimit,
@@ -48,19 +42,18 @@ trait ApiPullRequestControllerBase extends ControllerBase {
         repos = repository.owner -> repository.name
       )
 
-    JsonFormat(issues.map {
+    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignees) =>
-      case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
+      ApiPullRequest(
-        ApiPullRequest(
+        issue = issue,
-          issue = issue,
+        pullRequest = pullRequest,
-          pullRequest = pullRequest,
+        headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
-          headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
+        baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
-          baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
+        user = ApiUser(issueUser),
-          user = ApiUser(issueUser),
+        labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+          .map(ApiLabel(_, RepositoryName(repository))),
-            .map(ApiLabel(_, RepositoryName(repository))),
+        assignees = assignees.map(ApiUser.apply),
-          assignee = assignee.map(ApiUser.apply),
+        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-          mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
+      )
-        )
     })
   })
 
@@ -89,39 +82,37 @@ trait ApiPullRequestControllerBase extends ControllerBase {
         case Left(createPullReq) =>
           val (reqOwner, reqBranch) = parseCompareIdentifier(createPullReq.head, repository.owner)
           getRepository(reqOwner, repository.name)
-            .flatMap {
+            .flatMap { forkedRepository =>
-              forkedRepository =>
+              getPullRequestCommitFromTo(repository, forkedRepository, createPullReq.base, reqBranch) match {
-                getPullRequestCommitFromTo(repository, forkedRepository, createPullReq.base, reqBranch) match {
+                case (Some(commitIdFrom), Some(commitIdTo)) =>
-                  case (Some(commitIdFrom), Some(commitIdTo)) =>
+                  val issueId = insertIssue(
-                    val issueId = insertIssue(
+                    owner = repository.owner,
-                      owner = repository.owner,
+                    repository = repository.name,
-                      repository = repository.name,
+                    loginUser = context.loginAccount.get.userName,
-                      loginUser = context.loginAccount.get.userName,
+                    title = createPullReq.title,
-                      title = createPullReq.title,
+                    content = createPullReq.body,
-                      content = createPullReq.body,
+                    milestoneId = None,
-                      assignedUserName = None,
+                    priorityId = None,
-                      milestoneId = None,
+                    isPullRequest = true
-                      priorityId = None,
+                  )
-                      isPullRequest = true
-                    )
 
-                    createPullRequest(
+                  createPullRequest(
-                      originRepository = repository,
+                    originRepository = repository,
-                      issueId = issueId,
+                    issueId = issueId,
-                      originBranch = createPullReq.base,
+                    originBranch = createPullReq.base,
-                      requestUserName = reqOwner,
+                    requestUserName = reqOwner,
-                      requestRepositoryName = repository.name,
+                    requestRepositoryName = repository.name,
-                      requestBranch = reqBranch,
+                    requestBranch = reqBranch,
-                      commitIdFrom = commitIdFrom.getName,
+                    commitIdFrom = commitIdFrom.getName,
-                      commitIdTo = commitIdTo.getName,
+                    commitIdTo = commitIdTo.getName,
-                      isDraft = createPullReq.draft.getOrElse(false),
+                    isDraft = createPullReq.draft.getOrElse(false),
-                      loginAccount = context.loginAccount.get,
+                    loginAccount = context.loginAccount.get,
-                      settings = context.settings
+                    settings = context.settings
-                    )
+                  )
-                    getApiPullRequest(repository, issueId).map(JsonFormat(_))
+                  getApiPullRequest(repository, issueId).map(JsonFormat(_))
-                  case _ =>
+                case _ =>
-                    None
+                  None
-                }
+              }
             }
             .getOrElse {
               NotFound()
@@ -129,28 +120,27 @@ trait ApiPullRequestControllerBase extends ControllerBase {
         case Right(createPullReqAlt) =>
           val (reqOwner, reqBranch) = parseCompareIdentifier(createPullReqAlt.head, repository.owner)
           getRepository(reqOwner, repository.name)
-            .flatMap {
+            .flatMap { forkedRepository =>
-              forkedRepository =>
+              getPullRequestCommitFromTo(repository, forkedRepository, createPullReqAlt.base, reqBranch) match {
-                getPullRequestCommitFromTo(repository, forkedRepository, createPullReqAlt.base, reqBranch) match {
+                case (Some(commitIdFrom), Some(commitIdTo)) =>
-                  case (Some(commitIdFrom), Some(commitIdTo)) =>
+                  changeIssueToPullRequest(repository.owner, repository.name, createPullReqAlt.issue)
-                    changeIssueToPullRequest(repository.owner, repository.name, createPullReqAlt.issue)
+                  createPullRequest(
-                    createPullRequest(
+                    originRepository = repository,
-                      originRepository = repository,
+                    issueId = createPullReqAlt.issue,
-                      issueId = createPullReqAlt.issue,
+                    originBranch = createPullReqAlt.base,
-                      originBranch = createPullReqAlt.base,
+                    requestUserName = reqOwner,
-                      requestUserName = reqOwner,
+                    requestRepositoryName = repository.name,
-                      requestRepositoryName = repository.name,
+                    requestBranch = reqBranch,
-                      requestBranch = reqBranch,
+                    commitIdFrom = commitIdFrom.getName,
-                      commitIdFrom = commitIdFrom.getName,
+                    commitIdTo = commitIdTo.getName,
-                      commitIdTo = commitIdTo.getName,
+                    isDraft = false,
-                      isDraft = false,
+                    loginAccount = context.loginAccount.get,
-                      loginAccount = context.loginAccount.get,
+                    settings = context.settings
-                      settings = context.settings
+                  )
-                    )
+                  getApiPullRequest(repository, createPullReqAlt.issue).map(JsonFormat(_))
-                    getApiPullRequest(repository, createPullReqAlt.issue).map(JsonFormat(_))
+                case _ =>
-                  case _ =>
+                  None
-                    None
+              }
-                }
             }
             .getOrElse {
               NotFound()
@@ -191,26 +181,24 @@ trait ApiPullRequestControllerBase extends ControllerBase {
   get("/api/v3/repos/:owner/:repository/pulls/:id/commits")(referrersOnly { repository =>
     val owner = repository.owner
     val name = repository.name
-    params("id").toIntOpt.flatMap {
+    params("id").toIntOpt.flatMap { issueId =>
-      issueId =>
+      getPullRequest(owner, name, issueId) map { case (issue, pullreq) =>
-        getPullRequest(owner, name, issueId) map {
+        Using.resource(Git.open(getRepositoryDir(owner, name))) { git =>
-          case (issue, pullreq) =>
+          val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
-            Using.resource(Git.open(getRepositoryDir(owner, name))) { git =>
+          val newId = git.getRepository.resolve(pullreq.commitIdTo)
-              val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
+          val repoFullName = RepositoryName(repository)
-              val newId = git.getRepository.resolve(pullreq.commitIdTo)
+          val commits = git.log
-              val repoFullName = RepositoryName(repository)
+            .addRange(oldId, newId)
-              val commits = git.log
+            .call
-                .addRange(oldId, newId)
+            .iterator
-                .call
+            .asScala
-                .iterator
+            .map { c =>
-                .asScala
+              ApiCommitListItem(new CommitInfo(c), repoFullName)
-                .map { c =>
-                  ApiCommitListItem(new CommitInfo(c), repoFullName)
-                }
-                .toList
-              JsonFormat(commits)
             }
+            .toList
+          JsonFormat(commits)
         }
+      }
     } getOrElse NotFound()
   })
   /*
@@ -241,8 +229,8 @@ trait ApiPullRequestControllerBase extends ControllerBase {
    */
   put("/api/v3/repos/:owner/:repository/pulls/:id/merge")(referrersOnly { repository =>
     (for {
-      //TODO: crash when body is empty
+      // TODO: crash when body is empty
-      //TODO: Implement sha parameter
+      // TODO: Implement sha parameter
       data <- extractFromJsonBody[MergeAPullRequest]
       issueId <- params("id").toIntOpt
       (issue, pullReq) <- getPullRequest(repository.owner, repository.name, issueId)
@@ -274,7 +262,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
             repository,
             issueId,
             context.loginAccount.get,
-            data.commit_message.getOrElse(""), //TODO: Implement commit_title
+            data.commit_message.getOrElse(""), // TODO: Implement commit_title
             strategy,
             pullReq.isDraft,
             context.settings
@@ -319,8 +307,8 @@ trait ApiPullRequestControllerBase extends ControllerBase {
       baseOwner <- users.get(repository.owner)
       headOwner <- users.get(pullRequest.requestUserName)
       issueUser <- users.get(issue.openedUserName)
-      assignee = issue.assignedUserName.flatMap { userName =>
+      assignees = getIssueAssignees(repository.owner, repository.name, issueId).flatMap { assignedUser =>
-        getAccountByUserName(userName, false)
+        getAccountByUserName(assignedUser.assigneeUserName, false)
       }
       headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
     } yield {
@@ -332,7 +320,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
         user = ApiUser(issueUser),
         labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
           .map(ApiLabel(_, RepositoryName(repository))),
-        assignee = assignee.map(ApiUser.apply),
+        assignees = assignees.map(ApiUser.apply),
         mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
       )
     }

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

@@ -11,7 +11,7 @@ import org.apache.commons.io.FileUtils
 import org.scalatra.NoContent
 
 trait ApiReleaseControllerBase extends ControllerBase {
-  self: AccountService with ReleaseService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: AccountService & ReleaseService & ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   /**
    * i. List releases for a repository
@@ -119,40 +119,39 @@ trait ApiReleaseControllerBase extends ControllerBase {
    * ix. Upload a release asset
    * https://developer.github.com/v3/repos/releases/#upload-a-release-asset
    */
-  post("/api/v3/repos/:owner/:repository/releases/:tag/assets")(writableUsersOnly {
+  post("/api/v3/repos/:owner/:repository/releases/:tag/assets")(writableUsersOnly { repository =>
-    repository =>
+    val name = params("name")
-      val name = params("name")
+    val tag = params("tag")
-      val tag = params("tag")
+    getRelease(repository.owner, repository.name, tag)
-      getRelease(repository.owner, repository.name, tag)
+      .map { release =>
-        .map { release =>
+        val fileId = FileUtil.generateFileId
-          val fileId = FileUtil.generateFileId
+        val buf = new Array[Byte](request.inputStream.available())
-          val buf = new Array[Byte](request.inputStream.available())
+        request.inputStream.read(buf)
-          request.inputStream.read(buf)
+        FileUtils.writeByteArrayToFile(
-          FileUtils.writeByteArrayToFile(
+          new File(
-            new File(
+            getReleaseFilesDir(repository.owner, repository.name),
-              getReleaseFilesDir(repository.owner, repository.name),
+            FileUtil.checkFilename(tag + "/" + fileId)
-              FileUtil.checkFilename(tag + "/" + fileId)
+          ),
-            ),
+          buf
-            buf
+        )
-          )
+        createReleaseAsset(
-          createReleaseAsset(
+          repository.owner,
-            repository.owner,
+          repository.name,
-            repository.name,
+          tag,
-            tag,
+          fileId,
-            fileId,
+          name,
-            name,
+          request.contentLength.getOrElse(0),
-            request.contentLength.getOrElse(0),
+          context.loginAccount.get
-            context.loginAccount.get
+        )
-          )
+        getReleaseAsset(repository.owner, repository.name, tag, fileId)
-          getReleaseAsset(repository.owner, repository.name, tag, fileId)
+          .map { asset =>
-            .map { asset =>
+            JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
-              JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
+          }
-            }
+          .getOrElse {
-            .getOrElse {
+            ApiError("Unknown error")
-              ApiError("Unknown error")
+          }
-            }
+      }
-        }
+      .getOrElse(NotFound())
-        .getOrElse(NotFound())
   })
 
   /**
@@ -176,7 +175,7 @@ trait ApiReleaseControllerBase extends ControllerBase {
    */
 
   /*
- * xii. Delete a release asset
+   * xii. Delete a release asset
- * https://developer.github.com/v3/repos/releases/#edit-a-release-asset
+   * https://developer.github.com/v3/repos/releases/#edit-a-release-asset
- */
+   */
 }

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

@@ -1,26 +1,19 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api._
+import gitbucket.core.api.*
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, ProtectedBranchService, RepositoryService}
-import gitbucket.core.util._
+import gitbucket.core.util.*
-import gitbucket.core.util.Directory._
+import gitbucket.core.util.Directory.*
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util.JGitUtil.getBranches
+import gitbucket.core.util.JGitUtil.{getBranchesNoMergeInfo, processTree}
 import org.eclipse.jgit.api.Git
 import org.scalatra.NoContent
 
 import scala.util.Using
 
 trait ApiRepositoryBranchControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & AccountService & OwnerAuthenticator & UsersAuthenticator & GroupManagerAuthenticator &
-    with AccountService
+    ProtectedBranchService & ReferrerAuthenticator & ReadableUsersAuthenticator & WritableUsersAuthenticator =>
-    with OwnerAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ProtectedBranchService
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /**
    * i. List branches
@@ -30,11 +23,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
     Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       JsonFormat(
         JGitUtil
-          .getBranches(
+          .getBranchesNoMergeInfo(git)
-            git = git,
-            defaultBranch = repository.repository.defaultBranch,
-            origin = repository.repository.originUserName.isEmpty
-          )
           .map { br =>
             ApiBranchForList(br.name, ApiBranchCommit(br.commitId))
           }
@@ -47,21 +36,18 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
    * https://docs.github.com/en/rest/reference/repos#get-a-branch
    */
   get("/api/v3/repos/:owner/:repository/branches/*")(referrersOnly { repository =>
-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      git =>
+      (for {
-        (for {
+        branch <- params.get("splat") if repository.branchList.contains(branch)
-          branch <- params.get("splat") if repository.branchList.contains(branch)
+        br <- getBranchesNoMergeInfo(git).find(_.name == branch)
-          br <- getBranches(
+      } yield {
-            git,
+        val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
-            repository.repository.defaultBranch,
+        JsonFormat(
-            repository.repository.originUserName.isEmpty
+          ApiBranch(branch, ApiBranchCommit(br.commitId), ApiBranchProtectionResponse(protection))(
-          ).find(_.name == branch)
+            RepositoryName(repository)
-        } yield {
-          val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
-          JsonFormat(
-            ApiBranch(branch, ApiBranchCommit(br.commitId), ApiBranchProtection(protection))(RepositoryName(repository))
           )
-        }) getOrElse NotFound()
+        )
+      }) getOrElse NotFound()
     }
   })
 
@@ -74,7 +60,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
     if (repository.branchList.contains(branch)) {
       val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
       JsonFormat(
-        ApiBranchProtection(protection)
+        ApiBranchProtectionResponse(protection)
       )
     } else { NotFound() }
   })
@@ -154,7 +140,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
       if (repository.branchList.contains(branch)) {
         val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
         JsonFormat(
-          ApiBranchProtection(protection).required_status_checks
+          ApiBranchProtectionResponse(protection).required_status_checks
         )
       } else { NotFound() }
   })
@@ -274,31 +260,30 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
    * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
    */
   patch("/api/v3/repos/:owner/:repository/branches/*")(ownerOnly { repository =>
-    import gitbucket.core.api._
+    import gitbucket.core.api.*
-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      git =>
+      (for {
-        (for {
+        branch <- params.get("splat") if repository.branchList.contains(branch)
-          branch <- params.get("splat") if repository.branchList.contains(branch)
+        protection <- extractFromJsonBody[ApiBranchProtectionRequest.EnablingAndDisabling].map(_.protection)
-          protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
+        br <- getBranchesNoMergeInfo(git).find(_.name == branch)
-          br <- getBranches(
+      } yield {
-            git,
+        if (protection.enabled) {
-            repository.repository.defaultBranch,
+          enableBranchProtection(
-            repository.repository.originUserName.isEmpty
+            repository.owner,
-          ).find(_.name == branch)
+            repository.name,
-        } yield {
+            branch,
-          if (protection.enabled) {
+            protection.enforce_admins.getOrElse(false),
-            enableBranchProtection(
+            protection.required_status_checks.isDefined,
-              repository.owner,
+            protection.required_status_checks.map(_.contexts).getOrElse(Nil),
-              repository.name,
+            protection.restrictions.isDefined,
-              branch,
+            protection.restrictions.map(_.users).getOrElse(Nil)
-              protection.status.enforcement_level == ApiBranchProtection.Everyone,
+          )
-              protection.status.contexts
+        } else {
-            )
+          disableBranchProtection(repository.owner, repository.name, branch)
-          } else {
+        }
-            disableBranchProtection(repository.owner, repository.name, branch)
+        val response = ApiBranchProtectionResponse(getProtectedBranchInfo(repository.owner, repository.name, branch))
-          }
+        JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), response)(RepositoryName(repository)))
-          JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), protection)(RepositoryName(repository)))
+      }) getOrElse NotFound()
-        }) getOrElse NotFound()
     }
   })
 }

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

@@ -7,7 +7,7 @@ import gitbucket.core.util.{OwnerAuthenticator, ReferrerAuthenticator}
 import org.scalatra.NoContent
 
 trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with ReferrerAuthenticator with OwnerAuthenticator =>
+  self: RepositoryService & AccountService & ReferrerAuthenticator & OwnerAuthenticator =>
 
   /*
    * i. List repository collaborators

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

@@ -4,17 +4,24 @@ import gitbucket.core.controller.ControllerBase
 import gitbucket.core.model.Account
 import gitbucket.core.service.{AccountService, CommitsService, ProtectedBranchService}
 import gitbucket.core.util.Directory.getRepositoryDir
-import gitbucket.core.util.Implicits._
+import gitbucket.core.util.Implicits.*
-import gitbucket.core.util.JGitUtil.{CommitInfo, getBranches, getBranchesOfCommit}
+import gitbucket.core.util.JGitUtil.{CommitInfo, getBranchesNoMergeInfo, getBranchesOfCommit}
 import gitbucket.core.util.{JGitUtil, ReferrerAuthenticator, RepositoryName}
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
+import org.eclipse.jgit.revwalk.filter.*
+import org.eclipse.jgit.treewalk.filter.{AndTreeFilter, PathFilterGroup, TreeFilter}
 
-import scala.jdk.CollectionConverters._
+import java.time.format.DateTimeFormatter.*
+import java.time.{LocalDateTime, ZoneOffset}
+import java.util.Date
+import scala.collection.mutable.ListBuffer
+import scala.jdk.CollectionConverters.*
+import scala.math.min
 import scala.util.Using
 
 trait ApiRepositoryCommitControllerBase extends ControllerBase {
-  self: AccountService with CommitsService with ProtectedBranchService with ReferrerAuthenticator =>
+  self: AccountService & CommitsService & ProtectedBranchService & ReferrerAuthenticator =>
   /*
    * i. List commits on a repository
    * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository
@@ -22,28 +29,60 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
   get("/api/v3/repos/:owner/:repository/commits")(referrersOnly { repository =>
     val owner = repository.owner
     val name = repository.name
-    // TODO: The following parameters need to be implemented. [:path, :author, :since, :until]
+    val sha = params.get("sha").filter(_.nonEmpty).getOrElse("HEAD")
-    val sha = params.getOrElse("sha", "refs/heads/master")
+    val page = params.get("page").filter(_.nonEmpty).getOrElse("1").toInt
-    Using.resource(Git.open(getRepositoryDir(owner, name))) {
+    val per_page = min(params.get("per_page").filter(_.nonEmpty).getOrElse("30").toInt, 100)
-      git =>
+    val author = params.get("author").filter(_.nonEmpty)
-        val repo = git.getRepository
+    val path = params.get("path").filter(_.nonEmpty)
-        Using.resource(new RevWalk(repo)) {
+    val since = params.get("since").filter(_.nonEmpty)
-          revWalk =>
+    val until = params.get("until").filter(_.nonEmpty)
-            val objectId = repo.resolve(sha)
+    Using.resource(Git.open(getRepositoryDir(owner, name))) { git =>
-            revWalk.markStart(revWalk.parseCommit(objectId))
+      val repo = git.getRepository
-            JsonFormat(revWalk.asScala.take(30).map {
+      Using.resource(new RevWalk(repo)) { revWalk =>
-              commit =>
+        val objectId = repo.resolve(sha)
-                val commitInfo = new CommitInfo(commit)
+        revWalk.markStart(revWalk.parseCommit(objectId))
-                ApiCommits(
+        if (path.nonEmpty) {
-                  repositoryName = RepositoryName(repository),
+          revWalk.setTreeFilter(
-                  commitInfo = commitInfo,
+            AndTreeFilter.create(PathFilterGroup.createFromStrings(path.get), TreeFilter.ANY_DIFF)
-                  diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
+          )
-                  author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
-                  committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
-                  commentCount = getCommitComment(repository.owner, repository.name, commitInfo.id).size
-                )
-            })
         }
+        val revfilters = new ListBuffer[(RevFilter)]()
+        if (author.nonEmpty) {
+          revfilters += AuthorRevFilter.create(author.get)
+        }
+        if (since.nonEmpty) {
+          revfilters += CommitTimeRevFilter.after(
+            Date.from(LocalDateTime.parse(since.get, ISO_DATE_TIME).toInstant(ZoneOffset.UTC))
+          )
+        }
+        if (until.nonEmpty) {
+          revfilters += CommitTimeRevFilter.before(
+            Date.from(LocalDateTime.parse(until.get, ISO_DATE_TIME).toInstant(ZoneOffset.UTC))
+          )
+        }
+        if (page > 1) {
+          revfilters += SkipRevFilter.create(page * per_page - 2)
+        }
+        revfilters += MaxCountRevFilter.create(per_page);
+        revWalk.setRevFilter(
+          if (revfilters.size > 1) {
+            AndRevFilter.create(revfilters.toArray)
+          } else {
+            revfilters(0)
+          }
+        )
+        JsonFormat(revWalk.asScala.map { commit =>
+          val commitInfo = new CommitInfo(commit)
+          ApiCommits(
+            repositoryName = RepositoryName(repository),
+            commitInfo = commitInfo,
+            diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
+            author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
+            committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
+            commentCount = getCommitComment(repository.owner, repository.name, commitInfo.id).size
+          )
+        })
+      }
     }
   })
 
@@ -56,24 +95,23 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
     val name = repository.name
     val sha = params("sha")
 
-    Using.resource(Git.open(getRepositoryDir(owner, name))) {
+    Using.resource(Git.open(getRepositoryDir(owner, name))) { git =>
-      git =>
+      val repo = git.getRepository
-        val repo = git.getRepository
+      val objectId = repo.resolve(sha)
-        val objectId = repo.resolve(sha)
+      val commitInfo = Using.resource(new RevWalk(repo)) { revWalk =>
-        val commitInfo = Using.resource(new RevWalk(repo)) { revWalk =>
+        new CommitInfo(revWalk.parseCommit(objectId))
-          new CommitInfo(revWalk.parseCommit(objectId))
+      }
-        }
 
-        JsonFormat(
+      JsonFormat(
-          ApiCommits(
+        ApiCommits(
-            repositoryName = RepositoryName(repository),
+          repositoryName = RepositoryName(repository),
-            commitInfo = commitInfo,
+          commitInfo = commitInfo,
-            diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
+          diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
-            author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
+          author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
-            committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
+          committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
-            commentCount = getCommitComment(repository.owner, repository.name, sha).size
+          commentCount = getCommitComment(repository.owner, repository.name, sha).size
-          )
         )
+      )
     }
   })
 
@@ -121,7 +159,7 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
     Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val apiBranchForCommits = for {
         branch <- getBranchesOfCommit(git, sha)
-        br <- getBranches(git, branch, repository.repository.originUserName.isEmpty).find(_.name == branch)
+        br <- getBranchesNoMergeInfo(git).find(_.name == branch)
       } yield {
         val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
         ApiBranchForHeadCommit(branch, ApiBranchCommit(br.commitId), protection.enabled)

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

@@ -3,7 +3,7 @@ import gitbucket.core.api.{ApiCommit, ApiContents, ApiError, CreateAFile, JsonFo
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{RepositoryCommitFileService, RepositoryService}
 import gitbucket.core.util.Directory.getRepositoryDir
-import gitbucket.core.util.JGitUtil.{CommitInfo, FileInfo, getContentFromId, getFileList, getSummaryMessage}
+import gitbucket.core.util.JGitUtil.{CommitInfo, FileInfo, getContentFromId, getFileList}
 import gitbucket.core.util._
 import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
 import gitbucket.core.util.Implicits._
@@ -12,24 +12,23 @@ import org.eclipse.jgit.api.Git
 import scala.util.Using
 
 trait ApiRepositoryContentsControllerBase extends ControllerBase {
-  self: ReferrerAuthenticator with WritableUsersAuthenticator with RepositoryCommitFileService =>
+  self: ReferrerAuthenticator & WritableUsersAuthenticator & RepositoryCommitFileService =>
 
   /**
    * i. Get a repository README
    * https://docs.github.com/en/rest/reference/repos#get-a-repository-readme
    */
   get("/api/v3/repos/:owner/:repository/readme")(referrersOnly { repository =>
-    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) {
+    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
-      git =>
+      val refStr = params.getOrElse("ref", repository.repository.defaultBranch)
-        val refStr = params.getOrElse("ref", repository.repository.defaultBranch)
+      val files = getFileList(git, refStr, ".", maxFiles = context.settings.repositoryViewer.maxFiles)
-        val files = getFileList(git, refStr, ".", maxFiles = context.settings.repositoryViewer.maxFiles)
+      files // files should be sorted alphabetically.
-        files // files should be sorted alphabetically.
+        .find { file =>
-          .find { file =>
+          !file.isDirectory && RepositoryService.readmeFiles.contains(file.name.toLowerCase)
-            !file.isDirectory && RepositoryService.readmeFiles.contains(file.name.toLowerCase)
+        } match {
-          } match {
+        case Some(x) => getContents(repository = repository, path = x.name, refStr = refStr, ignoreCase = true)
-          case Some(x) => getContents(repository = repository, path = x.name, refStr = refStr, ignoreCase = true)
+        case _       => NotFound()
-          case _       => NotFound()
+      }
-        }
     }
   })
 
@@ -49,21 +48,19 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
     getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
   })
 
-  private def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
+  private def getFileInfo(git: Git, revision: String, pathStr: String, ignoreCase: Boolean): Option[FileInfo] = {
-    val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+    val (dirName, fileName) = pathStr.lastIndexOf('/') match {
-    getPathObjectId(git, pathStr, revCommit).map { objectId =>
+      case -1 =>
-      FileInfo(
+        (".", pathStr)
-        id = objectId,
+      case n =>
-        isDirectory = false,
+        (pathStr.take(n), pathStr.drop(n + 1))
-        name = pathStr.split("/").last,
+    }
-        path = pathStr.split("/").dropRight(1).mkString("/"),
+    if (ignoreCase) {
-        message = getSummaryMessage(revCommit.getFullMessage, revCommit.getShortMessage),
+      getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
-        commitId = revCommit.getName,
+        .find(_.name.toLowerCase.equals(fileName.toLowerCase))
-        time = revCommit.getAuthorIdent.getWhen,
+    } else {
-        author = revCommit.getAuthorIdent.getName,
+      getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
-        mailAddress = revCommit.getAuthorIdent.getEmailAddress,
+        .find(_.name.equals(fileName))
-        linkUrl = None
-      )
     }
   }
 
@@ -76,17 +73,16 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
     Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
       val fileList = getFileList(git, refStr, path, maxFiles = context.settings.repositoryViewer.maxFiles)
       if (fileList.isEmpty) { // file or NotFound
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(refStr))
+        getFileInfo(git, refStr, path, ignoreCase)
-        getPathObjectId(git, path, revCommit)
+          .flatMap { f =>
-          .flatMap { objectId =>
             val largeFile = params.get("large_file").exists(s => s.equals("true"))
-            val content = getContentFromId(git, objectId, largeFile)
+            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(path) => {
+              case "application/vnd.github.v3.html" if isRenderable(f.name) => {
                 contentType = "application/vnd.github.v3.html"
                 content.map { c =>
                   List(
@@ -117,12 +113,11 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
                 }
               }
               case _ =>
-                getFileInfo(git, refStr, path).map { f =>
+                Some(JsonFormat(ApiContents(f, RepositoryName(repository), content)))
-                  JsonFormat(ApiContents(f, RepositoryName(repository), content))
-                }
             }
           }
           .getOrElse(NotFound())
+
       } else { // directory
         JsonFormat(fileList.map { f =>
           ApiContents(f, RepositoryName(repository), None)
@@ -138,65 +133,65 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
    * requested #2112
    */
   put("/api/v3/repos/:owner/:repository/contents/*")(writableUsersOnly { repository =>
-    context.withLoginAccount {
+    context.withLoginAccount { loginAccount =>
-      loginAccount =>
+      JsonFormat(for {
-        JsonFormat(for {
+        data <- extractFromJsonBody[CreateAFile]
-          data <- extractFromJsonBody[CreateAFile]
+      } yield {
-        } yield {
+        val branch = data.branch.getOrElse(repository.repository.defaultBranch)
-          val branch = data.branch.getOrElse(repository.repository.defaultBranch)
+        val commit = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-          val commit = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+          val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
-            val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+          revCommit.name
-            revCommit.name
+        }
-          }
+        val paths = multiParams("splat").head.split("/")
-          val paths = multiParams("splat").head.split("/")
+        val path = paths.take(paths.size - 1).toList.mkString("/")
-          val path = paths.take(paths.size - 1).toList.mkString("/")
+        Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
-          Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) {
+          val fileInfo = getFileInfo(git, commit, path, false)
-            git =>
-              getFileInfo(git, commit, path) match {
-                case Some(f) if !data.sha.contains(f.id.getName) =>
-                  ApiError(
-                    "The blob SHA is not matched.",
-                    Some("https://docs.github.com/en/rest/reference/repos#create-or-update-file-contents")
-                  )
-                case _ =>
-                  val (commitId, blobId) = commitFile(
-                    repository,
-                    branch,
-                    path,
-                    Some(paths.last),
-                    data.sha.map(_ => paths.last),
-                    StringUtil.base64Decode(data.content),
-                    data.message,
-                    commit,
-                    loginAccount,
-                    data.committer.map(_.name).getOrElse(loginAccount.fullName),
-                    data.committer.map(_.email).getOrElse(loginAccount.mailAddress),
-                    context.settings
-                  )
 
-                  blobId match {
+          fileInfo match {
-                    case None =>
+            case Some(f) if !data.sha.contains(f.id.getName) =>
-                      ApiError("Failed to commit a file.", None)
+              ApiError(
-                    case Some(blobId) =>
+                "The blob SHA is not matched.",
-                      Map(
+                Some("https://docs.github.com/en/rest/reference/repos#create-or-update-file-contents")
-                        "content" -> ApiContents(
+              )
-                          "file",
+            case _ =>
-                          paths.last,
+              commitFile(
-                          path,
+                repository,
-                          blobId.name,
+                branch,
-                          Some(data.content),
+                path,
-                          Some("base64")
+                Some(paths.last),
-                        )(RepositoryName(repository)),
+                data.sha.map(_ => paths.last),
-                        "commit" -> ApiCommit(
+                StringUtil.base64Decode(data.content),
-                          git,
+                data.message,
-                          RepositoryName(repository),
+                commit,
-                          new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+                loginAccount,
-                        )
+                data.committer.map(_.name).getOrElse(loginAccount.fullName),
-                      )
+                data.committer.map(_.email).getOrElse(loginAccount.mailAddress),
-                  }
+                context.settings
+              ) match {
+                case Left(error) =>
+                  ApiError(s"Failed to commit a file: ${error}", None)
+                case Right((_, None)) =>
+                  ApiError("Failed to commit a file.", None)
+                case Right((commitId, Some(blobId))) =>
+                  Map(
+                    "content" -> ApiContents(
+                      "file",
+                      paths.last,
+                      path,
+                      blobId.name,
+                      Some(data.content),
+                      Some("base64")
+                    )(RepositoryName(repository)),
+                    "commit" -> ApiCommit(
+                      git,
+                      RepositoryName(repository),
+                      new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+                    )
+                  )
               }
           }
-        })
+        }
+      })
     }
   })
 
@@ -207,9 +202,9 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
    */
 
   /*
- * vi. Download a repository archive (tar/zip)
+   * vi. Download a repository archive (tar/zip)
- * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-tar
+   * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-tar
- * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-zip
+   * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-zip
- */
+   */
 
 }

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

@@ -15,15 +15,9 @@ import scala.concurrent.duration.Duration
 import scala.util.Using
 
 trait ApiRepositoryControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & ApiGitReferenceControllerBase & RepositoryCreationService & AccountService &
-    with RepositoryCreationService
+    OwnerAuthenticator & UsersAuthenticator & GroupManagerAuthenticator & ReferrerAuthenticator &
-    with AccountService
+    ReadableUsersAuthenticator & WritableUsersAuthenticator =>
-    with OwnerAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /**
    * i. List your repositories
@@ -92,7 +86,8 @@ trait ApiRepositoryControllerBase extends ControllerBase {
             data.name,
             data.description,
             data.`private`,
-            data.auto_init
+            data.auto_init,
+            context.settings.defaultBranch
           )
           Await.result(f, Duration.Inf)
 
@@ -129,7 +124,8 @@ trait ApiRepositoryControllerBase extends ControllerBase {
             data.name,
             data.description,
             data.`private`,
-            data.auto_init
+            data.auto_init,
+            context.settings.defaultBranch
           )
           Await.result(f, Duration.Inf)
           val repository = Database() withTransaction { session =>
@@ -184,9 +180,11 @@ trait ApiRepositoryControllerBase extends ControllerBase {
    * https://docs.github.com/en/rest/reference/repos#list-repository-tags
    */
   get("/api/v3/repos/:owner/:repository/tags")(referrersOnly { repository =>
-    JsonFormat(
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      repository.tags.map(tagInfo => ApiTag(tagInfo.name, RepositoryName(repository), tagInfo.id))
+      JsonFormat(
-    )
+        repository.tags.map(tagInfo => ApiTag(tagInfo.name, RepositoryName(repository), tagInfo.commitId))
+      )
+    }
   })
 
   /*

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

@@ -7,7 +7,7 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{JGitUtil, ReferrerAuthenticator, WritableUsersAuthenticator}
 
 trait ApiRepositoryStatusControllerBase extends ControllerBase {
-  self: AccountService with CommitStatusService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: AccountService & CommitStatusService & ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   /*
    * i. Create a status
@@ -47,9 +47,8 @@ trait ApiRepositoryStatusControllerBase extends ControllerBase {
       ref <- params.get("ref")
       sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
     } yield {
-      JsonFormat(getCommitStatusesWithCreator(repository.owner, repository.name, sha).map {
+      JsonFormat(getCommitStatusesWithCreator(repository.owner, repository.name, sha).map { case (status, creator) =>
-        case (status, creator) =>
+        ApiCommitStatus(status, ApiUser(creator))
-          ApiCommitStatus(status, ApiUser(creator))
       })
     }) getOrElse NotFound()
   })

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

@@ -8,7 +8,7 @@ import gitbucket.core.util.Implicits._
 import org.scalatra.NoContent
 
 trait ApiRepositoryWebhookControllerBase extends ControllerBase {
-  self: RepositoryService with WebHookService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: RepositoryService & WebHookService & ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   /*
    * i. List repository webhooks
@@ -113,8 +113,8 @@ trait ApiRepositoryWebhookControllerBase extends ControllerBase {
    */
 
   /*
- * vi. Test the push repository webhook
+   * vi. Test the push repository webhook
- * https://docs.github.com/en/rest/reference/repos#test-the-push-repository-webhook
+   * https://docs.github.com/en/rest/reference/repos#test-the-push-repository-webhook
- */
+   */
 
 }

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

@@ -8,7 +8,7 @@ import gitbucket.core.util.StringUtil._
 import org.scalatra.NoContent
 
 trait ApiUserControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with AdminAuthenticator with UsersAuthenticator =>
+  self: RepositoryService & AccountService & AdminAuthenticator & UsersAuthenticator =>
 
   /**
    * i. Get a single user

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

@@ -10,7 +10,7 @@ trait AccessTokenComponent { self: Profile =>
     val userName = column[String]("USER_NAME")
     val tokenHash = column[String]("TOKEN_HASH")
     val note = column[String]("NOTE")
-    def * = (accessTokenId, userName, tokenHash, note).<>(AccessToken.tupled, AccessToken.unapply)
+    def * = (accessTokenId, userName, tokenHash, note).mapTo[AccessToken]
   }
 }
 case class AccessToken(

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

@@ -35,7 +35,7 @@ trait AccountComponent { self: Profile =>
         groupAccount,
         removed,
         description.?
-      ).<>(Account.tupled, Account.unapply)
+      ).mapTo[Account]
   }
 }
 

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

@@ -9,7 +9,7 @@ trait AccountExtraMailAddressComponent { self: Profile =>
     val userName = column[String]("USER_NAME", O PrimaryKey)
     val extraMailAddress = column[String]("EXTRA_MAIL_ADDRESS", O PrimaryKey)
     def * =
-      (userName, extraMailAddress).<>(AccountExtraMailAddress.tupled, AccountExtraMailAddress.unapply)
+      (userName, extraMailAddress).mapTo[AccountExtraMailAddress]
   }
 }
 

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

@@ -9,7 +9,7 @@ trait AccountFederationComponent { self: Profile =>
     val issuer = column[String]("ISSUER")
     val subject = column[String]("SUBJECT")
     val userName = column[String]("USER_NAME")
-    def * = (issuer, subject, userName).<>(AccountFederation.tupled, AccountFederation.unapply)
+    def * = (issuer, subject, userName).mapTo[AccountFederation]
 
     def byPrimaryKey(issuer: String, subject: String): Rep[Boolean] =
       (this.issuer === issuer.bind) && (this.subject === subject.bind)

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

@@ -9,7 +9,7 @@ trait AccountPreferenceComponent { self: Profile =>
     val userName = column[String]("USER_NAME", O PrimaryKey)
     val highlighterTheme = column[String]("HIGHLIGHTER_THEME")
     def * =
-      (userName, highlighterTheme).<>(AccountPreference.tupled, AccountPreference.unapply)
+      (userName, highlighterTheme).mapTo[AccountPreference]
 
     def byPrimaryKey(userName: String): Rep[Boolean] = this.userName === userName.bind
   }

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

@@ -12,7 +12,7 @@ trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
     val url = column[String]("URL")
     val token = column[Option[String]]("TOKEN")
     val ctype = column[WebHookContentType]("CTYPE")
-    def * = (userName, url, ctype, token).<>((AccountWebHook.apply _).tupled, AccountWebHook.unapply)
+    def * = (userName, url, ctype, token).mapTo[AccountWebHook]
 
     def byPrimaryKey(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
   }

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

@@ -12,7 +12,7 @@ trait AccountWebHookEventComponent extends TemplateComponent { self: Profile =>
     val url = column[String]("URL")
     val event = column[WebHook.Event]("EVENT")
 
-    def * = (userName, url, event).<>((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)
+    def * = (userName, url, event).mapTo[AccountWebHookEvent]
 
     def byAccountWebHook(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
 

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

@@ -11,7 +11,7 @@ trait ActivityComponent extends TemplateComponent { self: Profile =>
   lazy val Activities = TableQuery[Activities]
 
   class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
-    def * = ???
+    def * : slick.lifted.ProvenShape[Activity] = ???
   }
 }
 

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

@@ -3,7 +3,7 @@ package gitbucket.core.model
 protected[model] trait TemplateComponent { self: Profile =>
   import profile.api._
 
-  trait BasicTemplate { self: Table[_] =>
+  trait BasicTemplate { self: Table[?] =>
     val userName = column[String]("USER_NAME")
     val repositoryName = column[String]("REPOSITORY_NAME")
 
@@ -18,7 +18,7 @@ protected[model] trait TemplateComponent { self: Profile =>
       (this.userName === userName) && (this.repositoryName === repositoryName)
   }
 
-  trait IssueTemplate extends BasicTemplate { self: Table[_] =>
+  trait IssueTemplate extends BasicTemplate { self: Table[?] =>
     val issueId = column[Int]("ISSUE_ID")
 
     def byIssue(owner: String, repository: String, issueId: Int) =
@@ -28,7 +28,7 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(userName, repositoryName) && (this.issueId === issueId)
   }
 
-  trait LabelTemplate extends BasicTemplate { self: Table[_] =>
+  trait LabelTemplate extends BasicTemplate { self: Table[?] =>
     val labelId = column[Int]("LABEL_ID")
     val labelName = column[String]("LABEL_NAME")
 
@@ -42,7 +42,7 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(owner, repository) && (this.labelName === labelName.bind)
   }
 
-  trait PriorityTemplate extends BasicTemplate { self: Table[_] =>
+  trait PriorityTemplate extends BasicTemplate { self: Table[?] =>
     val priorityId = column[Int]("PRIORITY_ID")
     val priorityName = column[String]("PRIORITY_NAME")
 
@@ -56,7 +56,7 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(owner, repository) && (this.priorityName === priorityName.bind)
   }
 
-  trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
+  trait MilestoneTemplate extends BasicTemplate { self: Table[?] =>
     val milestoneId = column[Int]("MILESTONE_ID")
 
     def byMilestone(owner: String, repository: String, milestoneId: Int) =
@@ -66,7 +66,7 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
   }
 
-  trait CommitTemplate extends BasicTemplate { self: Table[_] =>
+  trait CommitTemplate extends BasicTemplate { self: Table[?] =>
     val commitId = column[String]("COMMIT_ID")
 
     def byCommit(owner: String, repository: String, commitId: String) =
@@ -76,7 +76,7 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(userName, repositoryName) && (this.commitId === commitId)
   }
 
-  trait BranchTemplate extends BasicTemplate { self: Table[_] =>
+  trait BranchTemplate extends BasicTemplate { self: Table[?] =>
     val branch = column[String]("BRANCH")
     def byBranch(owner: String, repository: String, branchName: String) =
       byRepository(owner, repository) && (branch === branchName.bind)

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

@@ -8,7 +8,7 @@ trait CollaboratorComponent extends TemplateComponent { self: Profile =>
   class Collaborators(tag: Tag) extends Table[Collaborator](tag, "COLLABORATOR") with BasicTemplate {
     val collaboratorName = column[String]("COLLABORATOR_NAME")
     val role = column[String]("ROLE")
-    def * = (userName, repositoryName, collaboratorName, role).<>(Collaborator.tupled, Collaborator.unapply)
+    def * = (userName, repositoryName, collaboratorName, role).mapTo[Collaborator]
 
     def byPrimaryKey(owner: String, repository: String, collaborator: String) =
       byRepository(owner, repository) && (collaboratorName === collaborator.bind)

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

@@ -21,7 +21,7 @@ trait IssueCommentComponent extends TemplateComponent { self: Profile =>
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     def * =
       (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate)
-        .<>(IssueComment.tupled, IssueComment.unapply)
+        .mapTo[IssueComment]
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
@@ -75,7 +75,7 @@ trait CommitCommentComponent extends TemplateComponent { self: Profile =>
         originalCommitId,
         originalOldLine,
         originalNewLine
-      ).<>(CommitComment.tupled, CommitComment.unapply)
+      ).mapTo[CommitComment]
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }

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

@@ -30,7 +30,7 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
         creator,
         registeredDate,
         updatedDate
-      ).<>((CommitStatus.apply _).tupled, CommitStatus.unapply)
+      ).mapTo[CommitStatus]
     def byPrimaryKey(id: Int) = commitStatusId === id.bind
   }
 }

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

@@ -0,0 +1,377 @@
+package gitbucket.core.model
+
+import gitbucket.core.controller.Context
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.util.StringUtil
+import gitbucket.core.view.helpers
+import org.scalatra.i18n.Messages
+import play.twirl.api.Html
+
+trait CustomFieldComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  lazy val CustomFields = TableQuery[CustomFields]
+
+  class CustomFields(tag: Tag) extends Table[CustomField](tag, "CUSTOM_FIELD") with BasicTemplate {
+    val fieldId = column[Int]("FIELD_ID", O AutoInc)
+    val fieldName = column[String]("FIELD_NAME")
+    val fieldType = column[String]("FIELD_TYPE")
+    val constraints = column[Option[String]]("CONSTRAINTS")
+    val enableForIssues = column[Boolean]("ENABLE_FOR_ISSUES")
+    val enableForPullRequests = column[Boolean]("ENABLE_FOR_PULL_REQUESTS")
+    def * =
+      (userName, repositoryName, fieldId, fieldName, fieldType, constraints, enableForIssues, enableForPullRequests)
+        .mapTo[CustomField]
+
+    def byPrimaryKey(userName: String, repositoryName: String, fieldId: Int) =
+      (this.userName === userName.bind) && (this.repositoryName === repositoryName.bind) && (this.fieldId === fieldId.bind)
+  }
+}
+
+case class CustomField(
+  userName: String,
+  repositoryName: String,
+  fieldId: Int = 0,
+  fieldName: String,
+  fieldType: String, // long, double, string, date, or enum
+  constraints: Option[String],
+  enableForIssues: Boolean,
+  enableForPullRequests: Boolean
+)
+
+trait CustomFieldBehavior {
+  def createHtml(repository: RepositoryInfo, fieldId: Int, fieldName: String, constraints: Option[String])(implicit
+    context: Context
+  ): String
+  def fieldHtml(
+    repository: RepositoryInfo,
+    issueId: Int,
+    fieldId: Int,
+    fieldName: String,
+    constraints: Option[String],
+    value: String,
+    editable: Boolean
+  )(implicit
+    context: Context
+  ): String
+  def validate(name: String, constraints: Option[String], value: String, messages: Messages): Option[String]
+}
+
+object CustomFieldBehavior {
+  def validate(field: CustomField, value: String, messages: Messages): Option[String] = {
+    if (value.isEmpty) None
+    else {
+      CustomFieldBehavior(field.fieldType).flatMap { behavior =>
+        behavior.validate(field.fieldName, field.constraints, value, messages)
+      }
+    }
+  }
+
+  def apply(fieldType: String): Option[CustomFieldBehavior] = {
+    fieldType match {
+      case "long"   => Some(LongFieldBehavior)
+      case "double" => Some(DoubleFieldBehavior)
+      case "string" => Some(StringFieldBehavior)
+      case "date"   => Some(DateFieldBehavior)
+      case "enum"   => Some(EnumFieldBehavior)
+      case _        => None
+    }
+  }
+
+  case object LongFieldBehavior extends TextFieldBehavior {
+    override def validate(
+      name: String,
+      constraints: Option[String],
+      value: String,
+      messages: Messages
+    ): Option[String] = {
+      try {
+        value.toLong
+        None
+      } catch {
+        case _: NumberFormatException => Some(messages("error.number").format(name))
+      }
+    }
+  }
+  case object DoubleFieldBehavior extends TextFieldBehavior {
+    override def validate(
+      name: String,
+      constraints: Option[String],
+      value: String,
+      messages: Messages
+    ): Option[String] = {
+      try {
+        value.toDouble
+        None
+      } catch {
+        case _: NumberFormatException => Some(messages("error.number").format(name))
+      }
+    }
+  }
+  case object StringFieldBehavior extends TextFieldBehavior
+  case object DateFieldBehavior extends TextFieldBehavior {
+    private val pattern = "yyyy-MM-dd"
+    override protected val fieldType: String = "date"
+
+    override def validate(
+      name: String,
+      constraints: Option[String],
+      value: String,
+      messages: Messages
+    ): Option[String] = {
+      try {
+        new java.text.SimpleDateFormat(pattern).parse(value)
+        None
+      } catch {
+        case _: java.text.ParseException =>
+          Some(messages("error.datePattern").format(name, pattern))
+      }
+    }
+  }
+
+  case object EnumFieldBehavior extends CustomFieldBehavior {
+    override def createHtml(repository: RepositoryInfo, fieldId: Int, fieldName: String, constraints: Option[String])(
+      implicit context: Context
+    ): String = {
+      createPulldownHtml(repository, fieldId, fieldName, constraints, None, None)
+    }
+
+    override def fieldHtml(
+      repository: RepositoryInfo,
+      issueId: Int,
+      fieldId: Int,
+      fieldName: String,
+      constraints: Option[String],
+      value: String,
+      editable: Boolean
+    )(implicit context: Context): String = {
+      if (!editable) {
+        val sb = new StringBuilder
+        sb.append("""</div>""")
+        sb.append("""<div>""")
+        if (value == "") {
+          sb.append(s"""<span id="label-custom-field-$fieldId"><span class="muted small">No ${StringUtil.escapeHtml(
+              fieldName
+            )}</span></span>""")
+        } else {
+          sb.append(s"""<span id="label-custom-field-$fieldId"><span class="muted small">${StringUtil
+              .escapeHtml(value)}</span></span>""")
+        }
+        sb.toString()
+      } else {
+        createPulldownHtml(repository, fieldId, fieldName, constraints, Some(issueId), Some(value))
+      }
+    }
+
+    private def createPulldownHtml(
+      repository: RepositoryInfo,
+      fieldId: Int,
+      fieldName: String,
+      constraints: Option[String],
+      issueId: Option[Int],
+      value: Option[String]
+    )(implicit context: Context): String = {
+      val sb = new StringBuilder
+      sb.append("""<div class="pull-right">""")
+      sb.append(
+        gitbucket.core.helper.html
+          .dropdown("Edit", right = true, filter = (fieldName, s"Filter $fieldName")) {
+            val options = new StringBuilder()
+            options.append(
+              s"""<li><a href="javascript:void(0);" class="custom-field-option-$fieldId" data-value=""><i class="octicon octicon-x"></i> Clear ${StringUtil
+                  .escapeHtml(fieldName)}</a></li>"""
+            )
+            constraints.foreach { x =>
+              x.split(",").map(_.trim).foreach { item =>
+                options.append(s"""<li>
+                 |  <a href="javascript:void(0);" class="custom-field-option-$fieldId" data-value="${StringUtil
+                                   .escapeHtml(item)}">
+                 |    ${gitbucket.core.helper.html.checkicon(value.contains(item))}
+                 |    ${StringUtil.escapeHtml(item)}
+                 |  </a>
+                 |</li>
+                 |""".stripMargin)
+              }
+            }
+            Html(options.toString())
+          }
+          .toString()
+      )
+      sb.append("""</div>""")
+      sb.append("""</div>""")
+      sb.append("""<div>""")
+      value match {
+        case None =>
+          sb.append(s"""<span id="label-custom-field-$fieldId"><span class="muted small">No ${StringUtil.escapeHtml(
+              fieldName
+            )}</span></span>""")
+        case Some(value) =>
+          sb.append(s"""<span id="label-custom-field-$fieldId"><span class="muted small">${StringUtil
+              .escapeHtml(value)}</span></span>""")
+      }
+      if (value.isEmpty || issueId.isEmpty) {
+        sb.append(s"""<input type="hidden" id="custom-field-$fieldId" name="custom-field-$fieldId" value=""/>""")
+        sb.append(s"""<script>
+             |$$('a.custom-field-option-$fieldId').click(function(){
+             |  const value = $$(this).data('value');
+             |  $$('a.custom-field-option-$fieldId i.octicon-check').removeClass('octicon-check');
+             |  $$('#custom-field-$fieldId').val(value);
+             |  if (value == '') {
+             |    $$('#label-custom-field-$fieldId').html($$('<span class="muted small">').text('No ${StringUtil
+                      .escapeHtml(fieldName)}'));
+             |  } else {
+             |    $$('#label-custom-field-$fieldId').html($$('<span class="muted small">').text(value));
+             |    $$('a.custom-field-option-$fieldId[data-value=' + value + '] i').addClass('octicon-check');
+             |  }
+             |});
+             |</script>""".stripMargin)
+      } else {
+        sb.append(s"""<script>
+             |$$('a.custom-field-option-$fieldId').click(function(){
+             |  const value = $$(this).data('value');
+             |  $$.post('${helpers.url(repository)}/issues/${issueId.get}/customfield/$fieldId',
+             |    { value: value },
+             |    function(data){
+             |      $$('a.custom-field-option-$fieldId i.octicon-check').removeClass('octicon-check');
+             |      if (value == '') {
+             |        $$('#label-custom-field-$fieldId').html($$('<span class="muted small">').text('No ${StringUtil
+                      .escapeHtml(fieldName)}'));
+             |      } else {
+             |        $$('#label-custom-field-$fieldId').html($$('<span class="muted small">').text(value));
+             |        $$('a.custom-field-option-$fieldId[data-value=' + value + '] i').addClass('octicon-check');
+             |      }
+             |    }
+             |  );
+             |});
+             |</script>
+             |""".stripMargin)
+      }
+      sb.toString()
+    }
+
+    override def validate(
+      name: String,
+      constraints: Option[String],
+      value: String,
+      messages: Messages
+    ): Option[String] = None
+  }
+
+  trait TextFieldBehavior extends CustomFieldBehavior {
+    protected val fieldType = "text"
+
+    override def createHtml(repository: RepositoryInfo, fieldId: Int, fieldName: String, constraints: Option[String])(
+      implicit context: Context
+    ): String = {
+      val sb = new StringBuilder
+      sb.append(
+        s"""<input type="$fieldType" class="form-control input-sm" id="custom-field-$fieldId" name="custom-field-$fieldId" data-field-id="$fieldId" style="width: 120px;"/>"""
+      )
+      sb.append(s"""<script>
+                   |$$('#custom-field-$fieldId').focusout(function(){
+                   |  const $$this = $$(this);
+                   |  $$.post('${helpers.url(repository)}/issues/customfield_validation/$fieldId',
+                   |    { value: $$this.val() },
+                   |    function(data){
+                   |      if (data != '') {
+                   |        $$('#custom-field-$fieldId-error').text(data);
+                   |      } else {
+                   |        $$('#custom-field-$fieldId-error').text('');
+                   |      }
+                   |    }
+                   |  );
+                   |});
+                   |</script>
+                   |""".stripMargin)
+      sb.toString()
+    }
+
+    override def fieldHtml(
+      repository: RepositoryInfo,
+      issueId: Int,
+      fieldId: Int,
+      fieldName: String,
+      constraints: Option[String],
+      value: String,
+      editable: Boolean
+    )(implicit
+      context: Context
+    ): String = {
+      val sb = new StringBuilder
+      if (value.nonEmpty) {
+        sb.append(
+          s"""<span id="custom-field-$fieldId-label" class="custom-field-label">${StringUtil
+              .escapeHtml(value)}</span>"""
+        )
+      } else {
+        if (editable) {
+          sb.append(
+            s"""<span id="custom-field-$fieldId-label" class="custom-field-label"><i class="octicon octicon-pencil" style="cursor: pointer;"></i></span>"""
+          )
+        } else {
+          sb.append(
+            s"""<span id="custom-field-$fieldId-label" class="custom-field-label">N/A</span>"""
+          )
+        }
+      }
+      if (editable) {
+        sb.append(
+          s"""<input type="$fieldType" id="custom-field-$fieldId-editor" class="form-control input-sm custom-field-editor" data-field-id="$fieldId" style="width: 120px; display: none;"/>"""
+        )
+        sb.append(s"""<script>
+            |$$('#custom-field-$fieldId-label').click(function(){
+            |  const $$this = $$(this);
+            |  $$this.hide();
+            |  $$this.next().val($$this.text()).show().focus();
+            |});
+            |
+            |$$('#custom-field-$fieldId-editor').focusout(function(){
+            |  const $$this = $$(this);
+            |  $$.post('${helpers.url(repository)}/issues/customfield_validation/$fieldId',
+            |    { value: $$this.val() },
+            |    function(data){
+            |      if (data != '') {
+            |        $$('#custom-field-$fieldId-error').text(data);
+            |      } else {
+            |        $$('#custom-field-$fieldId-error').text('');
+            |        $$.post('${helpers.url(repository)}/issues/$issueId/customfield/$fieldId',
+            |          { value: $$this.val() },
+            |          function(data){
+            |            $$this.hide();
+            |            if (data == '') {
+            |              $$this.prev().html('<i class="octicon octicon-pencil" style="cursor: pointer;">').show();
+            |            } else {
+            |              $$this.prev().text(data).show();
+            |            }
+            |          }
+            |        );
+            |      }
+            |    }
+            |  );
+            |});
+            |
+            |// ESC key handling in text field
+            |$$('#custom-field-$fieldId-editor').keyup(function(e){
+            |  if (e.keyCode == 27) {
+            |    const $$this = $$(this);
+            |    $$this.hide();
+            |    $$this.prev().show();
+            |  }
+            |  if (e.keyCode == 13) {
+            |    $$('#custom-field-$fieldId-editor').blur();
+            |  }
+            |});
+            |</script>
+            |""".stripMargin)
+      }
+      sb.toString()
+    }
+
+    override def validate(
+      name: String,
+      constraints: Option[String],
+      value: String,
+      messages: Messages
+    ): Option[String] = None
+  }
+}

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

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

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

@@ -11,7 +11,7 @@ trait GpgKeyComponent { self: Profile =>
     val gpgKeyId = column[Long]("GPG_KEY_ID")
     val title = column[String]("TITLE")
     val publicKey = column[String]("PUBLIC_KEY")
-    def * = (userName, keyId, gpgKeyId, title, publicKey).<>(GpgKey.tupled, GpgKey.unapply)
+    def * = (userName, keyId, gpgKeyId, title, publicKey).mapTo[GpgKey]
 
     def byPrimaryKey(userName: String, keyId: Int) =
       (this.userName === userName.bind) && (this.keyId === keyId.bind)

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

@@ -9,7 +9,7 @@ trait GroupMemberComponent { self: Profile =>
     val groupName = column[String]("GROUP_NAME", O PrimaryKey)
     val userName = column[String]("USER_NAME", O PrimaryKey)
     val isManager = column[Boolean]("MANAGER")
-    def * = (groupName, userName, isManager).<>(GroupMember.tupled, GroupMember.unapply)
+    def * = (groupName, userName, isManager).mapTo[GroupMember]
   }
 }