Update README and CHANGELOG for 4.45.0

* Use attr() instead of data() to prevent parsing of json

A fix for issue #2503 
Valid JSON text will be converted to a JSON object, not text , when using .data(). using .attr() prevents this behavior.

* Update gitbucket.js

Use different methods to get old and head values depending on the object type

.editorconfig

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

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,8 @@
 ### Before submitting an issue to GitBucket I have first:
 
-- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
-- [] searched for similar already existing issue
-- [] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki) 
+- [ ] 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)*
 

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

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

.github/workflows/build.yml

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

.gitignore

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

.scalafmt.conf

@@ -1,3 +1,4 @@
+version = "1.5.1"
 project.git = true
 
 maxColumn = 120

.travis.yml

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

CHANGELOG.md

@@ -1,20 +1,59 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-### 4.31.2 - 7 Apr 2019
+### 4.35.0 - 25 Dec 2020
+- Editor and source viewer color theme
+- Auto completion for issues and pull requests
+- Upload image from clipboard
+- Close multiple issues by commit comment
+- Create pull request from online editor
+- Milestone overview
+- Commit status at various places
+- WebAPI coverage improvements
+
+## 4.34.0 - 26 Jul 2020
+- Enhancement admin settings UI
+   - File upload settings
+   - Restrict repository operations
+   - User-defined CSS
+   - Limit the repository list in the sidebar
+- Improve MariaDB support
+- Improve activity logging
+- CLI option to persist session on disk in the standalone mode
+- Web API updates
+  - Add [list commits API](https://developer.github.com/v3/repos/commits/#list-commits)
+- Bundled plugins updates
+  - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin) 4.18.0 -> 4.19.0
+  - [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin) 1.8.0 -> 1.9.0
+
+## 4.33.0 - 31 Dec 2019
+- All CLI options are configurable by environment variables
+- Folding pull request files
+- WebHook security options
+- Add assignee and assignees properties to some Web APIs' response
+
+## 4.32.0 - 7 Aug 2019
+- Bump to Scala 2.13.0 and Scalatra 2.7.0
+- Draft pull request
+- Drop network installation of plugins
+- Compare view works for commit id
+- Apply default priority to pull requests
+- Focus title after clicking issue / pull request edit button
+
+## 4.31.2 - 7 Apr 2019
 - Bug and security fix
 
-### 4.31.1 - 17 Mar 2019
+## 4.31.1 - 17 Mar 2019
 - Bug fix
 
-### 4.31.0 - 17 Mar 2019
+## 4.31.0 - 17 Mar 2019
 - Docker support in CI plugin
 - Verify GPG key signed commit
 - OAuth2 Token (sent as a parameter) authentication support and new APIs in Web API
 - OGP (Open Graph protocol) support
 - Username completion with avatars
 
-### 4.30.1 - 22 Dec 2018
+## 4.30.1 - 22 Dec 2018
 - Bug fix for several WebHooks and Web API
 
 ## 4.30.0 - 15 Dec 2018
@@ -101,7 +140,7 @@ All changes to the project will be documented in this file.
 - Submodule links to web page
 - Clarify close/reopen button
 
-# 4.20.0 - 23 Dec 2017
+## 4.20.0 - 23 Dec 2017
 - Squash and rebase merge strategy for pull requests
 - Quick pull request creation
 - Download patch from the diff view

README.md

@@ -1,4 +1,4 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
+GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket/actions?query=workflow%3Abuild+branch%3Amaster) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
 =========
 
 GitBucket is a Git web platform powered by Scala offering:
@@ -22,7 +22,7 @@ The current version of GitBucket provides many features such as:
 - Account and group management with LDAP integration
 - a Plug-in system
 
-If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
+If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/readme.md).
 
 Installation
 --------
@@ -31,19 +31,6 @@ GitBucket requires **Java8**. You have to install it, if it is not already insta
 1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
 2. Go to `http://[hostname]:8080/` and log in with ID: **root** / Pass: **root**.
 
-You can specify following options:
-
-- `--port=[NUMBER]`
-- `--prefix=[CONTEXTPATH]`
-- `--host=[HOSTNAME]`
-- `--gitbucket.home=[DATA_DIR]`
-- `--temp_dir=[TEMP_DIR]`
-- `--max_file_size=[MAX_FILE_SIZE]`
-
-`TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home.
-
-`MAX_FILE_SIZE` is the max file size for upload files.
-
 You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
 
 For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
@@ -68,19 +55,17 @@ Support
 - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
 
-What's New in 4.31.x
+What's New in 4.34.x
 -------------
-### 4.31.2 - 7 Apr 2019
-- Bug and security fix
+### 4.35.0 - 25 Dec 2020
 
-### 4.31.1 - 17 Mar 2019
-- Bug fix
-
-### 4.31.0 - 17 Mar 2019
-- Docker support in CI plugin
-- Verify GPG key signed commit
-- OAuth2 Token (sent as a parameter) authentication support and new APIs in Web API
-- OGP (Open Graph protocol) support
-- Username completion with avatars
+- Editor and source viewer color theme
+- Auto completion for issues and pull requests
+- Upload image from clipboard
+- Close multiple issues by commit comment
+- Create pull request from online editor
+- Milestone overview
+- Commit status at various places
+- WebAPI coverage improvements
 
 See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -3,10 +3,10 @@ import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.31.2"
-val ScalatraVersion = "2.6.3"
-val JettyVersion = "9.4.14.v20181114"
-val JgitVersion = "5.2.0.201812061821-r"
+val GitBucketVersion = "4.35.0"
+val ScalatraVersion = "2.7.0"
+val JettyVersion = "9.4.32.v20200930"
+val JgitVersion = "5.9.0.202009080501-r"
 
 lazy val root = (project in file("."))
   .enablePlugins(SbtTwirl, ScalatraPlugin)
@@ -17,7 +17,7 @@ sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 scalafmtOnCompile := true
 
@@ -27,9 +27,7 @@ coverageExcludedPackages := ".*\\.html\\..*"
 resolvers ++= Seq(
   Classpaths.typesafeReleases,
   Resolver.jcenterRepo,
-  "amateras" at "http://amateras.sourceforge.jp/mvn/",
-  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/",
-  "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
+  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
 )
 
 libraryDependencies ++= Seq(
@@ -38,46 +36,46 @@ libraryDependencies ++= Seq(
   "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"              % "3.5.2",
-  "commons-io"                      % "commons-io"                   % "2.6",
+  "org.json4s"                      %% "json4s-jackson"              % "3.6.10",
+  "commons-io"                      % "commons-io"                   % "2.8.0",
   "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
   "io.github.gitbucket"             % "markedj"                      % "1.0.16",
-  "org.apache.commons"              % "commons-compress"             % "1.18",
+  "org.apache.commons"              % "commons-compress"             % "1.20",
   "org.apache.commons"              % "commons-email"                % "1.5",
-  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.6",
+  "commons-net"                     % "commons-net"                  % "3.7",
+  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.12",
   "org.apache.sshd"                 % "apache-sshd"                  % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
-  "org.apache.tika"                 % "tika-core"                    % "1.19.1",
-  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.11",
+  "org.apache.tika"                 % "tika-core"                    % "1.24.1",
+  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12",
   "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
-  "com.h2database"                  % "h2"                           % "1.4.197",
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.3.0",
-  "org.postgresql"                  % "postgresql"                   % "42.2.5",
+  "com.h2database"                  % "h2"                           % "1.4.199",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.0",
+  "org.postgresql"                  % "postgresql"                   % "42.2.6",
   "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      % "HikariCP"                     % "3.2.0",
-  "com.typesafe"                    % "config"                       % "1.3.3",
-  "com.typesafe.akka"               %% "akka-actor"                  % "2.5.18",
+  "com.zaxxer"                      % "HikariCP"                     % "3.4.5",
+  "com.typesafe"                    % "config"                       % "1.4.0",
   "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
   "com.github.bkromhout"            % "java-diff-utils"              % "2.1.1",
-  "org.cache2k"                     % "cache2k-all"                  % "1.2.0.Final",
-  "com.enragedginger"               %% "akka-quartz-scheduler"       % "1.7.0-akka-2.5.x" exclude ("c3p0", "c3p0") exclude ("com.zaxxer", "HikariCP-java6"),
-  "net.coobird"                     % "thumbnailator"                % "0.4.8",
+  "org.cache2k"                     % "cache2k-all"                  % "1.2.4.Final",
+  "net.coobird"                     % "thumbnailator"                % "0.4.12",
   "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
   "com.nimbusds"                    % "oauth2-oidc-sdk"              % "5.64.4",
   "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
   "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
-  "junit"                           % "junit"                        % "4.12" % "test",
+  "junit"                           % "junit"                        % "4.13" % "test",
   "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test",
-  "org.mockito"                     % "mockito-core"                 % "2.23.4" % "test",
-  "com.dimafeng"                    %% "testcontainers-scala"        % "0.22.0" % "test",
-  "org.testcontainers"              % "mysql"                        % "1.10.3" % "test",
-  "org.testcontainers"              % "postgresql"                   % "1.10.3" % "test",
+  "org.mockito"                     % "mockito-core"                 % "3.3.3" % "test",
+  "com.dimafeng"                    %% "testcontainers-scala"        % "0.37.0" % "test",
+  "org.testcontainers"              % "mysql"                        % "1.14.3" % "test",
+  "org.testcontainers"              % "postgresql"                   % "1.14.3" % "test",
   "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
-  "is.tagomor.woothee"              % "woothee-java"                 % "1.8.0",
-  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.3"
+  "is.tagomor.woothee"              % "woothee-java"                 % "1.11.0",
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.3",
+  "org.kohsuke"                     % "github-api"                   % "1.116" % "test"
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method", "-Xfuture")
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 
@@ -123,6 +121,12 @@ libraryDependencies ++= Seq(
   "org.eclipse.jetty" % "jetty-util"         % JettyVersion % "executable"
 )
 
+// Run package task before test to generate target/webapp for integration test
+test in Test := {
+  _root_.sbt.Keys.`package`.value
+  (test in Test).value
+}
+
 val executableKey = TaskKey[File]("executable")
 executableKey := {
   import java.util.jar.Attributes.{Name => AttrName}
@@ -165,8 +169,8 @@ executableKey := {
   plugins.foreach { plugin =>
     plugin.trim.split(":") match {
       case Array(pluginId, pluginVersion) =>
-        val url = "https://plugins.gitbucket-community.org/releases/" +
-          s"gitbucket-${pluginId}-plugin/gitbucket-${pluginId}-plugin-gitbucket_${version.value}-${pluginVersion}.jar"
+        val url = "https://github.com/" +
+          s"gitbucket/gitbucket-${pluginId}-plugin/releases/download/${pluginVersion}/gitbucket-${pluginId}-plugin-${pluginVersion}.jar"
         log info s"Download: ${url}"
         IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
       case _ => ()
@@ -258,3 +262,17 @@ licenseOverrides := {
   case DepModuleInfo("com.github.bkromhout", "java-diff-utils", _) =>
     LicenseInfo(LicenseCategory.Apache, "Apache-2.0", "http://www.apache.org/licenses/LICENSE-2.0")
 }
+
+testOptions in Test ++= {
+  if (scala.util.Properties.isWin) {
+    Seq(
+      Tests.Exclude(
+        Set(
+          "gitbucket.core.GitBucketCoreModuleSpec"
+        )
+      )
+    )
+  } else {
+    Nil
+  }
+}

doc/build.md

@@ -29,7 +29,7 @@ To build war file, run the following command:
 $ sbt package
 ```
 
-`gitbucket_2.12-x.x.x.war` is generated into `target/scala-2.12`.
+`gitbucket_2.13-x.x.x.war` is generated into `target/scala-2.13`.
 
 To build an executable war file, run
 
@@ -58,4 +58,4 @@ If you don't have docker, you can skip docker tests which require docker as foll
 
 ```shell
 $ sbt "testOnly * -- -l ExternalDBTest"
-```
+```

project/build.properties

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

project/plugins.sbt

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

project/project/plugins.sbt

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

src/main/java/JettyLauncher.java

@@ -4,6 +4,10 @@ import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
+import org.eclipse.jetty.server.session.DefaultSessionCache;
+import org.eclipse.jetty.server.session.FileSessionDataStore;
+import org.eclipse.jetty.server.session.SessionCache;
+import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
@@ -16,13 +20,22 @@ public class JettyLauncher {
         System.setProperty("java.awt.headless", "true");
 
         String host = null;
-        int port = 8080;
+        String port = null;
         InetSocketAddress address = null;
         String contextPath = "/";
         String tmpDirPath="";
         boolean forceHttps = false;
+        boolean saveSessions = false;
+
+        host = getEnvironmentVariable("gitbucket.host");
+        port = getEnvironmentVariable("gitbucket.port");
+        contextPath = getEnvironmentVariable("gitbucket.prefix");
+        tmpDirPath = getEnvironmentVariable("gitbucket.tempDir");
 
         for(String arg: args) {
+            if(arg.equals("--save_sessions")) {
+                saveSessions = true;
+            }
             if(arg.startsWith("--") && arg.contains("=")) {
                 String[] dim = arg.split("=");
                 if(dim.length >= 2) {
@@ -31,16 +44,10 @@ public class JettyLauncher {
                             host = dim[1];
                             break;
                         case "--port":
-                            port = Integer.parseInt(dim[1]);
+                            port = dim[1];
                             break;
                         case "--prefix":
                             contextPath = dim[1];
-                            if (!contextPath.startsWith("/")) {
-                                contextPath = "/" + contextPath;
-                            }
-                            break;
-                        case "--max_file_size":
-                            System.setProperty("gitbucket.maxFileSize", dim[1]);
                             break;
                         case "--gitbucket.home":
                             System.setProperty("gitbucket.home", dim[1]);
@@ -51,18 +58,19 @@ public class JettyLauncher {
                         case "--plugin_dir":
                             System.setProperty("gitbucket.pluginDir", dim[1]);
                             break;
-                        case "--validate_password":
-                            System.setProperty("gitbucket.validate.password", dim[1]);
-                            break;
                     }
                 }
             }
         }
 
+        if (contextPath != null && !contextPath.startsWith("/")) {
+            contextPath = "/" + contextPath;
+        }
+
         if(host != null) {
-            address = new InetSocketAddress(host, port);
+            address = new InetSocketAddress(host, getPort(port));
         } else {
-            address = new InetSocketAddress(port);
+            address = new InetSocketAddress(getPort(port));
         }
 
         Server server = new Server(address);
@@ -87,8 +95,21 @@ public class JettyLauncher {
 
         WebAppContext context = new WebAppContext();
 
+        if(saveSessions) {
+            File sessDir = new File(getGitBucketHome(), "sessions");
+            if(!sessDir.exists()){
+                sessDir.mkdirs();
+            }
+            SessionHandler sessions = context.getSessionHandler();
+            SessionCache cache = new DefaultSessionCache(sessions);
+            FileSessionDataStore fsds = new FileSessionDataStore();
+            fsds.setStoreDir(sessDir);
+            cache.setSessionDataStore(fsds);
+            sessions.setSessionCache(cache);
+        }
+
         File tmpDir;
-        if(tmpDirPath.equals("")){
+        if(tmpDirPath == null || tmpDirPath.equals("")){
             tmpDir = new File(getGitBucketHome(), "tmp");
             if(!tmpDir.exists()){
                 tmpDir.mkdirs();
@@ -111,7 +132,7 @@ public class JettyLauncher {
         ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
         URL location = domain.getCodeSource().getLocation();
 
-        context.setContextPath(contextPath);
+        context.setContextPath(contextPath == null ? "" : contextPath);
         context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
         context.setServer(server);
         context.setWar(location.toExternalForm());
@@ -140,6 +161,23 @@ public class JettyLauncher {
         return new File(System.getProperty("user.home"), ".gitbucket");
     }
 
+    private static String getEnvironmentVariable(String key){
+        String value =  System.getenv(key.toUpperCase().replace('.', '_'));
+        if (value != null && value.length() == 0){
+            return null;
+        } else {
+            return value;
+        }
+    }
+
+    private static int getPort(String port){
+        if(port == null) {
+            return 8080;
+        } else {
+            return Integer.parseInt(port);
+        }
+    }
+
     private static Handler addStatisticsHandler(Handler handler) {
         // The graceful shutdown is implemented via the statistics handler.
         // See the following: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420142

src/main/resources/bundle-plugins.txt

@@ -1 +1,4 @@
-notifications:1.7.0
+notifications:1.9.0
+gist:4.20.0
+emoji:4.6.0
+pages:1.9.0

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

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

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

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

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

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

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT"/>
+  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK"/>
+  <dropPrimaryKey tableName="WEB_HOOK" constraintName="IDX_WEB_HOOK_PK"/>
+  <addColumn tableName="WEB_HOOK">
+    <column name="HOOK_ID" type="int" nullable="false" unique="true"/>
+  </addColumn>
+  <addPrimaryKey constraintName="IDX_WEB_HOOK_PK" tableName="WEB_HOOK" columnNames="USER_NAME, REPOSITORY_NAME, URL, HOOK_ID"/>
+  <addUniqueConstraint constraintName="IDX_WEB_HOOK_1" tableName="WEB_HOOK" columnNames="USER_NAME, REPOSITORY_NAME, URL"/>
+  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, URL" referencedTableName="WEB_HOOK" referencedColumnNames="USER_NAME, REPOSITORY_NAME, URL" onDelete="CASCADE" onUpdate="CASCADE"/>
+  <addAutoIncrement columnName="HOOK_ID" columnDataType="int" tableName="WEB_HOOK"/>
+
+  <createTable tableName="ACCOUNT_PREFERENCE">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="HIGHLIGHTER_THEME" type="varchar(100)" nullable="false" defaultValue="prettify"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_ACCOUNT_PREFERENCE_PK" tableName="ACCOUNT_PREFERENCE" columnNames="USER_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_PREFERENCE_FK0" baseTableName="ACCOUNT_PREFERENCE" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
+</changeSet>

src/main/scala/ScalatraBootstrap.scala

@@ -16,7 +16,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
       context.getSessionCookieConfig.setSecure(true)
     }
 
-    // Register TransactionFilter and BasicAuthenticationFilter at first
+    // Register TransactionFilter at first
     context.addFilter("transactionFilter", new TransactionFilter)
     context
       .getFilterRegistration("transactionFilter")

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

@@ -1,7 +1,22 @@
 package gitbucket.core
 
-import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
-import io.github.gitbucket.solidbase.model.{Version, Module}
+import java.io.FileOutputStream
+import java.nio.charset.StandardCharsets
+import java.sql.Connection
+import java.util
+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.model.{Module, Version}
+import org.json4s.NoTypeHints
+import org.json4s.jackson.Serialization
+import org.json4s.jackson.Serialization.write
+
+import scala.util.Using
 
 object GitBucketCoreModule
     extends Module(
@@ -63,5 +78,41 @@ object GitBucketCoreModule
       new Version("4.30.1"),
       new Version("4.31.0", new LiquibaseMigration("update/gitbucket-core_4.31.xml")),
       new Version("4.31.1"),
-      new Version("4.31.2")
+      new Version("4.31.2"),
+      new Version("4.32.0", new LiquibaseMigration("update/gitbucket-core_4.32.xml")),
+      new Version("4.33.0"),
+      new Version(
+        "4.34.0",
+        new Migration() {
+          override def migrate(moduleId: String, version: String, context: util.Map[String, AnyRef]): Unit = {
+            implicit val formats = Serialization.formats(NoTypeHints)
+            import JDBCUtil._
+
+            val conn = context.get(Solidbase.CONNECTION).asInstanceOf[Connection]
+            val list = conn.select("SELECT * FROM ACTIVITY ORDER BY ACTIVITY_ID") {
+              rs =>
+                Activity(
+                  activityId = UUID.randomUUID().toString,
+                  userName = rs.getString("USER_NAME"),
+                  repositoryName = rs.getString("REPOSITORY_NAME"),
+                  activityUserName = rs.getString("ACTIVITY_USER_NAME"),
+                  activityType = rs.getString("ACTIVITY_TYPE"),
+                  message = rs.getString("MESSAGE"),
+                  additionalInfo = {
+                    val additionalInfo = rs.getString("ADDITIONAL_INFO")
+                    if (rs.wasNull()) None else Some(additionalInfo)
+                  },
+                  activityDate = rs.getTimestamp("ACTIVITY_DATE")
+                )
+            }
+            Using.resource(new FileOutputStream(ActivityLog, true)) { out =>
+              list.foreach { activity =>
+                out.write((write(activity) + "\n").getBytes(StandardCharsets.UTF_8))
+              }
+            }
+          }
+        },
+        new LiquibaseMigration("update/gitbucket-core_4.34.xml")
+      ),
+      new Version("4.35.0", new LiquibaseMigration("update/gitbucket-core_4.35.xml")),
     )

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

@@ -22,3 +22,12 @@ case class ApiBranchForList(
   name: String,
   commit: ApiBranchCommit
 )
+
+/**
+ * https://docs.github.com/en/rest/reference/repos#list-branches-for-head-commit
+ */
+case class ApiBranchForHeadCommit(
+  name: String,
+  commit: ApiBranchCommit,
+  `protected`: Boolean
+)

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

@@ -4,7 +4,11 @@ import gitbucket.core.service.ProtectedBranchService
 import org.json4s._
 
 /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]) {
+case class ApiBranchProtection(
+  url: Option[ApiPath], // for output
+  enabled: Boolean,
+  required_status_checks: Option[ApiBranchProtection.Status]
+) {
   def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
 }
 
@@ -15,13 +19,36 @@ object ApiBranchProtection {
 
   def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection =
     ApiBranchProtection(
+      url = Some(
+        ApiPath(
+          s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection"
+        )
+      ),
       enabled = info.enabled,
       required_status_checks = Some(
-        Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.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),
+          info.contexts,
+          Some(
+            ApiPath(
+              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks/contexts"
+            )
+          )
+        )
       )
     )
-  val statusNone = Status(Off, Seq.empty)
-  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
+  val statusNone = Status(None, Off, Seq.empty, None)
+  case class Status(
+    url: Option[ApiPath], // for output
+    enforcement_level: EnforcementLevel,
+    contexts: Seq[String],
+    contexts_url: Option[ApiPath] // for output
+  )
   sealed class EnforcementLevel(val name: String)
   case object Off extends EnforcementLevel("off")
   case object NonAdmins extends EnforcementLevel("non_admins")

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

@@ -12,6 +12,7 @@ case class ApiIssue(
   number: Int,
   title: String,
   user: ApiUser,
+  assignee: Option[ApiUser],
   labels: List[ApiLabel],
   state: String,
   created_at: Date,
@@ -19,6 +20,7 @@ case class ApiIssue(
   body: String
 )(repositoryName: RepositoryName, isPullRequest: Boolean) {
   val id = 0 // dummy id
+  val assignees = List(assignee).flatten
   val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
   val html_url = ApiPath(s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${number}")
   val pull_request = if (isPullRequest) {
@@ -36,11 +38,18 @@ case class ApiIssue(
 }
 
 object ApiIssue {
-  def apply(issue: Issue, repositoryName: RepositoryName, user: ApiUser, labels: List[ApiLabel]): ApiIssue =
+  def apply(
+    issue: Issue,
+    repositoryName: RepositoryName,
+    user: ApiUser,
+    assignee: Option[ApiUser],
+    labels: List[ApiLabel]
+  ): ApiIssue =
     ApiIssue(
       number = issue.issueId,
       title = issue.title,
       user = user,
+      assignee = assignee,
       labels = labels,
       state = if (issue.closed) { "closed" } else { "open" },
       body = issue.content.getOrElse(""),

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

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

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

@@ -21,7 +21,8 @@ case class ApiPullRequest(
   body: String,
   user: ApiUser,
   labels: List[ApiLabel],
-  assignee: Option[ApiUser]
+  assignee: Option[ApiUser],
+  draft: Option[Boolean]
 ) {
   val id = 0 // dummy id
   val html_url = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
@@ -62,7 +63,8 @@ object ApiPullRequest {
       body = issue.content.getOrElse(""),
       user = user,
       labels = labels,
-      assignee = assignee
+      assignee = assignee,
+      draft = Some(pullRequest.isDraft)
     )
 
   case class Commit(sha: String, ref: String, repo: ApiRepository)(baseOwner: String) {

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

@@ -6,7 +6,7 @@ case class ApiReleaseAsset(name: String, size: Long)(tag: String, fileName: Stri
   val label = name
   val file_id = fileName
   val browser_download_url = ApiPath(
-    s"/api/v3/repos/${repositoryName.fullName}/releases/${tag}/assets/${fileName}"
+    s"/${repositoryName.fullName}/releases/${tag}/assets/${fileName}"
   )
 }
 

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

@@ -12,13 +12,13 @@ case class ApiRepository(
   forks: Int,
   `private`: Boolean,
   default_branch: String,
-  owner: ApiUser
+  owner: ApiUser,
+  has_issues: Boolean
 ) {
   val id = 0 // dummy id
   val forks_count = forks
   val watchers_count = watchers
   val url = ApiPath(s"/api/v3/repos/${full_name}")
-  val http_url = ApiPath(s"/git/${full_name}.git")
   val clone_url = ApiPath(s"/git/${full_name}.git")
   val html_url = ApiPath(s"/${full_name}")
   val ssh_url = Some(SshPath(s":${full_name}.git"))
@@ -39,11 +39,16 @@ object ApiRepository {
       forks = forkedCount,
       `private` = repository.isPrivate,
       default_branch = repository.defaultBranch,
-      owner = owner
+      owner = owner,
+      has_issues = if (repository.options.issuesOption == "DISABLE") false else true
     )
 
   def apply(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(repositoryInfo.repository, owner, forkedCount = repositoryInfo.forkedCount)
+    ApiRepository(
+      repositoryInfo.repository,
+      owner,
+      forkedCount = repositoryInfo.forkedCount
+    )
 
   def apply(repositoryInfo: RepositoryInfo, owner: Account): ApiRepository =
     this(repositoryInfo, ApiUser(owner))
@@ -57,6 +62,7 @@ object ApiRepository {
       forks = 0,
       `private` = false,
       default_branch = "master",
-      owner = owner
+      owner = owner,
+      has_issues = true
     )
 }

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,8 @@ case class CreateAPullRequest(
   head: String,
   base: String,
   body: Option[String],
-  maintainer_can_modify: Option[Boolean]
+  maintainer_can_modify: Option[Boolean],
+  draft: Option[Boolean]
 )
 
 case class CreateAPullRequestAlt(
@@ -14,3 +15,11 @@ case class CreateAPullRequestAlt(
   base: String,
   maintainer_can_modify: Option[Boolean]
 )
+
+case class UpdateAPullRequest(
+  title: Option[String],
+  body: Option[String],
+  state: Option[String],
+  base: Option[String],
+  maintainer_can_modify: Option[Boolean],
+)

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,6 @@ import java.io.File
 import gitbucket.core.account.html
 import gitbucket.core.helper
 import gitbucket.core.model._
-import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.ssh.SshUtil
@@ -17,6 +16,7 @@ import gitbucket.core.util._
 import org.scalatra.i18n.Messages
 import org.scalatra.BadRequest
 import org.scalatra.forms._
+import org.scalatra.Forbidden
 
 class AccountController
     extends AccountControllerBase
@@ -35,6 +35,7 @@ class AccountController
     with WebHookService
     with PrioritiesService
     with RepositoryCreationService
+    with RequestCache
 
 trait AccountControllerBase extends AccountManagementControllerBase {
   self: AccountService
@@ -81,9 +82,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   case class PersonalTokenForm(note: String)
 
+  case class SyntaxHighlighterThemeForm(theme: String)
+
   val newForm = mapping(
     "userName" -> trim(label("User name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password" -> trim(label("Password", text(required, maxlength(20), password))),
+    "password" -> trim(label("Password", text(required, maxlength(20)))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
     "extraMailAddresses" -> list(
@@ -95,7 +98,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   )(AccountNewForm.apply)
 
   val editForm = mapping(
-    "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
+    "password" -> trim(label("Password", optional(text(maxlength(20))))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
     "extraMailAddresses" -> list(
@@ -121,6 +124,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "note" -> trim(label("Token", text(required, maxlength(100))))
   )(PersonalTokenForm.apply)
 
+  val syntaxHighlighterThemeForm = mapping(
+    "highlighterTheme" -> trim(label("Theme", text(required)))
+  )(SyntaxHighlighterThemeForm.apply)
+
   case class NewGroupForm(
     groupName: String,
     description: Option[String],
@@ -256,12 +263,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             account,
             members,
             extraMailAddresses,
-            context.loginAccount.exists(
-              x =>
-                members.exists { member =>
-                  member.userName == x.userName && member.isManager
-              }
-            )
+            isGroupManager(context.loginAccount, members)
           )
         }
 
@@ -273,12 +275,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
             getVisibleRepositories(context.loginAccount, Some(userName)),
             extraMailAddresses,
-            context.loginAccount.exists(
-              x =>
-                members.exists { member =>
-                  member.userName == x.userName && member.isManager
-              }
-            )
+            isGroupManager(context.loginAccount, members)
           )
         }
       }
@@ -347,7 +344,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
         updateImage(userName, form.fileId, form.clearImage)
         updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
-        flash += "info" -> "Account information has been updated."
+        flash.update("info", "Account information has been updated.")
         redirect(s"/${userName}/_edit")
 
     } getOrElse NotFound()
@@ -359,7 +356,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(userName, true).map {
       account =>
         if (isLastAdministrator(account)) {
-          flash += "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")
         } else {
 //      // Remove repositories
@@ -439,7 +436,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
       val (tokenId, token) = generateAccessToken(userName, form.note)
-      flash += "generatedToken" -> (tokenId, token)
+      flash.update("generatedToken", (tokenId, token))
     }
     redirect(s"/${userName}/_application")
   })
@@ -451,6 +448,29 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     redirect(s"/${userName}/_application")
   })
 
+  /**
+   * Display the user preference settings page
+   */
+  get("/:userName/_preferences")(oneselfOnly {
+    val userName = params("userName")
+    val currentTheme = getAccountPreference(userName) match {
+      case Some(accountHighlighter) => accountHighlighter.highlighterTheme
+      case _                        => "github-v2"
+    }
+    getAccountByUserName(userName).map { x =>
+      html.preferences(x, currentTheme)
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Update the syntax highlighter setting of user
+   */
+  post("/:userName/_preferences/highlighter", syntaxHighlighterThemeForm)(oneselfOnly { form =>
+    val userName = params("userName")
+    addOrUpdateAccountPreference(userName, form.theme)
+    redirect(s"/${userName}/_preferences")
+  })
+
   get("/:userName/_hooks")(managersOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
@@ -475,7 +495,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   post("/:userName/_hooks/new", accountWebHookForm(false))(managersOnly { form =>
     val userName = params("userName")
     addAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
-    flash += "info" -> s"Webhook ${form.url} created"
+    flash.update("info", s"Webhook ${form.url} created")
     redirect(s"/${userName}/_hooks")
   })
 
@@ -485,7 +505,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_hooks/delete")(managersOnly {
     val userName = params("userName")
     deleteAccountWebHook(userName, params("url"))
-    flash += "info" -> s"Webhook ${params("url")} deleted"
+    flash.update("info", s"Webhook ${params("url")} deleted")
     redirect(s"/${userName}/_hooks")
   })
 
@@ -508,7 +528,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   post("/:userName/_hooks/edit", accountWebHookForm(true))(managersOnly { form =>
     val userName = params("userName")
     updateAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
-    flash += "info" -> s"webhook ${form.url} updated"
+    flash.update("info", s"webhook ${form.url} updated")
     redirect(s"/${userName}/_hooks")
   })
 
@@ -531,19 +551,21 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val url = params("url")
     val token = Some(params("token"))
     val ctype = WebHookContentType.valueOf(params("ctype"))
-    val dummyWebHookInfo = RepositoryWebHook(userName, "dummy", url, ctype, token)
+    val dummyWebHookInfo =
+      RepositoryWebHook(userName = userName, repositoryName = "dummy", url = url, ctype = ctype, token = token)
     val dummyPayload = {
       val ownerAccount = getAccountByUserName(userName).get
       WebHookPushPayload.createDummyPayload(ownerAccount)
     }
 
-    val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
+    val (webHook, json, reqFuture, resFuture) =
+      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.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
       case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
-      case NonFatal(e)                                       => Map("error" -> (e.getClass + " " + e.getMessage))
+      case NonFatal(e)                                       => Map("error" -> (s"${e.getClass} ${e.getMessage}"))
     }
 
     contentType = formats("json")
@@ -683,7 +705,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
           updateImage(form.groupName, form.fileId, form.clearImage)
 
-          flash += "info" -> "Account information has been updated."
+          flash.update("info", "Account information has been updated.")
           redirect(s"/${groupName}/_editgroup")
 
         } getOrElse NotFound()
@@ -701,27 +723,28 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    * Create new repository.
    */
   post("/new", newRepositoryForm)(usersOnly { form =>
-    LockUtil.lock(s"${form.owner}/${form.name}") {
-      if (getRepository(form.owner, form.name).isEmpty) {
-        createRepository(
-          context.loginAccount.get,
-          form.owner,
-          form.name,
-          form.description,
-          form.isPrivate,
-          form.initOption,
-          form.sourceUrl
-        )
+    if (context.settings.repositoryOperation.create || context.loginAccount.get.isAdmin) {
+      LockUtil.lock(s"${form.owner}/${form.name}") {
+        if (getRepository(form.owner, form.name).isEmpty) {
+          createRepository(
+            context.loginAccount.get,
+            form.owner,
+            form.name,
+            form.description,
+            form.isPrivate,
+            form.initOption,
+            form.sourceUrl
+          )
+        }
       }
-    }
-
-    // redirect to the repository
-    redirect(s"/${form.owner}/${form.name}")
+      // redirect to the repository
+      redirect(s"/${form.owner}/${form.name}")
+    } else Forbidden()
   })
 
   get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    if (repository.repository.options.allowFork) {
-      val loginAccount = context.loginAccount.get
+    val loginAccount = context.loginAccount.get
+    if (repository.repository.options.allowFork && (context.settings.repositoryOperation.fork || loginAccount.isAdmin)) {
       val loginUserName = loginAccount.userName
       val groups = getGroupsByUserName(loginUserName)
       groups match {
@@ -745,8 +768,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   post("/:owner/:repository/fork", accountForm)(readableUsersOnly { (form, repository) =>
-    if (repository.repository.options.allowFork) {
-      val loginAccount = context.loginAccount.get
+    val loginAccount = context.loginAccount.get
+    if (repository.repository.options.allowFork && (context.settings.repositoryOperation.fork || loginAccount.isAdmin)) {
       val loginUserName = loginAccount.userName
       val accountName = form.accountName
 
@@ -760,7 +783,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         // redirect to the repository
         redirect(s"/${accountName}/${repository.name}")
       }
-    } else BadRequest()
+    } else Forbidden()
   })
 
   private def existsAccount: Constraint = new Constraint() {
@@ -823,4 +846,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       }
     }
   }
+
+  private def isGroupManager(account: Option[Account], members: Seq[GroupMember]): Boolean = {
+    account.exists { account =>
+      account.isAdmin || members.exists { member =>
+        member.userName == account.userName && member.isManager
+      }
+    }
+  }
+
 }

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

@@ -13,6 +13,7 @@ class ApiController
     with ApiIssueCommentControllerBase
     with ApiIssueControllerBase
     with ApiIssueLabelControllerBase
+    with ApiIssueMilestoneControllerBase
     with ApiOrganizationControllerBase
     with ApiPullRequestControllerBase
     with ApiReleaseControllerBase
@@ -22,6 +23,7 @@ class ApiController
     with ApiRepositoryContentsControllerBase
     with ApiRepositoryControllerBase
     with ApiRepositoryStatusControllerBase
+    with ApiRepositoryWebhookControllerBase
     with ApiUserControllerBase
     with RepositoryService
     with AccountService
@@ -52,6 +54,7 @@ class ApiController
     with ReferrerAuthenticator
     with ReadableUsersAuthenticator
     with WritableUsersAuthenticator
+    with RequestCache
 
 trait ApiControllerBase extends ControllerBase {
 

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

@@ -20,6 +20,7 @@ import javax.servlet.{FilterChain, ServletRequest, ServletResponse}
 import is.tagomor.woothee.Classifier
 
 import scala.util.Try
+import scala.util.Using
 import net.coobird.thumbnailator.Thumbnails
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.ObjectId
@@ -240,7 +241,7 @@ abstract class ControllerBase
       case false                                => None
     }
 
-    using(new TreeWalk(git.getRepository)) { treeWalk =>
+    Using.resource(new TreeWalk(git.getRepository)) { treeWalk =>
       treeWalk.addTree(revCommit.getTree)
       treeWalk.setRecursive(true)
       _getPathObjectId(path, treeWalk)
@@ -268,7 +269,7 @@ abstract class ControllerBase
           response.setContentLength(attrs("size").toInt)
           val oid = attrs("oid").split(":")(1)
 
-          using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in =>
+          Using.resource(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in =>
             IOUtils.copy(in, response.getOutputStream)
           }
         } else {
@@ -324,6 +325,8 @@ case class Context(
 trait AccountManagementControllerBase extends ControllerBase {
   self: AccountService =>
 
+  private val logger = LoggerFactory.getLogger(getClass)
+
   protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
     if (clearImage) {
       getAccountByUserName(userName).flatMap(_.image).foreach { image =>
@@ -331,17 +334,21 @@ trait AccountManagementControllerBase extends ControllerBase {
         updateAvatarImage(userName, None)
       }
     } else {
-      fileId.foreach { fileId =>
-        val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
-        val uploadDir = getUserUploadDir(userName)
-        if (!uploadDir.exists) {
-          uploadDir.mkdirs()
+      try {
+        fileId.foreach { fileId =>
+          val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
+          val uploadDir = getUserUploadDir(userName)
+          if (!uploadDir.exists) {
+            uploadDir.mkdirs()
+          }
+          Thumbnails
+            .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
+            .size(324, 324)
+            .toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
+          updateAvatarImage(userName, Some(filename))
         }
-        Thumbnails
-          .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
-          .size(324, 324)
-          .toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
-        updateAvatarImage(userName, Some(filename))
+      } catch {
+        case e: Exception => logger.info("Error while updateImage" + e.getMessage)
       }
     }
 
@@ -359,7 +366,7 @@ trait AccountManagementControllerBase extends ControllerBase {
       params: Map[String, Seq[String]],
       messages: Messages
     ): Option[String] = {
-      val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
+      val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
       if (extraMailAddresses.exists {
             case (k, v) =>
               v.contains(value)
@@ -382,7 +389,7 @@ trait AccountManagementControllerBase extends ControllerBase {
       params: Map[String, Seq[String]],
       messages: Messages
     ): Option[String] = {
-      val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
+      val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
       if (Some(value) == params.optionValue("mailAddress") || extraMailAddresses.count {
             case (k, v) =>
               v.contains(value)

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

@@ -21,13 +21,25 @@ class DashboardController
     with WebHookPullRequestService
     with WebHookPullRequestReviewCommentService
     with MilestonesService
+    with CommitStatusService
     with UsersAuthenticator
+    with RequestCache
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with PullRequestService with RepositoryService with AccountService with UsersAuthenticator =>
+  self: IssuesService
+    with PullRequestService
+    with RepositoryService
+    with AccountService
+    with CommitStatusService
+    with UsersAuthenticator =>
 
   get("/dashboard/repos")(usersOnly {
-    val repos = getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true)
+    val repos = getVisibleRepositories(
+      context.loginAccount,
+      None,
+      withoutPhysicalInfo = true,
+      limit = context.settings.limitVisibleRepositories
+    )
     html.repos(getGroupNames(context.loginAccount.get.userName), repos, repos)
   })
 
@@ -80,12 +92,13 @@ trait DashboardControllerBase extends ControllerBase {
     val condition = getOrCreateCondition(Keys.Session.DashboardIssues, filter, userName)
     val userRepos = getUserRepositories(userName, true).map(repo => repo.owner -> repo.name)
     val page = IssueSearchCondition.page(request)
+    val issues = searchIssue(condition, IssueSearchOption.Issues, (page - 1) * IssueLimit, IssueLimit, userRepos: _*)
 
     html.issues(
-      searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
+      issues.map(issue => (issue, None)),
       page,
-      countIssue(condition.copy(state = "open"), false, userRepos: _*),
-      countIssue(condition.copy(state = "closed"), false, userRepos: _*),
+      countIssue(condition.copy(state = "open"), 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))
@@ -93,7 +106,12 @@ trait DashboardControllerBase extends ControllerBase {
       },
       filter,
       getGroupNames(userName),
-      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true)
+      getVisibleRepositories(
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
     )
   }
 
@@ -105,12 +123,24 @@ trait DashboardControllerBase extends ControllerBase {
     val condition = getOrCreateCondition(Keys.Session.DashboardPulls, filter, userName)
     val allRepos = getAllRepositories(userName)
     val page = IssueSearchCondition.page(request)
+    val issues = searchIssue(
+      condition,
+      IssueSearchOption.PullRequests,
+      (page - 1) * PullRequestLimit,
+      PullRequestLimit,
+      allRepos: _*
+    )
+    val status = issues.map { issue =>
+      issue.commitId.flatMap { commitId =>
+        getCommitStatusWithSummary(issue.issue.userName, issue.issue.repositoryName, commitId)
+      }
+    }
 
     html.pulls(
-      searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
+      issues.zip(status),
       page,
-      countIssue(condition.copy(state = "open"), true, allRepos: _*),
-      countIssue(condition.copy(state = "closed"), true, allRepos: _*),
+      countIssue(condition.copy(state = "open"), 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))
@@ -118,7 +148,12 @@ trait DashboardControllerBase extends ControllerBase {
       },
       filter,
       getGroupNames(userName),
-      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true)
+      getVisibleRepositories(
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
     )
   }
 

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

@@ -16,6 +16,9 @@ import org.scalatra._
 import org.scalatra.servlet.{FileItem, FileUploadSupport, MultipartConfig}
 import org.apache.commons.io.{FileUtils, IOUtils}
 
+import scala.util.Using
+import gitbucket.core.service.SystemSettingsService
+
 /**
  * Provides Ajax based file upload functionality.
  *
@@ -26,11 +29,11 @@ class FileUploadController
     with FileUploadSupport
     with RepositoryService
     with AccountService
-    with ReleaseService {
-
-  configureMultipartHandling(MultipartConfig(maxFileSize = Some(FileUtil.MaxFileSize)))
+    with ReleaseService
+    with SystemSettingsService {
 
   post("/image") {
+    setMultipartConfig()
     execute(
       { (file, fileId) =>
         FileUtils
@@ -42,6 +45,7 @@ class FileUploadController
   }
 
   post("/tmp") {
+    setMultipartConfig()
     execute(
       { (file, fileId) =>
         FileUtils
@@ -53,6 +57,7 @@ class FileUploadController
   }
 
   post("/file/:owner/:repository") {
+    setMultipartConfig()
     execute(
       { (file, fileId) =>
         FileUtils.writeByteArrayToFile(
@@ -68,6 +73,7 @@ class FileUploadController
   }
 
   post("/wiki/:owner/:repository") {
+    setMultipartConfig()
     // Don't accept not logged-in users
     session.get(Keys.Session.LoginAccount).collect {
       case loginAccount: Account =>
@@ -80,7 +86,7 @@ class FileUploadController
             { (file, fileId) =>
               val fileName = file.getName
               LockUtil.lock(s"${owner}/${repository}/wiki") {
-                using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) {
+                Using.resource(Git.open(Directory.getWikiRepositoryDir(owner, repository))) {
                   git =>
                     val builder = DirCache.newInCore.builder()
                     val inserter = git.getRepository.newObjectInserter()
@@ -126,6 +132,7 @@ class FileUploadController
   }
 
   post("/release/:owner/:repository/:tag") {
+    setMultipartConfigForLargeFile()
     session
       .get(Keys.Session.LoginAccount)
       .collect {
@@ -148,6 +155,7 @@ class FileUploadController
 
   post("/import") {
     import JDBCUtil._
+    setMultipartConfig()
     session.get(Keys.Session.LoginAccount).collect {
       case loginAccount: Account if loginAccount.isAdmin =>
         execute({ (file, fileId) =>
@@ -157,6 +165,18 @@ class FileUploadController
     redirect("/admin/data")
   }
 
+  private def setMultipartConfig(): Unit = {
+    val settings = loadSystemSettings()
+    val config = MultipartConfig(maxFileSize = Some(settings.upload.maxFileSize))
+    config.apply(request.getServletContext())
+  }
+
+  private def setMultipartConfigForLargeFile(): Unit = {
+    val settings = loadSystemSettings()
+    val config = MultipartConfig(maxFileSize = Some(settings.upload.largeMaxFileSize))
+    config.apply(request.getServletContext())
+  }
+
   private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
     implicit val session = Database.getSession(request)
     getRepository(owner, repository) match {

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

@@ -29,6 +29,7 @@ class IndexController
     with AccessTokenService
     with AccountFederationService
     with OpenIDConnectService
+    with RequestCache
 
 trait IndexControllerBase extends ControllerBase {
   self: RepositoryService
@@ -65,7 +66,12 @@ trait IndexControllerBase extends ControllerBase {
         val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
         gitbucket.core.html.index(
           getRecentActivitiesByOwners(visibleOwnerSet),
-          getVisibleRepositories(Some(account), withoutPhysicalInfo = true),
+          getVisibleRepositories(
+            Some(account),
+            None,
+            withoutPhysicalInfo = true,
+            limit = context.settings.limitVisibleRepositories
+          ),
           showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
             account.userName
           )
@@ -73,7 +79,7 @@ trait IndexControllerBase extends ControllerBase {
       }
       .getOrElse {
         gitbucket.core.html.index(
-          getRecentActivities(),
+          getRecentPublicActivities(),
           getVisibleRepositories(None, withoutPhysicalInfo = true),
           showBannerToCreatePersonalAccessToken = false
         )
@@ -83,7 +89,7 @@ trait IndexControllerBase extends ControllerBase {
   get("/signin") {
     val redirect = params.get("redirect")
     if (redirect.isDefined && redirect.get.startsWith("/")) {
-      flash += Keys.Flash.Redirect -> redirect.get
+      flash.update(Keys.Flash.Redirect, redirect.get)
     }
     gitbucket.core.html.signin(flash.get("userName"), flash.get("password"), flash.get("error"))
   }
@@ -96,9 +102,9 @@ trait IndexControllerBase extends ControllerBase {
           case _                         => signin(account)
         }
       case None =>
-        flash += "userName" -> form.userName
-        flash += "password" -> form.password
-        flash += "error" -> "Sorry, your Username and/or Password is incorrect. Please try again."
+        flash.update("userName", form.userName)
+        flash.update("password", form.password)
+        flash.update("error", "Sorry, your Username and/or Password is incorrect. Please try again.")
         redirect("/signin")
     }
   }
@@ -132,15 +138,15 @@ trait IndexControllerBase extends ControllerBase {
       val redirectURI = new URI(s"$baseUrl/signin/oidc")
       session.get(Keys.Session.OidcContext) match {
         case Some(context: OidcContext) =>
-          authenticate(params, redirectURI, context.state, context.nonce, oidc) map { account =>
+          authenticate(params.toMap, redirectURI, context.state, context.nonce, oidc).map { account =>
             signin(account, context.redirectBackURI)
           } orElse {
-            flash += "error" -> "Sorry, authentication failed. Please try again."
+            flash.update("error", "Sorry, authentication failed. Please try again.")
             session.invalidate()
             redirect("/signin")
           }
         case _ =>
-          flash += "error" -> "Sorry, something wrong. Please try again."
+          flash.update("error", "Sorry, something wrong. Please try again.")
           session.invalidate()
           redirect("/signin")
       }
@@ -156,7 +162,7 @@ trait IndexControllerBase extends ControllerBase {
 
   get("/activities.atom") {
     contentType = "application/atom+xml; type=feed"
-    xml.feed(getRecentActivities())
+    xml.feed(getRecentPublicActivities())
   }
 
   post("/sidebar-collapse") {
@@ -207,8 +213,10 @@ trait IndexControllerBase extends ControllerBase {
             }
             .map { t =>
               Map(
-                "label" -> s"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(t.userName)}</b> ${StringUtil
-                  .escapeHtml(t.fullName)}",
+                "label" -> s"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(
+                  StringUtil.cutTail(t.userName, 25, "...")
+                )}</b> ${StringUtil
+                  .escapeHtml(StringUtil.cutTail(t.fullName, 25, "..."))}",
                 "value" -> t.userName
               )
             }
@@ -227,7 +235,7 @@ trait IndexControllerBase extends ControllerBase {
     } getOrElse ""
   })
 
-  // TODO Move to RepositoryViwerController?
+  // TODO Move to RepositoryViewrController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
     defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")) {
       case (query, target) =>
@@ -279,11 +287,28 @@ trait IndexControllerBase extends ControllerBase {
   get("/search") {
     val query = params.getOrElse("query", "").trim.toLowerCase
     val visibleRepositories =
-      getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
-    val repositories = visibleRepositories.filter { repository =>
+      getVisibleRepositories(
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
+
+    val repositories = {
+      context.settings.limitVisibleRepositories match {
+        case true =>
+          getVisibleRepositories(
+            context.loginAccount,
+            None,
+            withoutPhysicalInfo = true,
+            limit = false
+          )
+        case false => visibleRepositories
+      }
+    }.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }
+
     gitbucket.core.search.html.repositories(query, repositories, visibleRepositories)
   }
-
 }

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

@@ -30,6 +30,7 @@ class IssuesController
     with WebHookPullRequestReviewCommentService
     with CommitsService
     with PrioritiesService
+    with RequestCache
 
 trait IssuesControllerBase extends ControllerBase {
   self: IssuesService
@@ -111,6 +112,7 @@ trait IssuesControllerBase extends ControllerBase {
                 getLabels(owner, name),
                 isIssueEditable(repository),
                 isIssueManageable(repository),
+                isIssueCommentManageable(repository),
                 repository
               )
             }
@@ -145,7 +147,7 @@ trait IssuesControllerBase extends ControllerBase {
         form.assignedUserName,
         form.milestoneId,
         form.priorityId,
-        form.labelNames.toArray.flatMap(_.split(",")),
+        form.labelNames.toSeq.flatMap(_.split(",")),
         context.loginAccount.get
       )
 
@@ -237,8 +239,8 @@ trait IssuesControllerBase extends ControllerBase {
     defining(repository.owner, repository.name) {
       case (owner, name) =>
         getComment(owner, name, params("id")).map { comment =>
-          if (isEditableContent(owner, name, comment.commentedUserName)) {
-            Ok(deleteComment(comment.issueId, comment.commentId))
+          if (isDeletableComment(owner, name, comment.commentedUserName)) {
+            Ok(deleteComment(repository.owner, repository.name, comment.issueId, comment.commentId))
           } else Unauthorized()
         } getOrElse NotFound()
     }
@@ -368,6 +370,9 @@ trait IssuesControllerBase extends ControllerBase {
             }
           case _ => BadRequest()
         }
+        if (params("uri").nonEmpty) {
+          redirect(params("uri"))
+        }
     }
   })
 
@@ -376,6 +381,9 @@ trait IssuesControllerBase extends ControllerBase {
       executeBatch(repository) { issueId =>
         getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
           registerIssueLabel(repository.owner, repository.name, issueId, labelId, true)
+          if (params("uri").nonEmpty) {
+            redirect(params("uri"))
+          }
         }
       }
     } getOrElse NotFound()
@@ -386,6 +394,9 @@ trait IssuesControllerBase extends ControllerBase {
       executeBatch(repository) {
         updateAssignedUserName(repository.owner, repository.name, _, value, true)
       }
+      if (params("uri").nonEmpty) {
+        redirect(params("uri"))
+      }
     }
   })
 
@@ -416,6 +427,29 @@ trait IssuesControllerBase extends ControllerBase {
     }) getOrElse NotFound()
   })
 
+  /**
+   * JSON API for issue and PR completion.
+   */
+  ajaxGet("/:owner/:repository/_issue/proposals")(writableUsersOnly { repository =>
+    contentType = formats("json")
+    org.json4s.jackson.Serialization.write(
+      Map(
+        "options" -> (
+          getOpenIssues(repository.owner, repository.name)
+            .map { t =>
+              Map(
+                "label" -> s"""${if (t.isPullRequest) "<i class='octicon octicon-git-pull-request'></i>"
+                else "<i class='octicon octicon-issue-opened'></i>"}<b> #${StringUtil
+                  .escapeHtml(t.issueId.toString)} ${StringUtil
+                  .escapeHtml(StringUtil.cutTail(t.title, 50, "..."))}</b>""",
+                "value" -> t.issueId.toString
+              )
+            }
+        )
+      )
+    )
+  })
+
   val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
   val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
   val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
@@ -425,6 +459,7 @@ trait IssuesControllerBase extends ControllerBase {
     params("from") match {
       case "issues" => redirect(s"/${repository.owner}/${repository.name}/issues")
       case "pulls"  => redirect(s"/${repository.owner}/${repository.name}/pulls")
+      case _        =>
     }
   }
 
@@ -432,20 +467,22 @@ trait IssuesControllerBase extends ControllerBase {
     defining(repository.owner, repository.name) {
       case (owner, repoName) =>
         val page = IssueSearchCondition.page(request)
-
         // retrieve search condition
         val condition = IssueSearchCondition(request)
+        // search issues
+        val issues =
+          searchIssue(condition, IssueSearchOption.Issues, (page - 1) * IssueLimit, IssueLimit, owner -> repoName)
 
         html.list(
           "issues",
-          searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
+          issues.map(issue => (issue, None)),
           page,
           getAssignableUserNames(owner, repoName),
           getMilestones(owner, repoName),
           getPriorities(owner, repoName),
           getLabels(owner, repoName),
-          countIssue(condition.copy(state = "open"), false, owner -> repoName),
-          countIssue(condition.copy(state = "closed"), false, owner -> repoName),
+          countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, owner -> repoName),
+          countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, owner -> repoName),
           condition,
           repository,
           isIssueEditable(repository),
@@ -462,4 +499,13 @@ trait IssuesControllerBase extends ControllerBase {
   ): Boolean = {
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
   }
+
+  /**
+   * Tests whether an issue comment is deletable by a logged-in user.
+   */
+  private def isDeletableComment(owner: String, repository: String, author: String)(
+    implicit context: Context
+  ): Boolean = {
+    hasOwnerRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+  }
 }

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

@@ -1,26 +1,41 @@
 package gitbucket.core.controller
 
 import gitbucket.core.issues.milestones.html
-import gitbucket.core.service.{RepositoryService, MilestonesService, AccountService}
-import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.service.IssuesService.{IssueLimit, IssueSearchCondition}
+import gitbucket.core.service.{
+  AccountService,
+  CommitStatusService,
+  IssueSearchOption,
+  MilestonesService,
+  RepositoryService
+}
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.view.helpers.{getAssignableUserNames, getLabels, getPriorities, searchIssue}
 import org.scalatra.forms._
+import org.scalatra.i18n.Messages
 
 class MilestonesController
     extends MilestonesControllerBase
     with MilestonesService
     with RepositoryService
     with AccountService
+    with CommitStatusService
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
 
 trait MilestonesControllerBase extends ControllerBase {
-  self: MilestonesService with RepositoryService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: MilestonesService
+    with RepositoryService
+    with CommitStatusService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator =>
 
   case class MilestoneForm(title: String, description: Option[String], dueDate: Option[java.util.Date])
 
   val milestoneForm = mapping(
-    "title" -> trim(label("Title", text(required, maxlength(100)))),
+    "title" -> trim(label("Title", text(required, maxlength(100), uniqueMilestone))),
     "description" -> trim(label("Description", optional(text()))),
     "dueDate" -> trim(label("Due Date", optional(date())))
   )(MilestoneForm.apply)
@@ -34,6 +49,41 @@ trait MilestonesControllerBase extends ControllerBase {
     )
   })
 
+  get("/:owner/:repository/milestone/:id")(referrersOnly { repository =>
+    val milestone = getMilestone(repository.owner, repository.name, params("id").toInt)
+    val page = IssueSearchCondition.page(request)
+    val condition = IssueSearchCondition(
+      request,
+      milestone.get.title
+    )
+    val issues = searchIssue(
+      condition,
+      IssueSearchOption.Both,
+      (page - 1) * IssueLimit,
+      IssueLimit,
+      repository.owner -> repository.name
+    )
+    val status = issues.map { issue =>
+      issue.commitId.flatMap { commitId =>
+        getCommitStatusWithSummary(issue.issue.userName, issue.issue.repositoryName, commitId)
+      }
+    }
+
+    html.milestone(
+      condition.state,
+      issues.zip(status),
+      page,
+      getAssignableUserNames(repository.owner, repository.name),
+      getPriorities(repository.owner, repository.name),
+      getLabels(repository.owner, repository.name),
+      condition,
+      getMilestonesWithIssueCount(repository.owner, repository.name)
+        .filter(p => p._1.milestoneId == milestone.get.milestoneId),
+      repository,
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
+  })
+
   get("/:owner/:repository/issues/milestones/new")(writableUsersOnly {
     html.edit(None, _)
   })
@@ -86,4 +136,29 @@ trait MilestonesControllerBase extends ControllerBase {
     } getOrElse NotFound()
   })
 
+  private def uniqueMilestone: Constraint = new Constraint() {
+    override def validate(
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      for {
+        owner <- params.optionValue("owner")
+        repository <- params.optionValue("repository")
+        _ <- params.optionValue("milestoneId") match {
+          // existing milestone
+          case Some(id) =>
+            getMilestones(owner, repository)
+              .find(m => m.title.equalsIgnoreCase(value) && m.milestoneId.toString != id)
+          // new milestone
+          case None =>
+            getMilestones(owner, repository)
+              .find(m => m.title.equalsIgnoreCase(value))
+        }
+      } yield {
+        "Milestone already exists."
+      }
+    }
+  }
 }

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

@@ -1,7 +1,6 @@
 package gitbucket.core.controller
 
-import gitbucket.core.model.{CommitComment, CommitComments, IssueComment, WebHook}
-import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.model.activity.DeleteBranchInfo
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.MergeService
@@ -15,11 +14,9 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import org.scalatra.forms._
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.lib.{ObjectId, PersonIdent}
-import org.eclipse.jgit.revwalk.RevWalk
 import org.scalatra.BadRequest
 
-import scala.collection.JavaConverters._
+import scala.util.Using
 
 class PullRequestsController
     extends PullRequestsControllerBase
@@ -40,6 +37,7 @@ class PullRequestsController
     with MergeService
     with ProtectedBranchService
     with PrioritiesService
+    with RequestCache
 
 trait PullRequestsControllerBase extends ControllerBase {
   self: RepositoryService
@@ -69,6 +67,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     "requestBranch" -> trim(text(required, maxlength(100))),
     "commitIdFrom" -> trim(text(required, maxlength(40))),
     "commitIdTo" -> trim(text(required, maxlength(40))),
+    "isDraft" -> trim(boolean(required)),
     "assignedUserName" -> trim(optional(text())),
     "milestoneId" -> trim(optional(number())),
     "priorityId" -> trim(optional(number())),
@@ -77,7 +76,8 @@ trait PullRequestsControllerBase extends ControllerBase {
 
   val mergeForm = mapping(
     "message" -> trim(label("Message", text(required))),
-    "strategy" -> trim(label("Strategy", text(required)))
+    "strategy" -> trim(label("Strategy", text(required))),
+    "isDraft" -> trim(boolean(required))
   )(MergeForm.apply)
 
   case class PullRequestForm(
@@ -90,13 +90,14 @@ trait PullRequestsControllerBase extends ControllerBase {
     requestBranch: String,
     commitIdFrom: String,
     commitIdTo: String,
+    isDraft: Boolean,
     assignedUserName: Option[String],
     milestoneId: Option[Int],
     priorityId: Option[Int],
     labelNames: Option[String]
   )
 
-  case class MergeForm(message: String, strategy: String)
+  case class MergeForm(message: String, strategy: String, isDraft: Boolean)
 
   get("/:owner/:repository/pulls")(referrersOnly { repository =>
     val q = request.getParameter("q")
@@ -133,7 +134,7 @@ trait PullRequestsControllerBase extends ControllerBase {
               hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
               repository,
               getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
-              flash.toMap.map(f => f._1 -> f._2.toString)
+              flash.iterator.map(f => f._1 -> f._2.toString).toMap
             )
 
 //                html.pullreq(
@@ -218,7 +219,7 @@ trait PullRequestsControllerBase extends ControllerBase {
             val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
             val mergeStatus = PullRequestService.MergeStatus(
               conflictMessage = conflictMessage,
-              commitStatues = getCommitStatues(owner, name, pullreq.commitIdTo),
+              commitStatuses = getCommitStatuses(owner, name, pullreq.commitIdTo),
               branchProtection = branchProtection,
               branchIsOutOfDate = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
               needStatusCheck = context.loginAccount
@@ -266,13 +267,14 @@ trait PullRequestsControllerBase extends ControllerBase {
       val repository = getRepository(owner, name).get
       val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
       if (branchProtection.enabled) {
-        flash += "error" -> s"branch ${pullreq.requestBranch} is protected."
+        flash.update("error", s"branch ${pullreq.requestBranch} is protected.")
       } else {
         if (repository.repository.defaultBranch != pullreq.requestBranch) {
           val userName = context.loginAccount.get.userName
-          using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+          Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
             git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call()
-            recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch)
+            val deleteBranchInfo = DeleteBranchInfo(repository.owner, repository.name, userName, pullreq.requestBranch)
+            recordActivity(deleteBranchInfo)
           }
           createComment(
             baseRepository.owner,
@@ -283,9 +285,10 @@ trait PullRequestsControllerBase extends ControllerBase {
             "delete_branch"
           )
         } else {
-          flash += "error" -> s"""Can't delete the default branch "${pullreq.requestBranch}"."""
+          flash.update("error", s"""Can't delete the default branch "${pullreq.requestBranch}".""")
         }
       }
+
       redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
     }) getOrElse NotFound()
   })
@@ -303,7 +306,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     } yield {
       val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
       if (branchProtection.needStatusCheck(loginAccount.userName)) {
-        flash += "error" -> s"branch ${pullreq.requestBranch} is protected need status check."
+        flash.update("error", s"branch ${pullreq.requestBranch} is protected need status check.")
       } else {
         LockUtil.lock(s"${owner}/${name}") {
           val alias =
@@ -312,9 +315,11 @@ trait PullRequestsControllerBase extends ControllerBase {
             } else {
               s"${pullreq.userName}:${pullreq.branch}"
             }
-          val existIds = using(Git.open(Directory.getRepositoryDir(owner, name))) { git =>
-            JGitUtil.getAllCommitIds(git)
-          }.toSet
+          val existIds = Using
+            .resource(Git.open(Directory.getRepositoryDir(owner, name))) { git =>
+              JGitUtil.getAllCommitIds(git)
+            }
+            .toSet
           pullRemote(
             repository,
             pullreq.requestBranch,
@@ -322,14 +327,15 @@ trait PullRequestsControllerBase extends ControllerBase {
             pullreq.branch,
             loginAccount,
             s"Merge branch '${alias}' into ${pullreq.requestBranch}",
-            Some(pullreq)
+            Some(pullreq),
+            context.settings
           ) match {
             case None => // conflict
-              flash += "error" -> s"Can't automatic merging branch '${alias}' into ${pullreq.requestBranch}."
+              flash.update("error", s"Can't automatic merging branch '${alias}' into ${pullreq.requestBranch}.")
             case Some(oldId) =>
               // update pull request
-              updatePullRequests(owner, name, pullreq.requestBranch, loginAccount, "synchronize")
-              flash += "info" -> s"Merge branch '${alias}' into ${pullreq.requestBranch}"
+              updatePullRequests(owner, name, pullreq.requestBranch, loginAccount, "synchronize", context.settings)
+              flash.update("info", s"Merge branch '${alias}' into ${pullreq.requestBranch}")
           }
         }
       }
@@ -338,14 +344,34 @@ trait PullRequestsControllerBase extends ControllerBase {
     }) getOrElse NotFound()
   })
 
+  post("/:owner/:repository/pull/:id/update_draft")(readableUsersOnly { baseRepository =>
+    (for {
+      issueId <- params("id").toIntOpt
+      (_, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
+      owner = pullreq.requestUserName
+      name = pullreq.requestRepositoryName
+      if hasDeveloperRole(owner, name, context.loginAccount)
+    } yield {
+      updateDraftToPullRequest(baseRepository.owner, baseRepository.name, issueId)
+    }) getOrElse NotFound()
+  })
+
   post("/:owner/:repository/pull/:id/merge", mergeForm)(writableUsersOnly { (form, repository) =>
     params("id").toIntOpt.flatMap { issueId =>
       val owner = repository.owner
       val name = repository.name
 
-      mergePullRequest(repository, issueId, context.loginAccount.get, form.message, form.strategy) match {
+      mergePullRequest(
+        repository,
+        issueId,
+        context.loginAccount.get,
+        form.message,
+        form.strategy,
+        form.isDraft,
+        context.settings
+      ) match {
         case Right(objectId) => redirect(s"/${owner}/${name}/pull/${issueId}")
-        case Left(message)   => Some(BadRequest())
+        case Left(message)   => Some(BadRequest(message))
       }
     } getOrElse NotFound()
   })
@@ -356,7 +382,7 @@ trait PullRequestsControllerBase extends ControllerBase {
       case (Some(originUserName), Some(originRepositoryName)) => {
         getRepository(originUserName, originRepositoryName).map {
           originRepository =>
-            using(
+            Using.resources(
               Git.open(getRepositoryDir(originUserName, originRepositoryName)),
               Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
             ) { (oldGit, newGit) =>
@@ -372,7 +398,7 @@ trait PullRequestsControllerBase extends ControllerBase {
         } getOrElse NotFound()
       }
       case _ => {
-        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))) { git =>
+        Using.resource(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))) { git =>
           JGitUtil.getDefaultBranch(git, forkedRepository).map {
             case (_, defaultBranch) =>
               redirect(
@@ -464,6 +490,7 @@ trait PullRequestsControllerBase extends ControllerBase {
             getAssignableUserNames(originRepository.owner, originRepository.name),
             getMilestones(originRepository.owner, originRepository.name),
             getPriorities(originRepository.owner, originRepository.name),
+            getDefaultPriority(originRepository.owner, originRepository.name),
             getLabels(originRepository.owner, originRepository.name)
           )
         }
@@ -493,7 +520,7 @@ trait PullRequestsControllerBase extends ControllerBase {
             }
           };
           originRepository <- getRepository(originOwner, originRepositoryName)) yield {
-      using(
+      Using.resources(
         Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
         Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
       ) {
@@ -542,7 +569,9 @@ trait PullRequestsControllerBase extends ControllerBase {
           requestBranch = form.requestBranch,
           commitIdFrom = form.commitIdFrom,
           commitIdTo = form.commitIdTo,
-          loginAccount = context.loginAccount.get
+          isDraft = form.isDraft,
+          loginAccount = context.loginAccount.get,
+          settings = context.settings
         )
 
         // insert labels
@@ -567,7 +596,7 @@ trait PullRequestsControllerBase extends ControllerBase {
       context.loginAccount.map(x => Seq(x.mailAddress) ++ getAccountExtraMailAddresses(x.userName)).getOrElse(Nil)
 
     val branches =
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
         git =>
           JGitUtil
             .getBranches(
@@ -608,20 +637,33 @@ trait PullRequestsControllerBase extends ControllerBase {
     defining(repository.owner, repository.name) {
       case (owner, repoName) =>
         val page = IssueSearchCondition.page(request)
-
         // retrieve search condition
         val condition = IssueSearchCondition(request)
+        // search issues
+        val issues = searchIssue(
+          condition,
+          IssueSearchOption.PullRequests,
+          (page - 1) * PullRequestLimit,
+          PullRequestLimit,
+          owner -> repoName
+        )
+        // commit status
+        val status = issues.map { issue =>
+          issue.commitId.flatMap { commitId =>
+            getCommitStatusWithSummary(owner, repoName, commitId)
+          }
+        }
 
         gitbucket.core.issues.html.list(
           "pulls",
-          searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
+          issues.zip(status),
           page,
           getAssignableUserNames(owner, repoName),
           getMilestones(owner, repoName),
           getPriorities(owner, repoName),
           getLabels(owner, repoName),
-          countIssue(condition.copy(state = "open"), true, owner -> repoName),
-          countIssue(condition.copy(state = "closed"), true, owner -> repoName),
+          countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, owner -> repoName),
+          countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, owner -> repoName),
           condition,
           repository,
           isEditable(repository),

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

@@ -2,16 +2,25 @@ package gitbucket.core.controller
 
 import java.io.File
 
-import gitbucket.core.service.{AccountService, ActivityService, ReleaseService, RepositoryService}
+import gitbucket.core.model.activity.ReleaseInfo
+import gitbucket.core.service.{
+  AccountService,
+  ActivityService,
+  PaginationHelper,
+  ReleaseService,
+  RepositoryService,
+  RequestCache
+}
 import gitbucket.core.util._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import org.scalatra.forms._
 import gitbucket.core.releases.html
-import gitbucket.core.util.SyntaxSugars.using
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.Git
 
+import scala.util.Using
+
 class ReleaseController
     extends ReleaseControllerBase
     with RepositoryService
@@ -21,6 +30,7 @@ class ReleaseController
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
+    with RequestCache
 
 trait ReleaseControllerBase extends ControllerBase {
   self: RepositoryService
@@ -42,17 +52,14 @@ trait ReleaseControllerBase extends ControllerBase {
   )(ReleaseForm.apply)
 
   get("/:owner/:repository/releases")(referrersOnly { repository =>
-    val releases = getReleases(repository.owner, repository.name)
-    val assets = getReleaseAssetsMap(repository.owner, repository.name)
+    val page = PaginationHelper.page(params.get("page"))
 
     html.list(
       repository,
-      repository.tags.reverse.map { tag =>
-        (tag, releases.find(_.tag == tag.name).map { release =>
-          (release, assets(release))
-        })
-      },
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+      fetchReleases(repository, page),
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+      page,
+      repository.tags.size
     )
   })
 
@@ -106,7 +113,7 @@ trait ReleaseControllerBase extends ControllerBase {
     createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
 
     // Insert into RELEASE_ASSET
-    val files = params.collect {
+    val files = params.toMap.collect {
       case (name, value) if name.startsWith("file:") =>
         val Array(_, fileId) = name.split(":")
         (fileId, value)
@@ -121,7 +128,8 @@ trait ReleaseControllerBase extends ControllerBase {
         createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
     }
 
-    recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
+    val releaseInfo = ReleaseInfo(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
+    recordActivity(releaseInfo)
 
     redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
   })
@@ -130,7 +138,7 @@ trait ReleaseControllerBase extends ControllerBase {
     val Seq(previousTag, currentTag) = multiParams("splat")
     val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")
 
-    val commitLog = using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    val commitLog = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
       commits
         .map { commit =>
@@ -174,7 +182,7 @@ trait ReleaseControllerBase extends ControllerBase {
           val assets = getReleaseAssets(repository.owner, repository.name, tagName)
           deleteReleaseAssets(repository.owner, repository.name, tagName)
 
-          val files = params.collect {
+          val files = params.toMap.collect {
             case (name, value) if name.startsWith("file:") =>
               val Array(_, fileId) = name.split(":")
               (fileId, value)
@@ -215,4 +223,21 @@ trait ReleaseControllerBase extends ControllerBase {
     redirect(s"/${repository.owner}/${repository.name}/releases")
   })
 
+  private def fetchReleases(repository: RepositoryService.RepositoryInfo, page: Int) = {
+
+    import gitbucket.core.service.ReleaseService._
+
+    val (offset, limit) = ((page - 1) * ReleaseLimit, ReleaseLimit)
+    val tagsToDisplay = repository.tags.reverse.slice(offset, offset + limit)
+
+    val releases = getReleases(repository.owner, repository.name, tagsToDisplay)
+    val assets = getReleaseAssetsMap(repository.owner, repository.name, releases)
+
+    val tagsWithReleases = tagsToDisplay.map { tag =>
+      (tag, releases.find(_.tag == tag.name).map { release =>
+        (release, assets(release))
+      })
+    }
+    tagsWithReleases
+  }
 }

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

@@ -12,12 +12,16 @@ import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
+import gitbucket.core.model.WebHookContentType
+import gitbucket.core.model.activity.RenameRepositoryInfo
 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 gitbucket.core.model.WebHookContentType
+
+import scala.util.Using
+import org.scalatra.Forbidden
 
 class RepositorySettingsController
     extends RepositorySettingsControllerBase
@@ -27,8 +31,10 @@ class RepositorySettingsController
     with ProtectedBranchService
     with CommitStatusService
     with DeployKeyService
+    with ActivityService
     with OwnerAuthenticator
     with UsersAuthenticator
+    with RequestCache
 
 trait RepositorySettingsControllerBase extends ControllerBase {
   self: RepositoryService
@@ -37,12 +43,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     with ProtectedBranchService
     with CommitStatusService
     with DeployKeyService
+    with ActivityService
     with OwnerAuthenticator
     with UsersAuthenticator =>
 
   // for repository options
   case class OptionsForm(
-    repositoryName: String,
     description: Option[String],
     isPrivate: Boolean,
     issuesOption: String,
@@ -55,9 +61,6 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   )
 
   val optionsForm = mapping(
-    "repositoryName" -> trim(
-      label("Repository Name", text(required, maxlength(100), repository, renameRepositoryName))
-    ),
     "description" -> trim(label("Description", optional(text()))),
     "isPrivate" -> trim(label("Repository Type", boolean())),
     "issuesOption" -> trim(label("Issues Option", text(required, featureOption))),
@@ -98,9 +101,16 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       "events" -> webhookEvents,
       "ctype" -> label("ctype", text()),
       "token" -> optional(trim(label("token", text(maxlength(100)))))
-    )(
-      (url, events, ctype, token) => WebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+    )((url, events, ctype, token) => WebHookForm(url, events, WebHookContentType.valueOf(ctype), token))
+
+  // for rename repository
+  case class RenameRepositoryForm(repositoryName: String)
+
+  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)
@@ -142,13 +152,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       form.mergeOptions,
       form.defaultMergeOption
     )
-    // Change repository name
-    if (repository.name != form.repositoryName) {
-      // Update database
-      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
-    }
-    flash += "info" -> "Repository settings has been updated."
-    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
+    flash.update("info", "Repository settings has been updated.")
+    redirect(s"/${repository.owner}/${repository.name}/settings/options")
   })
 
   /** branch settings */
@@ -164,23 +169,24 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     } else {
       saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch)
       // Change repository HEAD
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         git.getRepository.updateRef(Constants.HEAD, true).link(Constants.R_HEADS + form.defaultBranch)
       }
-      flash += "info" -> "Repository default branch has been updated."
+      flash.update("info", "Repository default branch has been updated.")
       redirect(s"/${repository.owner}/${repository.name}/settings/branches")
     }
   })
 
   /** Branch protection for branch */
-  get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository =>
+  get("/:owner/:repository/settings/branches/*")(ownerOnly { repository =>
     import gitbucket.core.api._
-    val branch = params("branch")
+    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 lastWeeks = getRecentStatuesContexts(
+      val lastWeeks = getRecentStatusContexts(
         repository.owner,
         repository.name,
         Date.from(LocalDateTime.now.minusWeeks(1).toInstant(ZoneOffset.UTC))
@@ -222,7 +228,13 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Display the web hook edit page.
    */
   get("/:owner/:repository/settings/hooks/new")(ownerOnly { repository =>
-    val webhook = RepositoryWebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
+    val webhook = RepositoryWebHook(
+      userName = repository.owner,
+      repositoryName = repository.name,
+      url = "",
+      ctype = WebHookContentType.FORM,
+      token = None
+    )
     html.edithook(webhook, Set(WebHook.Push), repository, true)
   })
 
@@ -231,7 +243,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/hooks/new", webHookForm(false))(ownerOnly { (form, repository) =>
     addWebHook(repository.owner, repository.name, form.url, form.events, form.ctype, form.token)
-    flash += "info" -> s"Webhook ${form.url} created"
+    flash.update("info", s"Webhook ${form.url} created")
     redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
   })
 
@@ -240,7 +252,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/settings/hooks/delete")(ownerOnly { repository =>
     deleteWebHook(repository.owner, repository.name, params("url"))
-    flash += "info" -> s"Webhook ${params("url")} deleted"
+    flash.update("info", s"Webhook ${params("url")} deleted")
     redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
   })
 
@@ -248,15 +260,16 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Send the test request to registered web hook URLs.
    */
   ajaxPost("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
-    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h =>
-      Array(h.getName, h.getValue)
-    }
+    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] =
+      h.map { h =>
+        Array(h.getName, h.getValue)
+      }
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
-        import scala.collection.JavaConverters._
         import scala.concurrent.duration._
         import scala.concurrent._
+        import scala.jdk.CollectionConverters._
         import scala.util.control.NonFatal
         import org.apache.http.util.EntityUtils
         import scala.concurrent.ExecutionContext.Implicits.global
@@ -264,7 +277,13 @@ trait RepositorySettingsControllerBase extends ControllerBase {
         val url = params("url")
         val token = Some(params("token"))
         val ctype = WebHookContentType.valueOf(params("ctype"))
-        val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
+        val dummyWebHookInfo = RepositoryWebHook(
+          userName = repository.owner,
+          repositoryName = repository.name,
+          url = url,
+          ctype = ctype,
+          token = token
+        )
         val dummyPayload = {
           val ownerAccount = getAccountByUserName(repository.owner).get
           val commits =
@@ -292,13 +311,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
           )
         }
 
-        val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
+        val (webHook, json, reqFuture, resFuture) =
+          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.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
           case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
-          case NonFatal(e)                                       => Map("error" -> (e.getClass + " " + e.getMessage))
+          case NonFatal(e)                                       => Map("error" -> (s"${e.getClass} ${e.getMessage}"))
         }
 
         contentType = formats("json")
@@ -350,7 +370,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/hooks/edit", webHookForm(true))(ownerOnly { (form, repository) =>
     updateWebHook(repository.owner, repository.name, form.url, form.events, form.ctype, form.token)
-    flash += "info" -> s"webhook ${form.url} updated"
+    flash.update("info", s"webhook ${form.url} updated")
     redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
   })
 
@@ -361,24 +381,58 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     html.danger(_, flash.get("info"))
   })
 
+  /**
+   * Rename repository.
+   */
+  post("/:owner/:repository/settings/rename", renameForm)(ownerOnly { (form, repository) =>
+    if (context.settings.repositoryOperation.rename || context.loginAccount.get.isAdmin) {
+      if (repository.name != form.repositoryName) {
+        // Update database and move git repository
+        renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+        // Record activity log
+        val renameInfo = RenameRepositoryInfo(
+          repository.owner,
+          form.repositoryName,
+          context.loginAccount.get.userName,
+          repository.name
+        )
+        recordActivity(renameInfo)
+      }
+      redirect(s"/${repository.owner}/${form.repositoryName}")
+    } else Forbidden()
+  })
+
   /**
    * Transfer repository ownership.
    */
   post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
-    // Change repository owner
-    if (repository.owner != form.newOwner) {
-      renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
-    }
-    redirect(s"/${form.newOwner}/${repository.name}")
+    if (context.settings.repositoryOperation.transfer || context.loginAccount.get.isAdmin) {
+      // Change repository owner
+      if (repository.owner != form.newOwner) {
+        // Update database and move git repository
+        renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+        // Record activity log
+        val renameInfo = RenameRepositoryInfo(
+          form.newOwner,
+          repository.name,
+          context.loginAccount.get.userName,
+          repository.owner
+        )
+        recordActivity(renameInfo)
+      }
+      redirect(s"/${form.newOwner}/${repository.name}")
+    } else Forbidden()
   })
 
   /**
    * Delete the repository.
    */
   post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
-    // Delete the repository and related files
-    deleteRepository(repository.repository)
-    redirect(s"/${repository.owner}")
+    if (context.settings.repositoryOperation.delete || context.loginAccount.get.isAdmin) {
+      // Delete the repository and related files
+      deleteRepository(repository.repository)
+      redirect(s"/${repository.owner}")
+    } else Forbidden()
   })
 
   /**
@@ -386,11 +440,11 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/gc")(ownerOnly { repository =>
     LockUtil.lock(s"${repository.owner}/${repository.name}") {
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         git.gc().call()
       }
     }
-    flash += "info" -> "Garbage collection has been executed."
+    flash.update("info", "Garbage collection has been executed.")
     redirect(s"/${repository.owner}/${repository.name}/settings/danger")
   })
 
@@ -415,32 +469,34 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    * Provides duplication check for web hook url.
    */
-  private def webHook(needExists: Boolean): Constraint = new Constraint() {
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if (getWebHook(params("owner"), params("repository"), value).isDefined != needExists) {
-        Some(if (needExists) {
-          "URL had not been registered yet."
+  private def webHook(needExists: Boolean): Constraint =
+    new Constraint() {
+      override def validate(name: String, value: String, messages: Messages): Option[String] =
+        if (getWebHook(params("owner"), params("repository"), value).isDefined != needExists) {
+          Some(if (needExists) {
+            "URL had not been registered yet."
+          } else {
+            "URL had been registered already."
+          })
         } else {
-          "URL had been registered already."
-        })
-      } else {
-        None
-      }
-  }
-
-  private def webhookEvents = new ValueType[Set[WebHook.Event]] {
-    def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
-      WebHook.Event.values.flatMap { t =>
-        params.get(name + "." + t.name).map(_ => t)
-      }.toSet
+          None
+        }
     }
-    def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
-      if (convert(name, params, messages).isEmpty) {
-        Seq(name -> messages("error.required").format(name))
-      } else {
-        Nil
+
+  private def webhookEvents =
+    new ValueType[Set[WebHook.Event]] {
+      def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
+        WebHook.Event.values.flatMap { t =>
+          params.get(name + "." + t.name).map(_ => t)
+        }.toSet
       }
-  }
+      def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
+        if (convert(name, params, messages).isEmpty) {
+          Seq(name -> messages("error.required").format(name))
+        } else {
+          Nil
+        }
+    }
 
 //  /**
 //   * Provides Constraint to validate the collaborator name.
@@ -460,70 +516,77 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    * Duplicate check for the rename repository name.
    */
-  private def renameRepositoryName: Constraint = new Constraint() {
-    override def validate(
-      name: String,
-      value: String,
-      params: Map[String, Seq[String]],
-      messages: Messages
-    ): Option[String] = {
-      for {
-        repoName <- params.optionValue("repository") if repoName != value
-        userName <- params.optionValue("owner")
-        _ <- getRepositoryNamesOfUser(userName).find(_ == value)
-      } yield {
-        "Repository already exists."
+  private def renameRepositoryName: Constraint =
+    new Constraint() {
+      override def validate(
+        name: String,
+        value: String,
+        params: Map[String, Seq[String]],
+        messages: Messages
+      ): Option[String] = {
+        for {
+          repoName <- params.optionValue("repository") if repoName != value
+          userName <- params.optionValue("owner")
+          _ <- getRepositoryNamesOfUser(userName).find(_ == value)
+        } yield {
+          "Repository already exists."
+        }
       }
     }
-  }
 
   /**
-   *
    */
-  private def featureOption: Constraint = new Constraint() {
-    override def validate(
-      name: String,
-      value: String,
-      params: Map[String, Seq[String]],
-      messages: Messages
-    ): Option[String] =
-      if (Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
-  }
+  private def featureOption: Constraint =
+    new Constraint() {
+      override def validate(
+        name: String,
+        value: String,
+        params: Map[String, Seq[String]],
+        messages: Messages
+      ): Option[String] =
+        if (Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
+    }
 
   /**
    * Provides Constraint to validate the repository transfer user.
    */
-  private def transferUser: Constraint = new Constraint() {
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value) match {
-        case None => Some("User does not exist.")
-        case Some(x) =>
-          if (x.userName == params("owner")) {
-            Some("This is current repository owner.")
-          } else {
-            params.get("repository").flatMap { repositoryName =>
-              getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map { _ =>
-                "User already has same repository."
+  private def transferUser: Constraint =
+    new Constraint() {
+      override def validate(name: String, value: String, messages: Messages): Option[String] =
+        getAccountByUserName(value) match {
+          case None => Some("User does not exist.")
+          case Some(x) =>
+            if (x.userName == params("owner")) {
+              Some("This is current repository owner.")
+            } else {
+              params.get("repository").flatMap { repositoryName =>
+                getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map { _ =>
+                  "User already has same repository."
+                }
               }
             }
-          }
-      }
-  }
+        }
+    }
 
-  private def mergeOptions = new ValueType[Seq[String]] {
-    override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = {
-      params.getOrElse("mergeOptions", Nil)
-    }
-    override def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = {
-      val mergeOptions = params.getOrElse("mergeOptions", Nil)
-      if (mergeOptions.isEmpty) {
-        Seq("mergeOptions" -> "At least one option must be enabled.")
-      } else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) {
-        Seq("mergeOptions" -> "mergeOptions are invalid.")
-      } else {
-        Nil
+  private def mergeOptions =
+    new ValueType[Seq[String]] {
+      override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = {
+        params.getOrElse("mergeOptions", Nil)
+      }
+      override def validate(
+        name: String,
+        params: Map[String, Seq[String]],
+        messages: Messages
+      ): Seq[(String, String)] = {
+        val mergeOptions = params.getOrElse("mergeOptions", Nil)
+        if (mergeOptions.isEmpty) {
+          Seq("mergeOptions" -> "At least one option must be enabled.")
+        } else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) {
+          Seq("mergeOptions" -> "mergeOptions are invalid.")
+        } else {
+          Nil
+        }
       }
     }
-  }
 
 }

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

@@ -1,11 +1,12 @@
 package gitbucket.core.controller
 
-import java.io.File
+import java.io.{File, FileInputStream, FileOutputStream}
 
+import scala.util.Using
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
-import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.repo.html
 import gitbucket.core.helper
+import gitbucket.core.model.activity.DeleteBranchInfo
 import gitbucket.core.service._
 import gitbucket.core.service.RepositoryCommitFileService.CommitFile
 import gitbucket.core.util._
@@ -13,7 +14,8 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import gitbucket.core.model.{Account, CommitState, CommitStatus}
+import gitbucket.core.model.Account
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.view
 import gitbucket.core.view.helpers
@@ -59,6 +61,7 @@ class RepositoryViewerController
     with WebHookPullRequestService
     with WebHookPullRequestReviewCommentService
     with ProtectedBranchService
+    with RequestCache
 
 /**
  * The repository viewer.
@@ -87,7 +90,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     branch: String,
     path: String,
     uploadFiles: String,
-    message: Option[String]
+    message: Option[String],
+    commit: String,
+    newBranch: Boolean
   )
 
   case class EditorForm(
@@ -99,7 +104,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     lineSeparator: String,
     newFileName: String,
     oldFileName: Option[String],
-    commit: String
+    commit: String,
+    newBranch: Boolean
   )
 
   case class DeleteForm(
@@ -107,7 +113,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     path: String,
     message: Option[String],
     fileName: String,
-    commit: String
+    commit: String,
+    newBranch: Boolean
   )
 
   case class CommentForm(
@@ -130,6 +137,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "path" -> trim(label("Path", text())),
     "uploadFiles" -> trim(label("Upload files", text(required))),
     "message" -> trim(label("Message", optional(text()))),
+    "commit" -> trim(label("Commit", text(required, conflict))),
+    "newBranch" -> trim(label("New Branch", boolean()))
   )(UploadForm.apply)
 
   val editorForm = mapping(
@@ -141,7 +150,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "lineSeparator" -> trim(label("Line Separator", text(required))),
     "newFileName" -> trim(label("Filename", text(required))),
     "oldFileName" -> trim(label("Old filename", optional(text()))),
-    "commit" -> trim(label("Commit", text(required, conflict)))
+    "commit" -> trim(label("Commit", text(required, conflict))),
+    "newBranch" -> trim(label("New Branch", boolean()))
   )(EditorForm.apply)
 
   val deleteForm = mapping(
@@ -149,7 +159,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "path" -> trim(label("Path", text())),
     "message" -> trim(label("Message", optional(text()))),
     "fileName" -> trim(label("Filename", text(required))),
-    "commit" -> trim(label("Commit", text(required, conflict)))
+    "commit" -> trim(label("Commit", text(required, conflict))),
+    "newBranch" -> trim(label("New Branch", boolean()))
   )(DeleteForm.apply)
 
   val commentForm = mapping(
@@ -251,23 +262,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val (branchName, path) = repository.splitPath(multiParams("splat").head)
     val page = params.get("page").flatMap(_.toIntOpt).getOrElse(1)
 
-    def getStatuses(sha: String): List[CommitStatus] = {
-      getCommitStatues(repository.owner, repository.name, sha)
-    }
-
-    def getSummary(statuses: List[CommitStatus]): (CommitState, String) = {
-      val stateMap = statuses.groupBy(_.state)
-      val state = CommitState.combine(stateMap.keySet)
-      val summary = stateMap.map { case (keyState, states) => states.size + " " + keyState.name }.mkString(", ")
-      state -> summary
-    }
-
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
-        def getTags(sha: String): List[String] = {
-          JGitUtil.getTagsOnCommit(git, sha)
-        }
-
         JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
           case Right((logs, hasNext)) =>
             html.commits(
@@ -276,34 +272,33 @@ trait RepositoryViewerControllerBase extends ControllerBase {
               repository,
               logs
                 .map {
-                  c =>
-                    CommitInfo(
-                      id = c.id,
-                      shortMessage = c.shortMessage,
-                      fullMessage = c.fullMessage,
-                      parents = c.parents,
-                      authorTime = c.authorTime,
-                      authorName = c.authorName,
-                      authorEmailAddress = c.authorEmailAddress,
-                      commitTime = c.commitTime,
-                      committerName = c.committerName,
-                      committerEmailAddress = c.committerEmailAddress,
-                      commitSign = c.commitSign,
-                      verified = c.commitSign
-                        .flatMap { s =>
-                          GpgUtil.verifySign(s)
-                        }
+                  commit =>
+                    (
+                      CommitInfo(
+                        id = commit.id,
+                        shortMessage = commit.shortMessage,
+                        fullMessage = commit.fullMessage,
+                        parents = commit.parents,
+                        authorTime = commit.authorTime,
+                        authorName = commit.authorName,
+                        authorEmailAddress = commit.authorEmailAddress,
+                        commitTime = commit.commitTime,
+                        committerName = commit.committerName,
+                        committerEmailAddress = commit.committerEmailAddress,
+                        commitSign = commit.commitSign,
+                        verified = commit.commitSign.flatMap(GpgUtil.verifySign)
+                      ),
+                      JGitUtil.getTagsOnCommit(git, commit.id),
+                      getCommitStatusWithSummary(repository.owner, repository.name, commit.id)
                     )
                 }
-                .splitWith { (commit1, commit2) =>
-                  view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
+                .splitWith {
+                  case ((commit1, _, _), (commit2, _, _)) =>
+                    view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
                 },
               page,
               hasNext,
-              hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-              getStatuses,
-              getSummary,
-              getTags
+              hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
             )
           case Left(_) => NotFound()
         }
@@ -315,7 +310,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
       .needStatusCheck(context.loginAccount.get.userName)
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
 
       html.editor(
@@ -334,7 +329,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val (branch, path) = repository.splitPath(multiParams("splat").head)
     val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
       .needStatusCheck(context.loginAccount.get.userName)
-    html.upload(branch, repository, if (path.length == 0) Nil else path.split("/").toList, protectedBranch)
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+      html.upload(
+        branch,
+        repository,
+        if (path.length == 0) Nil else path.split("/").toList,
+        protectedBranch,
+        revCommit.name
+      )
+    }
   })
 
   post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
@@ -347,35 +351,47 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       file.copy(name = if (form.path.length == 0) file.name else s"${form.path}/${file.name}")
     }
 
-    commitFiles(
-      repository = repository,
-      branch = form.branch,
-      path = form.path,
-      files = files,
-      message = form.message.getOrElse("Add files via upload"),
-      loginAccount = context.loginAccount.get
-    ) {
-      case (git, headTip, builder, inserter) =>
-        JGitUtil.processTree(git, headTip) { (path, tree) =>
-          if (!newFiles.exists(_.name.contains(path))) {
-            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-          }
-        }
-
-        newFiles.foreach { file =>
-          val bytes =
-            FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(file.id)))
-          builder.add(
-            JGitUtil.createDirCacheEntry(file.name, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes))
-          )
-          builder.finish()
-        }
+    if (form.newBranch) {
+      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
+      val objectId = _commit(newBranchName)
+      val issueId =
+        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
+      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+    } else {
+      _commit(form.branch)
+      if (form.path.length == 0) {
+        redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
+      } else {
+        redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
+      }
     }
 
-    if (form.path.length == 0) {
-      redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
-    } else {
-      redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
+    def _commit(branchName: String): ObjectId = {
+      commitFiles(
+        repository = repository,
+        branch = branchName,
+        path = form.path,
+        files = files.toIndexedSeq,
+        message = form.message.getOrElse("Add files via upload"),
+        loginAccount = context.loginAccount.get,
+        settings = context.settings
+      ) {
+        case (git, headTip, builder, inserter) =>
+          JGitUtil.processTree(git, headTip) { (path, tree) =>
+            if (!newFiles.exists(_.name.contains(path))) {
+              builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+            }
+          }
+
+          newFiles.foreach { file =>
+            val bytes =
+              FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(file.id)))
+            builder.add(
+              JGitUtil.createDirCacheEntry(file.name, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes))
+            )
+            builder.finish()
+          }
+      }
     }
   })
 
@@ -384,7 +400,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
       .needStatusCheck(context.loginAccount.get.userName)
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
 
@@ -411,7 +427,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   get("/:owner/:repository/remove/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
 
@@ -430,73 +446,160 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/create", editorForm)(writableUsersOnly { (form, repository) =>
-    commitFile(
-      repository = repository,
-      branch = form.branch,
-      path = form.path,
-      newFileName = Some(form.newFileName),
-      oldFileName = None,
-      content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
-      charset = form.charset,
-      message = form.message.getOrElse(s"Create ${form.newFileName}"),
-      commit = form.commit,
-      loginAccount = context.loginAccount.get
-    )
+    if (form.newBranch) {
+      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
+      val objectId = _commit(newBranchName)
+      val issueId =
+        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
+      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+    } else {
+      _commit(form.branch)
+      redirect(
+        s"/${repository.owner}/${repository.name}/blob/${form.branch}/${if (form.path.length == 0) urlEncode(form.newFileName)
+        else s"${form.path}/${urlEncode(form.newFileName)}"}"
+      )
+    }
 
-    redirect(
-      s"/${repository.owner}/${repository.name}/blob/${form.branch}/${if (form.path.length == 0) urlEncode(form.newFileName)
-      else s"${form.path}/${urlEncode(form.newFileName)}"}"
-    )
+    def _commit(branchName: String): ObjectId = {
+      commitFile(
+        repository = repository,
+        branch = branchName,
+        path = form.path,
+        newFileName = Some(form.newFileName),
+        oldFileName = None,
+        content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
+        charset = form.charset,
+        message = form.message.getOrElse(s"Create ${form.newFileName}"),
+        commit = form.commit,
+        loginAccount = context.loginAccount.get,
+        settings = context.settings
+      )
+    }
   })
 
   post("/:owner/:repository/update", editorForm)(writableUsersOnly { (form, repository) =>
-    commitFile(
-      repository = repository,
-      branch = form.branch,
-      path = form.path,
-      newFileName = Some(form.newFileName),
-      oldFileName = form.oldFileName,
-      content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
-      charset = form.charset,
-      message = if (form.oldFileName.contains(form.newFileName)) {
-        form.message.getOrElse(s"Update ${form.newFileName}")
-      } else {
-        form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
-      },
-      commit = form.commit,
-      loginAccount = context.loginAccount.get
-    )
+    if (form.newBranch) {
+      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
+      val objectId = _commit(newBranchName)
+      val issueId =
+        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
+      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+    } else {
+      _commit(form.branch)
+      redirect(
+        s"/${repository.owner}/${repository.name}/blob/${urlEncode(form.branch)}/${if (form.path.length == 0) urlEncode(form.newFileName)
+        else s"${form.path}/${urlEncode(form.newFileName)}"}"
+      )
+    }
 
-    redirect(
-      s"/${repository.owner}/${repository.name}/blob/${urlEncode(form.branch)}/${if (form.path.length == 0) urlEncode(form.newFileName)
-      else s"${form.path}/${urlEncode(form.newFileName)}"}"
-    )
+    def _commit(branchName: String): ObjectId = {
+      commitFile(
+        repository = repository,
+        branch = branchName,
+        path = form.path,
+        newFileName = Some(form.newFileName),
+        oldFileName = form.oldFileName,
+        content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
+        charset = form.charset,
+        message = if (form.oldFileName.contains(form.newFileName)) {
+          form.message.getOrElse(s"Update ${form.newFileName}")
+        } else {
+          form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
+        },
+        commit = form.commit,
+        loginAccount = context.loginAccount.get,
+        settings = context.settings
+      )
+    }
   })
 
   post("/:owner/:repository/remove", deleteForm)(writableUsersOnly { (form, repository) =>
-    commitFile(
-      repository = repository,
-      branch = form.branch,
-      path = form.path,
-      newFileName = None,
-      oldFileName = Some(form.fileName),
-      content = "",
-      charset = "",
-      message = form.message.getOrElse(s"Delete ${form.fileName}"),
-      commit = form.commit,
-      loginAccount = context.loginAccount.get
-    )
+    if (form.newBranch) {
+      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
+      val objectId = _commit(newBranchName)
+      val issueId =
+        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
+      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+    } else {
+      _commit(form.branch)
+      redirect(
+        s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) ""
+        else "/" + form.path}"
+      )
+    }
 
-    println(form.path)
-
-    redirect(
-      s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) "" else "/" + form.path}"
-    )
+    def _commit(branchName: String): ObjectId = {
+      commitFile(
+        repository = repository,
+        branch = branchName,
+        path = form.path,
+        newFileName = None,
+        oldFileName = Some(form.fileName),
+        content = "",
+        charset = "",
+        message = form.message.getOrElse(s"Delete ${form.fileName}"),
+        commit = form.commit,
+        loginAccount = context.loginAccount.get,
+        settings = context.settings
+      )
+    }
   })
 
+  private def getNewBranchName(repository: RepositoryInfo): String = {
+    var i = 1
+    val branchNamePrefix = cutTail(context.loginAccount.get.userName.replaceAll("[^a-zA-Z0-9-_]", "-"), 25)
+    while (repository.branchList.exists(p => p.contains(s"$branchNamePrefix-patch-$i"))) {
+      i += 1
+    }
+    s"$branchNamePrefix-patch-$i"
+  }
+
+  private def createNewBranchForPullRequest(repository: RepositoryInfo, baseBranchName: String): String = {
+    val newBranchName = getNewBranchName(repository)
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      JGitUtil.createBranch(git, baseBranchName, newBranchName)
+    }
+    newBranchName
+  }
+
+  private def createIssueAndPullRequest(
+    repository: RepositoryInfo,
+    baseBranch: String,
+    requestBranch: String,
+    commitIdFrom: String,
+    commitIdTo: String,
+    commitMessage: Option[String]
+  ): Int = {
+    val issueId = insertIssue(
+      owner = repository.owner,
+      repository = repository.name,
+      loginUser = context.loginAccount.get.userName,
+      title = requestBranch,
+      content = commitMessage,
+      assignedUserName = None,
+      milestoneId = None,
+      priorityId = None,
+      isPullRequest = true
+    )
+    createPullRequest(
+      originRepository = repository,
+      issueId = issueId,
+      originBranch = baseBranch,
+      requestUserName = repository.owner,
+      requestRepositoryName = repository.name,
+      requestBranch = requestBranch,
+      commitIdFrom = commitIdFrom,
+      commitIdTo = commitIdTo,
+      isDraft = false,
+      loginAccount = context.loginAccount.get,
+      settings = context.settings
+    )
+    issueId
+  }
+
   get("/:owner/:repository/raw/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
 
       getPathObjectId(git, path, revCommit).map { objectId =>
@@ -511,7 +614,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   val blobRoute = get("/:owner/:repository/blob/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
     val raw = params.get("raw").getOrElse("false").toBoolean
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    val highlighterTheme = getSyntaxHighlighterTheme()
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
         getPathObjectId(git, path, revCommit).map {
@@ -530,13 +634,25 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                 hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
                 isBlame = request.paths(2) == "blame",
                 isLfsFile = isLfsFile(git, objectId),
-                tabSize = info.tabSize
+                tabSize = info.tabSize,
+                highlighterTheme = highlighterTheme
               )
             }
         } getOrElse NotFound()
     }
   })
 
+  private def getSyntaxHighlighterTheme()(implicit context: Context): String = {
+    context.loginAccount match {
+      case Some(account) =>
+        getAccountPreference(account.userName) match {
+          case Some(x) => x.highlighterTheme
+          case _       => "github-v2"
+        }
+      case _ => "github-v2"
+    }
+  }
+
   private def isLfsFile(git: Git, objectId: ObjectId): Boolean = {
     JGitUtil.getObjectLoaderFromId(git, objectId)(JGitUtil.isLfsPointer).getOrElse(false)
   }
@@ -551,7 +667,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ajaxGet("/:owner/:repository/get-blame/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
     contentType = formats("json")
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
         val last = git.log.add(git.getRepository.resolve(id)).addPath(path).setMaxCount(1).call.iterator.next.name
         Serialization.write(
@@ -586,7 +702,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val id = params("id")
 
     try {
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
         git =>
           defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) {
             revCommit =>
@@ -598,6 +714,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                 new JGitUtil.CommitInfo(revCommit),
                 JGitUtil.getBranchesOfCommit(git, revCommit.getName),
                 JGitUtil.getTagsOfCommit(git, revCommit.getName),
+                getCommitStatusWithSummary(repository.owner, repository.name, revCommit.getName),
                 getCommitComments(repository.owner, repository.name, id, true),
                 repository,
                 diffs,
@@ -615,7 +732,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   get("/:owner/:repository/patch/:id")(referrersOnly { repository =>
     try {
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         val diff = JGitUtil.getPatch(git, None, params("id"))
         contentType = formats("txt")
         diff
@@ -628,7 +745,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository/patch/*...*")(referrersOnly { repository =>
     try {
       val Seq(fromId, toId) = multiParams("splat")
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         val diff = JGitUtil.getPatch(git, Some(fromId), toId)
         contentType = formats("txt")
         diff
@@ -748,7 +865,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/branches")(referrersOnly { repository =>
     val protectedBranches = getProtectedBranchList(repository.owner, repository.name).toSet
-    val branches = using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    val branches = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
         JGitUtil
           .getBranches(
@@ -756,19 +873,20 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             defaultBranch = repository.repository.defaultBranch,
             origin = repository.repository.originUserName.isEmpty
           )
-          .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+          .sortBy(branch => (branch.mergeInfo.isEmpty, branch.commitTime))
           .map(
-            br =>
+            branch =>
               (
-                br,
+                branch,
                 getPullRequestByRequestCommit(
                   repository.owner,
                   repository.name,
                   repository.repository.defaultBranch,
-                  br.name,
-                  br.commitId
+                  branch.name,
+                  branch.commitId
                 ),
-                protectedBranches.contains(br.name)
+                protectedBranches.contains(branch.name),
+                getCommitStatusWithSummary(repository.owner, repository.name, branch.commitId)
             )
           )
           .reverse
@@ -788,14 +906,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Creates a tag.
    */
   post("/:owner/:repository/tag", tagForm)(writableUsersOnly { (form, repository) =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.createTag(git, form.tagName, form.message, form.commitId)
     } match {
       case Right(message) =>
-        flash += "info" -> message
+        flash.update("info", message)
         redirect(s"/${repository.owner}/${repository.name}/commit/${form.commitId}")
       case Left(message) =>
-        flash += "error" -> message
+        flash.update("error", message)
         redirect(s"/${repository.owner}/${repository.name}/commit/${form.commitId}")
     }
   })
@@ -806,16 +924,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   post("/:owner/:repository/branches")(writableUsersOnly { repository =>
     val newBranchName = params.getOrElse("new", halt(400))
     val fromBranchName = params.getOrElse("from", halt(400))
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.createBranch(git, fromBranchName, newBranchName)
     } match {
       case Right(message) =>
-        flash += "info" -> message
+        flash.update("info", message)
         redirect(
           s"/${repository.owner}/${repository.name}/tree/${StringUtil.urlEncode(newBranchName).replace("%2F", "/")}"
         )
       case Left(message) =>
-        flash += "error" -> message
+        flash.update("error", message)
         redirect(s"/${repository.owner}/${repository.name}/tree/${fromBranchName}")
     }
   })
@@ -827,9 +945,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val branchName = multiParams("splat").head
     val userName = context.loginAccount.get.userName
     if (repository.repository.defaultBranch != branchName) {
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         git.branchDelete().setForce(true).setBranchNames(branchName).call()
-        recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+        val deleteBranchInfo = DeleteBranchInfo(repository.owner, repository.name, userName, branchName)
+        recordActivity(deleteBranchInfo)
       }
     }
     redirect(s"/${repository.owner}/${repository.name}/branches")
@@ -879,7 +998,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Displays the file find of branch.
    */
   get("/:owner/:repository/find/*")(referrersOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val ref = multiParams("splat").head
       JGitUtil.getTreeId(git, ref).map { treeId =>
         html.find(ref, treeId, repository)
@@ -891,7 +1010,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Get all file list of branch.
    */
   ajaxGet("/:owner/:repository/tree-list/:tree")(referrersOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val treeId = params("tree")
       contentType = formats("json")
       Map("paths" -> JGitUtil.getAllFileListByTreeId(git, treeId))
@@ -902,10 +1021,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     lazy val isValid: Boolean = fileIds.nonEmpty
   }
 
-  private val readmeFiles = PluginRegistry().renderableExtensions.map { extension =>
-    s"readme.${extension}"
-  } ++ Seq("readme.txt", "readme")
-
   /**
    * Provides HTML of the file list.
    *
@@ -915,7 +1030,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * @return HTML of the file list
    */
   private def fileList(repository: RepositoryService.RepositoryInfo, revstr: String = "", path: String = ".") = {
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       if (JGitUtil.isEmpty(git)) {
         html.guide(repository, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
       } else {
@@ -925,13 +1040,21 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
               val lastModifiedCommit =
                 if (path == ".") revCommit else JGitUtil.getLastModifiedCommit(git, revCommit, path)
+              val commitCount = JGitUtil.getCommitCount(git, lastModifiedCommit.getName)
               // get files
-              val files = JGitUtil.getFileList(git, revision, path, context.settings.baseUrl)
+              val files = JGitUtil.getFileList(
+                git,
+                revision,
+                path,
+                context.settings.baseUrl,
+                commitCount,
+                context.settings.repositoryViewer.maxFiles
+              )
               val parentPath = if (path == ".") Nil else path.split("/").toList
-              // process README.md or README.markdown
-              val readme = files
+              // process README
+              val readme = files // files should be sorted alphabetically.
                 .find { file =>
-                  !file.isDirectory && readmeFiles.contains(file.name.toLowerCase)
+                  !file.isDirectory && RepositoryService.readmeFiles.contains(file.name.toLowerCase)
                 }
                 .map { file =>
                   val path = (file.name :: parentPath.reverse).reverse
@@ -947,7 +1070,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                 repository,
                 if (path == ".") Nil else path.split("/").toList, // current path
                 new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
-                JGitUtil.getCommitCount(git, lastModifiedCommit.getName),
+                getCommitStatusWithSummary(repository.owner, repository.name, lastModifiedCommit.getName),
+                commitCount,
                 files,
                 readme,
                 hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
@@ -974,16 +1098,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     def archive(revision: String, archiveFormat: String, archive: ArchiveOutputStream)(
       entryCreator: (String, Long, java.util.Date, Int) => ArchiveEntry
     ): Unit = {
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         val oid = git.getRepository.resolve(revision)
         val commit = JGitUtil.getRevCommitFromId(git, oid)
         val date = commit.getCommitterIdent.getWhen
         val sha1 = oid.getName()
         val repositorySuffix = (if (sha1.startsWith(revision)) sha1 else revision).replace('/', '-')
-        val pathSuffix = if (path.isEmpty) "" else '-' + path.replace('/', '-')
+        val pathSuffix = if (path.isEmpty) "" else s"-${path.replace('/', '-')}"
         val baseName = repository.name + "-" + repositorySuffix + pathSuffix
 
-        using(new TreeWalk(git.getRepository)) { treeWalk =>
+        Using.resource(new TreeWalk(git.getRepository)) { treeWalk =>
           treeWalk.addTree(commit.getTree)
           treeWalk.setRecursive(true)
           if (!path.isEmpty) {
@@ -994,24 +1118,31 @@ trait RepositoryViewerControllerBase extends ControllerBase {
               val entryPath =
                 if (path.isEmpty) baseName + "/" + treeWalk.getPathString
                 else path.split("/").last + treeWalk.getPathString.substring(path.length)
-              val size = JGitUtil.getContentSize(git.getRepository.open(treeWalk.getObjectId(0)))
               val mode = treeWalk.getFileMode.getBits
-              val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
               JGitUtil.openFile(git, repository, commit.getTree, treeWalk.getPathString) { in =>
+                val tempFile = File.createTempFile("gitbucket", ".archive")
+                val size = Using.resource(new FileOutputStream(tempFile)) { out =>
+                  IOUtils.copy(
+                    EolStreamTypeUtil.wrapInputStream(
+                      in,
+                      EolStreamTypeUtil
+                        .detectStreamType(
+                          OperationType.CHECKOUT_OP,
+                          git.getRepository.getConfig.get(WorkingTreeOptions.KEY),
+                          treeWalk.getAttributes
+                        )
+                    ),
+                    out
+                  )
+                }
+
+                val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
                 archive.putArchiveEntry(entry)
-                IOUtils.copy(
-                  EolStreamTypeUtil.wrapInputStream(
-                    in,
-                    EolStreamTypeUtil
-                      .detectStreamType(
-                        OperationType.CHECKOUT_OP,
-                        git.getRepository.getConfig.get(WorkingTreeOptions.KEY),
-                        treeWalk.getAttributes
-                      )
-                  ),
-                  archive
-                )
+                Using.resource(new FileInputStream(tempFile)) { in =>
+                  IOUtils.copy(in, archive)
+                }
                 archive.closeArchiveEntry()
+                tempFile.delete()
               }
             }
           }
@@ -1032,9 +1163,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         )
         contentType = "application/octet-stream"
         response.setBufferSize(1024 * 1024)
-        using(new ZipArchiveOutputStream(response.getOutputStream)) { zip =>
+        Using.resource(new ZipArchiveOutputStream(response.getOutputStream)) { zip =>
           archive(revision, ".zip", zip) { (path, size, date, mode) =>
             val entry = new ZipArchiveEntry(path)
+            entry.setSize(size)
             entry.setUnixMode(mode)
             entry.setTime(date.getTime)
             entry
@@ -1048,17 +1180,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         )
         contentType = "application/octet-stream"
         response.setBufferSize(1024 * 1024)
-        using(compressor match {
+        Using.resource(compressor match {
           case "gz"  => new GzipCompressorOutputStream(response.getOutputStream)
           case "bz2" => new BZip2CompressorOutputStream(response.getOutputStream)
           case "xz"  => new XZCompressorOutputStream(response.getOutputStream)
         }) { compressorOutputStream =>
-          using(new TarArchiveOutputStream(compressorOutputStream)) { tar =>
+          Using.resource(new TarArchiveOutputStream(compressorOutputStream)) { tar =>
             tar.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR)
             tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU)
             tar.setAddPaxHeadersForNonAsciiNames(true)
             archive(revision, ".tar.gz", tar) { (path, size, date, mode) =>
               val entry = new TarArchiveEntry(path)
+              entry.setSize(size)
               entry.setModTime(date)
               entry.setMode(mode)
               entry
@@ -1081,7 +1214,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       val branch = params("branch")
 
       LockUtil.lock(s"${owner}/${repository}") {
-        using(Git.open(getRepositoryDir(owner, repository))) { git =>
+        Using.resource(Git.open(getRepositoryDir(owner, repository))) { git =>
           val headName = s"refs/heads/${branch}"
           val headTip = git.getRepository.resolve(headName)
           if (headTip.getName != value) {

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

@@ -2,14 +2,11 @@ package gitbucket.core.controller
 
 import java.io.FileInputStream
 
-import com.github.zafarkhaja.semver.{Version => Semver}
-import gitbucket.core.GitBucketCoreModule
 import gitbucket.core.admin.html
-import gitbucket.core.plugin.{PluginInfoBase, PluginRegistry, PluginRepository}
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService._
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.ssh.SshServer
-import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
@@ -21,8 +18,8 @@ import org.scalatra._
 import org.scalatra.forms._
 import org.scalatra.i18n.Messages
 
-import scala.collection.JavaConverters._
 import scala.collection.mutable.ListBuffer
+import scala.util.Using
 
 class SystemSettingsController
     extends SystemSettingsControllerBase
@@ -41,14 +38,21 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "information" -> trim(label("Information", optional(text()))),
     "allowAccountRegistration" -> trim(label("Account registration", boolean())),
     "allowAnonymousAccess" -> trim(label("Anonymous access", boolean())),
-    "isCreateRepoOptionPublic" -> trim(label("Default option to create a new repository", boolean())),
+    "isCreateRepoOptionPublic" -> trim(label("Default visibility of new repository", boolean())),
+    "repositoryOperation" -> mapping(
+      "create" -> trim(label("Allow all users to create repository", boolean())),
+      "delete" -> trim(label("Allow all users to delete repository", boolean())),
+      "rename" -> trim(label("Allow all users to rename repository", boolean())),
+      "transfer" -> trim(label("Allow all users to transfer repository", boolean())),
+      "fork" -> trim(label("Allow all users to fork repository", boolean()))
+    )(RepositoryOperation.apply),
     "gravatar" -> trim(label("Gravatar", boolean())),
     "notification" -> trim(label("Notification", boolean())),
-    "activityLogLimit" -> trim(label("Limit of activity logs", optional(number()))),
+    "limitVisibleRepositories" -> trim(label("limitVisibleRepositories", boolean())),
     "ssh" -> mapping(
       "enabled" -> trim(label("SSH access", boolean())),
       "host" -> trim(label("SSH host", optional(text()))),
-      "port" -> trim(label("SSH port", optional(number()))),
+      "port" -> trim(label("SSH port", optional(number())))
     )(Ssh.apply),
     "useSMTP" -> trim(label("SMTP", boolean())),
     "smtp" -> optionalIfNotChecked(
@@ -93,17 +97,21 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       )(OIDC.apply)
     ),
     "skinName" -> trim(label("AdminLTE skin name", text(required))),
+    "userDefinedCss" -> trim(label("User-defined CSS", optional(text()))),
     "showMailAddress" -> trim(label("Show mail address", boolean())),
-    "pluginNetworkInstall" -> trim(label("Network plugin installation", boolean())),
-    "proxy" -> optionalIfNotChecked(
-      "useProxy",
-      mapping(
-        "host" -> trim(label("Proxy host", text(required))),
-        "port" -> trim(label("Proxy port", number())),
-        "user" -> trim(label("Keystore", optional(text()))),
-        "password" -> trim(label("Keystore", optional(text())))
-      )(Proxy.apply)
-    )
+    "webhook" -> mapping(
+      "blockPrivateAddress" -> trim(label("Block private address", boolean())),
+      "whitelist" -> trim(label("Whitelist", multiLineText()))
+    )(WebHook.apply),
+    "upload" -> mapping(
+      "maxFileSize" -> trim(label("Max file size", long(required))),
+      "timeout" -> trim(label("Timeout", long(required))),
+      "largeMaxFileSize" -> trim(label("Max file size for large file", long(required))),
+      "largeTimeout" -> trim(label("Timeout for large file", long(required)))
+    )(Upload.apply),
+    "repositoryViewer" -> mapping(
+      "maxFiles" -> trim(label("Max files", number(required)))
+    )(RepositoryViewerSettings.apply)
   )(SystemSettings.apply).verifying { settings =>
     Vector(
       if (settings.ssh.enabled && settings.baseUrl.isEmpty) {
@@ -179,7 +187,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   val newUserForm = mapping(
     "userName" -> trim(label("Username", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password" -> trim(label("Password", text(required, maxlength(20), password))),
+    "password" -> trim(label("Password", text(required, maxlength(20)))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
     "extraMailAddresses" -> list(
@@ -193,7 +201,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   val editUserForm = mapping(
     "userName" -> trim(label("Username", text(required, maxlength(100), identifier))),
-    "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
+    "password" -> trim(label("Password", optional(text(maxlength(20))))),
     "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
     "extraMailAddresses" -> list(
@@ -229,30 +237,30 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     val conn = request2Session(request).conn
     val meta = conn.getMetaData
     val tables = ListBuffer[Table]()
-    using(meta.getTables(null, "%", "%", Array("TABLE", "VIEW"))) {
+    Using.resource(meta.getTables(null, "%", "%", Array("TABLE", "VIEW"))) {
       rs =>
         while (rs.next()) {
           val tableName = rs.getString("TABLE_NAME")
 
           val pkColumns = ListBuffer[String]()
-          using(meta.getPrimaryKeys(null, null, tableName)) { rs =>
+          Using.resource(meta.getPrimaryKeys(null, null, tableName)) { rs =>
             while (rs.next()) {
               pkColumns += rs.getString("COLUMN_NAME").toUpperCase
             }
           }
 
           val columns = ListBuffer[Column]()
-          using(meta.getColumns(null, "%", tableName, "%")) { rs =>
+          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)
+          tables += Table(tableName.toUpperCase, columns.toSeq)
         }
     }
-    html.dbviewer(tables)
+    html.dbviewer(tables.toSeq)
   })
 
   post("/admin/dbviewer/_query")(adminOnly {
@@ -263,10 +271,10 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         if (trimmedQuery.nonEmpty) {
           try {
             val conn = request2Session(request).conn
-            using(conn.prepareStatement(query)) {
+            Using.resource(conn.prepareStatement(query)) {
               stmt =>
                 if (trimmedQuery.toUpperCase.startsWith("SELECT")) {
-                  using(stmt.executeQuery()) {
+                  Using.resource(stmt.executeQuery()) {
                     rs =>
                       val meta = rs.getMetaData
                       val columns = for (i <- 1 to meta.getColumnCount) yield {
@@ -309,7 +317,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       } SshServer.start(sshAddress, baseUrl)
     }
 
-    flash += "info" -> "System settings has been updated."
+    flash.update("info", "System settings has been updated.")
     redirect("/admin/system")
   })
 
@@ -332,63 +340,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   })
 
   get("/admin/plugins")(adminOnly {
-    // Installed plugins
-    val enabledPlugins = PluginRegistry().getPlugins()
-    val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
-    val gitbucketSemver = Semver.valueOf(gitbucketVersion)
-
-    // Plugins in the remote repository
-    val repositoryPlugins = if (context.settings.pluginNetworkInstall) {
-      PluginRepository
-        .getPlugins()
-        .map {
-          meta =>
-            (meta, meta.versions.reverse.find {
-              version =>
-                val semver = Semver.valueOf(version.version)
-                gitbucketVersion == version.gitbucketVersion && !enabledPlugins.exists { plugin =>
-                  if (plugin.pluginId == meta.id) {
-                    Semver.valueOf(plugin.pluginVersion) match {
-                      case x if x.greaterThan(semver) => true
-                      case x if x.equals(semver) =>
-                        plugin.gitbucketVersion match {
-                          case None    => true
-                          case Some(x) => Semver.valueOf(x).greaterThanOrEqualTo(gitbucketSemver)
-                        }
-                      case _ => false
-                    }
-                  } else false
-                }
-            })
-        }
-        .collect {
-          case (meta, Some(version)) =>
-            new PluginInfoBase(
-              pluginId = meta.id,
-              pluginName = meta.name,
-              pluginVersion = version.version,
-              gitbucketVersion = Some(version.gitbucketVersion),
-              description = meta.description
-            )
-        }
-    } else Nil
-
-    // Merge
-    val plugins = (enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false)))
-      .groupBy(_._1.pluginId)
-      .map {
-        case (pluginId, plugins) =>
-          val (plugin, enabled) = plugins.head
-          (plugin, enabled, if (plugins.length > 1) plugins.last._1.pluginVersion else "")
-      }
-      .toList
-
-    html.plugins(plugins, flash.get("info"))
+    html.plugins(PluginRegistry().getPlugins(), flash.get("info"))
   })
 
   post("/admin/plugins/_reload")(adminOnly {
     PluginRegistry.reload(request.getServletContext(), loadSystemSettings(), request2Session(request).conn)
-    flash += "info" -> "All plugins were reloaded."
+    flash.update("info", "All plugins were reloaded.")
     redirect("/admin/plugins")
   })
 
@@ -398,37 +355,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     if (PluginRegistry().getPlugins().exists(_.pluginId == pluginId)) {
       PluginRegistry
         .uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
-      flash += "info" -> s"${pluginId} was uninstalled."
-    }
-
-    redirect("/admin/plugins")
-  })
-
-  post("/admin/plugins/:pluginId/:version/_install")(adminOnly {
-    if (context.settings.pluginNetworkInstall) {
-      val pluginId = params("pluginId")
-      val version = params("version")
-      val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion
-
-      PluginRepository
-        .getPlugins()
-        .collectFirst {
-          case meta if meta.id == pluginId =>
-            (meta, meta.versions.find(x => x.gitbucketVersion == gitbucketVersion && x.version == version))
-        }
-        .foreach {
-          case (meta, version) =>
-            version.foreach { version =>
-              PluginRegistry.install(
-                pluginId,
-                new java.net.URL(version.url),
-                request.getServletContext,
-                loadSystemSettings(),
-                request2Session(request).conn
-              )
-              flash += "info" -> s"${pluginId}:${version.version} was installed."
-            }
-        }
+      flash.update("info", s"${pluginId} was uninstalled.")
     }
 
     redirect("/admin/plugins")
@@ -476,7 +403,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(userName, true).map {
       account =>
         if (account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)) {
-          flash += "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")
         } else {
           if (form.isRemoved) {
@@ -601,31 +528,44 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     response.setHeader("Content-Disposition", "attachment; filename=" + file.getName)
     response.setContentLength(file.length.toInt)
 
-    using(new FileInputStream(file)) { in =>
+    Using.resource(new FileInputStream(file)) { in =>
       IOUtils.copy(in, response.outputStream)
     }
 
     ()
   })
 
-  private def members: Constraint = new Constraint() {
-    override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      if (value.split(",").exists {
-            _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
-          }) None
-      else Some("Must select one manager at least.")
-    }
-  }
-
-  protected def disableByNotYourself(paramName: String): Constraint = new Constraint() {
-    override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      params.get(paramName).flatMap { userName =>
-        if (userName == context.loginAccount.get.userName && params.get("removed") == Some("true"))
-          Some("You can't disable your account yourself")
-        else
-          None
+  private def multiLineText(constraints: Constraint*): SingleValueType[Seq[String]] =
+    new SingleValueType[Seq[String]](constraints: _*) {
+      def convert(value: String, messages: Messages): Seq[String] = {
+        if (value == null) {
+          Nil
+        } else {
+          value.split("\n").toIndexedSeq.map(_.trim)
+        }
+      }
+    }
+
+  private def members: Constraint =
+    new Constraint() {
+      override def validate(name: String, value: String, messages: Messages): Option[String] = {
+        if (value.split(",").exists {
+              _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+            }) None
+        else Some("Must select one manager at least.")
+      }
+    }
+
+  protected def disableByNotYourself(paramName: String): Constraint =
+    new Constraint() {
+      override def validate(name: String, value: String, messages: Messages): Option[String] = {
+        params.get(paramName).flatMap { userName =>
+          if (userName == context.loginAccount.get.userName && params.get("removed") == Some("true"))
+            Some("You can't disable your account yourself")
+          else
+            None
+        }
       }
     }
-  }
 
 }

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

@@ -1,6 +1,7 @@
 package gitbucket.core.controller
 
 import gitbucket.core.model.WebHook
+import gitbucket.core.model.activity.{CreateWikiPageInfo, DeleteWikiInfo, EditWikiPageInfo}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.WebHookService.WebHookGollumPayload
 import gitbucket.core.wiki.html
@@ -14,6 +15,8 @@ import org.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
 
+import scala.util.Using
+
 class WikiController
     extends WikiControllerBase
     with WikiService
@@ -23,6 +26,7 @@ class WikiController
     with WebHookService
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator
+    with RequestCache
 
 trait WikiControllerBase extends ControllerBase {
   self: WikiService
@@ -90,7 +94,7 @@ trait WikiControllerBase extends ControllerBase {
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
         case Right((logs, hasNext)) => html.history(Some(pageName), logs, repository, isEditable(repository))
         case Left(_)                => NotFound()
@@ -102,7 +106,7 @@ trait WikiControllerBase extends ControllerBase {
     val pageName = StringUtil.urlDecode(params("page"))
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       html.compare(
         Some(pageName),
         from,
@@ -118,7 +122,7 @@ trait WikiControllerBase extends ControllerBase {
   get("/:owner/:repository/wiki/_compare/:commitId")(referrersOnly { repository =>
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       html.compare(
         None,
         from,
@@ -139,7 +143,7 @@ trait WikiControllerBase extends ControllerBase {
       if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))) {
         redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
       } else {
-        flash += "info" -> "This patch was not able to be reversed."
+        flash.update("info", "This patch was not able to be reversed.")
         redirect(
           s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
         )
@@ -154,7 +158,7 @@ trait WikiControllerBase extends ControllerBase {
       if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)) {
         redirect(s"/${repository.owner}/${repository.name}/wiki")
       } else {
-        flash += "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}")
       }
     } else Unauthorized()
@@ -183,14 +187,10 @@ trait WikiControllerBase extends ControllerBase {
           ).foreach {
             commitId =>
               updateLastActivityDate(repository.owner, repository.name)
-              recordEditWikiPageActivity(
-                repository.owner,
-                repository.name,
-                loginAccount.userName,
-                form.pageName,
-                commitId
-              )
-              callWebHookOf(repository.owner, repository.name, WebHook.Gollum) {
+              val wikiEditInfo =
+                EditWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+              recordActivity(wikiEditInfo)
+              callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
                 getAccountByUserName(repository.owner).map { repositoryUser =>
                   WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
                 }
@@ -227,8 +227,10 @@ trait WikiControllerBase extends ControllerBase {
           ).foreach {
             commitId =>
               updateLastActivityDate(repository.owner, repository.name)
-              recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
-              callWebHookOf(repository.owner, repository.name, WebHook.Gollum) {
+              val createWikiPageInfo =
+                CreateWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName)
+              recordActivity(createWikiPageInfo)
+              callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
                 getAccountByUserName(repository.owner).map { repositoryUser =>
                   WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
                 }
@@ -249,14 +251,13 @@ trait WikiControllerBase extends ControllerBase {
       val pageName = StringUtil.urlDecode(params("page"))
 
       defining(context.loginAccount.get) { loginAccount =>
-        deleteWikiPage(
+        val deleteWikiInfo = DeleteWikiInfo(
           repository.owner,
           repository.name,
-          pageName,
-          loginAccount.fullName,
-          loginAccount.mailAddress,
-          s"Destroyed ${pageName}"
+          loginAccount.userName,
+          pageName
         )
+        recordActivity(deleteWikiInfo)
         updateLastActivityDate(repository.owner, repository.name)
 
         redirect(s"/${repository.owner}/${repository.name}/wiki")
@@ -269,7 +270,7 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.getCommitLog(git, "master") match {
         case Right((logs, hasNext)) => html.history(None, logs, repository, isEditable(repository))
         case Left(_)                => NotFound()
@@ -279,7 +280,7 @@ trait WikiControllerBase extends ControllerBase {
 
   get("/:owner/:repository/wiki/_blob/*")(referrersOnly { repository =>
     val path = multiParams("splat").head
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve("master"))
 
       getPathObjectId(git, path, revCommit).map { objectId =>

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

@@ -1,23 +1,40 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiObject, ApiRef, JsonFormat}
+import gitbucket.core.api.{ApiObject, ApiRef, CreateARef, JsonFormat, UpdateARef}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.ReferrerAuthenticator
-import gitbucket.core.util.SyntaxSugars.using
 import gitbucket.core.util.Implicits._
 import org.eclipse.jgit.api.Git
-import scala.collection.JavaConverters._
+import org.eclipse.jgit.lib.ObjectId
+import org.eclipse.jgit.lib.RefUpdate.Result
+import org.scalatra.{BadRequest, NoContent, UnprocessableEntity}
+import org.slf4j.LoggerFactory
+
+import scala.jdk.CollectionConverters._
+import scala.util.Using
 
 trait ApiGitReferenceControllerBase extends ControllerBase {
   self: ReferrerAuthenticator =>
 
+  private val logger = LoggerFactory.getLogger(classOf[ApiGitReferenceControllerBase])
+
   /*
    * i. Get a reference
-   * https://developer.github.com/v3/git/refs/#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()
+  })
+
+  // 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(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
       val ref = git.getRepository().findRef(revstr)
 
       if (ref != null) {
@@ -37,24 +54,83 @@ trait ApiGitReferenceControllerBase extends ControllerBase {
         })
       }
     }
-  })
+  }
+
   /*
    * ii. Get all references
-   * https://developer.github.com/v3/git/refs/#get-all-references
+   * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#list-matching-references
    */
 
   /*
    * iii. Create a reference
-   * https://developer.github.com/v3/git/refs/#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 { _ =>
+    extractFromJsonBody[CreateARef].map {
+      data =>
+        Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+          val ref = git.getRepository.findRef(data.ref)
+          if (ref == null) {
+            val update = git.getRepository.updateRef(data.ref)
+            update.setNewObjectId(ObjectId.fromString(data.sha))
+            val result = update.update()
+            result match {
+              case Result.NEW => JsonFormat(ApiRef(update.getName, ApiObject(update.getNewObjectId.getName)))
+              case _          => UnprocessableEntity(result.name())
+            }
+          } else {
+            UnprocessableEntity("Ref already exists.")
+          }
+        }
+    } getOrElse BadRequest()
+  })
 
   /*
    * iv. Update a reference
-   * https://developer.github.com/v3/git/refs/#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 { _ =>
+    val refName = multiParams("splat").mkString("/")
+    extractFromJsonBody[UpdateARef].map {
+      data =>
+        Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+          val ref = git.getRepository.findRef(refName)
+          if (ref == null) {
+            UnprocessableEntity("Ref does not exist.")
+          } else {
+            val update = git.getRepository.updateRef(ref.getName)
+            update.setNewObjectId(ObjectId.fromString(data.sha))
+            update.setForceUpdate(data.force)
+            val result = update.update()
+            result match {
+              case Result.FORCED | Result.FAST_FORWARD | Result.NO_CHANGE =>
+                JsonFormat(ApiRef(update.getName, ApiObject(update.getNewObjectId.getName)))
+              case _ => UnprocessableEntity(result.name())
+            }
+          }
+        }
+    } getOrElse BadRequest()
+  })
 
   /*
- * v. Delete a reference
- * https://developer.github.com/v3/git/refs/#delete-a-reference
- */
+   * 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 { _ =>
+    val refName = multiParams("splat").mkString("/")
+    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+      val ref = git.getRepository.findRef(refName)
+      if (ref == null) {
+        UnprocessableEntity("Ref does not exist.")
+      } else {
+        val update = git.getRepository.updateRef(ref.getName)
+        update.setForceUpdate(true)
+        val result = update.delete()
+        result match {
+          case Result.FORCED => NoContent()
+          case _             => UnprocessableEntity(result.name())
+        }
+      }
+    }
+  })
 }

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

@@ -4,6 +4,7 @@ import gitbucket.core.controller.{Context, ControllerBase}
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName}
+import org.scalatra.{ActionResult, NoContent}
 
 trait ApiIssueCommentControllerBase extends ControllerBase {
   self: AccountService
@@ -14,8 +15,8 @@ trait ApiIssueCommentControllerBase extends ControllerBase {
     with ReadableUsersAuthenticator
     with ReferrerAuthenticator =>
   /*
-   * i. List comments on an issue
-   * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
+   * i. List issue comments for a repository
+   * https://docs.github.com/en/rest/reference/issues#list-issue-comments-for-a-repository
    */
   get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
     (for {
@@ -30,18 +31,90 @@ trait ApiIssueCommentControllerBase extends ControllerBase {
   })
 
   /*
-   * ii. List comments in a repository
-   * https://developer.github.com/v3/issues/comments/#list-comments-in-a-repository
+   * ii. Get an issue comment
+   * https://docs.github.com/en/rest/reference/issues#get-an-issue-comment
+   */
+  get("/api/v3/repos/:owner/:repository/issues/comments/:id")(referrersOnly { repository =>
+    val commentId = params("id").toInt
+    getCommentForApi(repository.owner, repository.name, commentId) match {
+      case Some((issueComment, user, issue)) =>
+        JsonFormat(
+          ApiComment(issueComment, RepositoryName(repository), issue.issueId, ApiUser(user), issue.isPullRequest)
+        )
+      case _ => NotFound()
+    }
+  })
+
+  /*
+   * iii. Update an issue comment
+   * https://docs.github.com/en/rest/reference/issues#update-an-issue-comment
+   */
+  patch("/api/v3/repos/:owner/:repository/issues/comments/:id")(readableUsersOnly { repository =>
+    val commentId = params("id")
+    val result = for {
+      issueComment <- getComment(repository.owner, repository.name, commentId)
+      issue <- getIssue(repository.owner, repository.name, issueComment.issueId.toString)
+    } yield {
+      if (isEditable(repository.owner, repository.name, issueComment.commentedUserName)) {
+        val body = extractFromJsonBody[CreateAComment].map(_.body)
+        updateCommentByApi(repository, issue, issueComment.commentId.toString, body)
+        getComment(repository.owner, repository.name, commentId) match {
+          case Some(issueComment) =>
+            JsonFormat(
+              ApiComment(
+                issueComment,
+                RepositoryName(repository),
+                issue.issueId,
+                ApiUser(context.loginAccount.get),
+                issue.isPullRequest
+              )
+            )
+          case _ =>
+        }
+      } else {
+        Unauthorized()
+      }
+    }
+    result match {
+      case Some(response) => response
+      case None           => NotFound()
+    }
+  })
+
+  /*
+   * 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 =>
+    val maybeDeleteResponse: Option[Either[ActionResult, Option[Int]]] =
+      for {
+        commentId <- params("id").toIntOpt
+        comment <- getComment(repository.owner, repository.name, commentId.toString)
+        issue <- getIssue(repository.owner, repository.name, comment.issueId.toString)
+      } yield {
+        if (isEditable(repository.owner, repository.name, comment.commentedUserName)) {
+          val maybeDeletedComment = deleteCommentByApi(repository, comment, issue)
+          Right(maybeDeletedComment.map(_.commentId))
+        } else {
+          Left(Unauthorized())
+        }
+      }
+    maybeDeleteResponse
+      .map {
+        case Right(maybeDeletedCommentId) => maybeDeletedCommentId.getOrElse(NotFound())
+        case Left(err)                    => err
+      }
+      .getOrElse(NotFound())
+  })
+
+  /*
+   * v. List issue comments
+   * https://docs.github.com/en/rest/reference/issues#list-issue-comments
    */
 
   /*
-   * iii. Get a single comment
-   * https://developer.github.com/v3/issues/comments/#get-a-single-comment
-   */
-
-  /*
-   * iv. Create a comment
-   * https://developer.github.com/v3/issues/comments/#create-a-comment
+   * vi. Create an issue comment
+   * https://docs.github.com/en/rest/reference/issues#create-an-issue-comment
    */
   post("/api/v3/repos/:owner/:repository/issues/:id/comments")(readableUsersOnly { repository =>
     (for {
@@ -64,16 +137,6 @@ trait ApiIssueCommentControllerBase extends ControllerBase {
     }) getOrElse NotFound()
   })
 
-  /*
-   * v. Edit a comment
-   * https://developer.github.com/v3/issues/comments/#edit-a-comment
-   */
-
-  /*
-   * vi. Delete a comment
-   * https://developer.github.com/v3/issues/comments/#delete-a-comment
-   */
-
   private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 }

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

@@ -31,7 +31,7 @@ trait ApiIssueControllerBase extends ControllerBase {
     val condition = IssueSearchCondition(request)
     val baseOwner = getAccountByUserName(repository.owner).get
 
-    val issues: List[(Issue, Account)] =
+    val issues: List[(Issue, Account, Option[Account])] =
       searchIssueByApi(
         condition = condition,
         offset = (page - 1) * PullRequestLimit,
@@ -40,11 +40,12 @@ trait ApiIssueControllerBase extends ControllerBase {
       )
 
     JsonFormat(issues.map {
-      case (issue, issueUser) =>
+      case (issue, issueUser, assignedUser) =>
         ApiIssue(
           issue = issue,
           repositoryName = RepositoryName(repository),
           user = ApiUser(issueUser),
+          assignee = assignedUser.map(ApiUser(_)),
           labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
             .map(ApiLabel(_, RepositoryName(repository)))
         )
@@ -59,13 +60,15 @@ trait ApiIssueControllerBase extends ControllerBase {
     (for {
       issueId <- params("id").toIntOpt
       issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      openedUser <- getAccountByUserName(issue.openedUserName)
+      users = getAccountsByUserNames(Set(issue.openedUserName) ++ issue.assignedUserName, Set())
+      openedUser <- users.get(issue.openedUserName)
     } yield {
       JsonFormat(
         ApiIssue(
           issue,
           RepositoryName(repository),
           ApiUser(openedUser),
+          issue.assignedUserName.flatMap(users.get(_)).map(ApiUser(_)),
           getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository)))
         )
       )
@@ -98,6 +101,7 @@ trait ApiIssueControllerBase extends ControllerBase {
             issue,
             RepositoryName(repository),
             ApiUser(loginAccount),
+            issue.assignedUserName.flatMap(getAccountByUserName(_)).map(ApiUser(_)),
             getIssueLabels(repository.owner, repository.name, issue.issueId)
               .map(ApiLabel(_, RepositoryName(repository)))
           )

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

@@ -0,0 +1,118 @@
+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 =>
+
+  /*
+   * i. List milestones
+   * https://docs.github.com/en/rest/reference/issues#list-milestones
+   */
+  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)
+                                .sortBy(p => p._1.milestoneId))
+      yield {
+        ApiMilestone(
+          repository.repository,
+          milestoneWithIssue._1,
+          milestoneWithIssue._2,
+          milestoneWithIssue._3
+        )
+      }).reverse
+    state match {
+      case "all" => JsonFormat(apiMilestones)
+      case "open" | "closed" =>
+        JsonFormat(
+          apiMilestones.filter(p => p.state == state)
+        )
+      case _ => NotFound()
+    }
+  })
+
+  /*
+   * ii. Create a milestone
+   * https://docs.github.com/en/rest/reference/issues#create-a-milestone
+   */
+  post("/api/v3/repos/:owner/:repository/milestones")(writableUsersOnly { repository =>
+    (for {
+      data <- extractFromJsonBody[CreateAMilestone] if data.isValid
+      milestoneId = createMilestone(
+        repository.owner,
+        repository.name,
+        data.title,
+        data.description,
+        data.due_on
+      )
+      apiMilestone <- getApiMilestone(repository, milestoneId)
+    } yield {
+      JsonFormat(apiMilestone)
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * iii. Get a milestone
+   * https://docs.github.com/en/rest/reference/issues#get-a-milestone
+   */
+  get("/api/v3/repos/:owner/:repository/milestones/:number")(referrersOnly { repository =>
+    val milestoneId = params("number").toInt // use milestoneId as number
+    (for (apiMilestone <- getApiMilestone(repository, milestoneId)) yield {
+      JsonFormat(apiMilestone)
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * iv.Update a milestone
+   * https://docs.github.com/en/rest/reference/issues#update-a-milestone
+   */
+  patch("/api/v3/repos/:owner/:repository/milestones/:number")(writableUsersOnly { repository =>
+    val milestoneId = params("number").toInt
+    (for {
+      data <- extractFromJsonBody[CreateAMilestone] if data.isValid
+      milestone <- getMilestone(repository.owner, repository.name, milestoneId)
+      _ = (data.state, milestone.closedDate) match {
+        case ("open", Some(_)) =>
+          openMilestone(milestone)
+        case ("closed", None) =>
+          closeMilestone(milestone)
+        case _ =>
+      }
+      milestone <- getMilestone(repository.owner, repository.name, milestoneId)
+      _ = updateMilestone(milestone.copy(title = data.title, description = data.description, dueDate = data.due_on))
+      apiMilestone <- getApiMilestone(repository, milestoneId)
+    } yield {
+      JsonFormat(apiMilestone)
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * v. Delete a milestone
+   * https://docs.github.com/en/rest/reference/issues#delete-a-milestone
+   */
+  delete("/api/v3/repos/:owner/:repository/milestones/:number")(writableUsersOnly { repository =>
+    val milestoneId = params("number").toInt // use milestoneId as number
+    deleteMilestone(repository.owner, repository.name, milestoneId)
+    NoContent()
+  })
+
+  private def getApiMilestone(repository: RepositoryInfo, milestoneId: Int): Option[ApiMilestone] = {
+    getMilestonesWithIssueCount(repository.owner, repository.name)
+      .find(p => p._1.milestoneId == milestoneId)
+      .map(
+        milestoneWithIssue =>
+          ApiMilestone(
+            repository.repository,
+            milestoneWithIssue._1,
+            milestoneWithIssue._2,
+            milestoneWithIssue._3
+        )
+      )
+  }
+}

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

@@ -8,12 +8,12 @@ import gitbucket.core.service.PullRequestService.PullRequestLimit
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.JGitUtil.CommitInfo
-import gitbucket.core.util.SyntaxSugars.using
 import gitbucket.core.util._
 import org.eclipse.jgit.api.Git
-import org.scalatra.NoContent
+import org.scalatra.{Conflict, MethodNotAllowed, NoContent, Ok}
+import scala.util.Using
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait ApiPullRequestControllerBase extends ControllerBase {
   self: AccountService
@@ -114,7 +114,9 @@ trait ApiPullRequestControllerBase extends ControllerBase {
                       requestBranch = reqBranch,
                       commitIdFrom = commitIdFrom.getName,
                       commitIdTo = commitIdTo.getName,
-                      loginAccount = context.loginAccount.get
+                      isDraft = createPullReq.draft.getOrElse(false),
+                      loginAccount = context.loginAccount.get,
+                      settings = context.settings
                     )
                     getApiPullRequest(repository, issueId).map(JsonFormat(_))
                   case _ =>
@@ -141,7 +143,9 @@ trait ApiPullRequestControllerBase extends ControllerBase {
                       requestBranch = reqBranch,
                       commitIdFrom = commitIdFrom.getName,
                       commitIdTo = commitIdTo.getName,
-                      loginAccount = context.loginAccount.get
+                      isDraft = false,
+                      loginAccount = context.loginAccount.get,
+                      settings = context.settings
                     )
                     getApiPullRequest(repository, createPullReqAlt.issue).map(JsonFormat(_))
                   case _ =>
@@ -157,8 +161,28 @@ trait ApiPullRequestControllerBase extends ControllerBase {
 
   /*
    * v. Update a pull request
-   * https://developer.github.com/v3/pulls/#update-a-pull-request
+   * https://docs.github.com/en/rest/reference/pulls#update-a-pull-request
    */
+  patch("/api/v3/repos/:owner/:repository/pulls/:id")(referrersOnly { repository =>
+    (for {
+      issueId <- params("id").toIntOpt
+      account <- context.loginAccount
+      settings = context.settings
+      data <- extractFromJsonBody[UpdateAPullRequest]
+    } yield {
+      updatePullRequestsByApi(
+        repository,
+        issueId,
+        account,
+        settings,
+        data.title,
+        data.body,
+        data.state,
+        data.base
+      )
+      JsonFormat(getApiPullRequest(repository, issueId))
+    }) getOrElse NotFound()
+  })
 
   /*
    * vi. List commits on a pull request
@@ -171,7 +195,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
       issueId =>
         getPullRequest(owner, name, issueId) map {
           case (issue, pullreq) =>
-            using(Git.open(getRepositoryDir(owner, name))) { git =>
+            Using.resource(Git.open(getRepositoryDir(owner, name))) { git =>
               val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
               val newId = git.getRepository.resolve(pullreq.commitIdTo)
               val repoFullName = RepositoryName(repository)
@@ -213,8 +237,72 @@ trait ApiPullRequestControllerBase extends ControllerBase {
 
   /*
    * ix. Merge a pull request (Merge Button)
-   * https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
+   * https://docs.github.com/en/rest/reference/pulls#merge-a-pull-request
    */
+  put("/api/v3/repos/:owner/:repository/pulls/:id/merge")(referrersOnly { repository =>
+    (for {
+      //TODO: crash when body is empty
+      //TODO: Implement sha parameter
+      data <- extractFromJsonBody[MergeAPullRequest]
+      issueId <- params("id").toIntOpt
+      (issue, pullReq) <- getPullRequest(repository.owner, repository.name, issueId)
+    } yield {
+      if (checkConflict(repository.owner, repository.name, pullReq.branch, issueId).isDefined) {
+        Conflict(
+          JsonFormat(
+            FailToMergePrResponse(
+              message = "Head branch was modified. Review and try the merge again.",
+              documentation_url = "https://docs.github.com/en/rest/reference/pulls#merge-a-pull-request",
+            )
+          )
+        )
+      } else {
+        if (issue.closed) {
+          MethodNotAllowed(
+            JsonFormat(
+              FailToMergePrResponse(
+                message = "Pull Request is not mergeable, Closed",
+                documentation_url = "https://docs.github.com/en/rest/reference/pulls#merge-a-pull-request",
+              )
+            )
+          )
+        } else {
+          val strategy =
+            if (data.merge_method.getOrElse("merge-commit") == "merge") "merge-commit"
+            else data.merge_method.getOrElse("merge-commit")
+          mergePullRequest(
+            repository,
+            issueId,
+            context.loginAccount.get,
+            data.commit_message.getOrElse(""), //TODO: Implement commit_title
+            strategy,
+            pullReq.isDraft,
+            context.settings
+          ) match {
+            case Right(objectId) =>
+              Ok(
+                JsonFormat(
+                  SuccessToMergePrResponse(
+                    sha = objectId.toString,
+                    merged = true,
+                    message = "Pull Request successfully merged"
+                  )
+                )
+              )
+            case Left(message) =>
+              MethodNotAllowed(
+                JsonFormat(
+                  FailToMergePrResponse(
+                    message = "Pull Request is not mergeable",
+                    documentation_url = "https://docs.github.com/en/rest/reference/pulls#merge-a-pull-request",
+                  )
+                )
+              )
+          }
+        }
+      }
+    })
+  })
 
   /*
    * x. Labels, assignees, and milestones

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

@@ -3,11 +3,13 @@ import gitbucket.core.api._
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, ProtectedBranchService, RepositoryService}
 import gitbucket.core.util._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.JGitUtil.getBranches
 import org.eclipse.jgit.api.Git
+import org.scalatra.NoContent
+
+import scala.util.Using
 
 trait ApiRepositoryBranchControllerBase extends ControllerBase {
   self: RepositoryService
@@ -22,10 +24,10 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
 
   /**
    * i. List branches
-   * https://developer.github.com/v3/repos/branches/#list-branches
+   * https://docs.github.com/en/rest/reference/repos#list-branches
    */
   get("/api/v3/repos/:owner/:repository/branches")(referrersOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       JsonFormat(
         JGitUtil
           .getBranches(
@@ -41,11 +43,11 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
   })
 
   /**
-   * ii. Get branch
-   * https://developer.github.com/v3/repos/branches/#get-branch
+   * ii. Get a branch
+   * https://docs.github.com/en/rest/reference/repos#get-a-branch
    */
   get("/api/v3/repos/:owner/:repository/branches/*")(referrersOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
         (for {
           branch <- params.get("splat") if repository.branchList.contains(branch)
@@ -65,147 +67,206 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
 
   /*
    * iii. Get branch protection
-   * https://developer.github.com/v3/repos/branches/#get-branch-protection
+   * https://docs.github.com/en/rest/reference/repos#get-branch-protection
    */
+  get("/api/v3/repos/:owner/:repository/branches/:branch/protection")(referrersOnly { repository =>
+    val branch = params("branch")
+    if (repository.branchList.contains(branch)) {
+      val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
+      JsonFormat(
+        ApiBranchProtection(protection)
+      )
+    } else { NotFound() }
+  })
 
   /*
    * iv. Update branch protection
-   * https://developer.github.com/v3/repos/branches/#update-branch-protection
+   * https://docs.github.com/en/rest/reference/repos#update-branch-protection
    */
 
   /*
-   * v. Remove branch protection
-   * https://developer.github.com/v3/repos/branches/#remove-branch-protection
+   * v. Delete branch protection
+   * https://docs.github.com/en/rest/reference/repos#delete-branch-protection
+   */
+  delete("/api/v3/repos/:owner/:repository/branches/:branch/protection")(writableUsersOnly { repository =>
+    val branch = params("branch")
+    if (repository.branchList.contains(branch)) {
+      val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
+      if (protection.enabled) {
+        disableBranchProtection(repository.owner, repository.name, branch)
+        NoContent()
+      } else NotFound()
+    } else NotFound()
+  })
+
+  /*
+   * vi. Get admin branch protection
+   * https://docs.github.com/en/rest/reference/repos#get-admin-branch-protection
    */
 
   /*
-   * vi. Get required status checks of protected branch
-   * https://developer.github.com/v3/repos/branches/#get-required-status-checks-of-protected-branch
+   * vii. Set admin branch protection
+   * https://docs.github.com/en/rest/reference/repos#set-admin-branch-protection
    */
 
   /*
-   * vii. Update required status checks of protected branch
-   * https://developer.github.com/v3/repos/branches/#update-required-status-checks-of-protected-branch
+   * viii. Delete admin branch protection
+   * https://docs.github.com/en/rest/reference/repos#delete-admin-branch-protection
    */
 
   /*
-   * viii. Remove required status checks of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-required-status-checks-of-protected-branch
+   * ix. Get pull request review protection
+   * https://docs.github.com/en/rest/reference/repos#get-pull-request-review-protection
    */
 
   /*
-   * ix. List required status checks contexts of protected branch
-   * https://developer.github.com/v3/repos/branches/#list-required-status-checks-contexts-of-protected-branch
+   * x. Update pull request review protection
+   * https://docs.github.com/en/rest/reference/repos#update-pull-request-review-protection
    */
 
   /*
-   * x. Replace required status checks contexts of protected branch
-   * https://developer.github.com/v3/repos/branches/#replace-required-status-checks-contexts-of-protected-branch
+   * xi. Delete pull request review protection
+   * https://docs.github.com/en/rest/reference/repos#delete-pull-request-review-protection
    */
 
   /*
-   * xi. Add required status checks contexts of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-required-status-checks-contexts-of-protected-branch
+   * xii. Get commit signature protection
+   * https://docs.github.com/en/rest/reference/repos#get-commit-signature-protection
    */
 
   /*
-   * xii. Remove required status checks contexts of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-required-status-checks-contexts-of-protected-branch
+   * xiii. Create commit signature protection
+   * https://docs.github.com/en/rest/reference/repos#create-commit-signature-protection
    */
 
   /*
-   * xiii. Get pull request review enforcement of protected branch
-   * https://developer.github.com/v3/repos/branches/#get-pull-request-review-enforcement-of-protected-branch
+   * xiv. Delete commit signature protection
+   * https://docs.github.com/en/rest/reference/repos#delete-commit-signature-protection
    */
 
   /*
-   * xiv. Update pull request review enforcement of protected branch
-   * https://developer.github.com/v3/repos/branches/#update-pull-request-review-enforcement-of-protected-branch
+   * xv. Get status checks protection
+   * https://docs.github.com/en/rest/reference/repos#get-status-checks-protection
+   */
+  get("/api/v3/repos/:owner/:repository/branches/:branch/protection/required_status_checks")(referrersOnly {
+    repository =>
+      val branch = params("branch")
+      if (repository.branchList.contains(branch)) {
+        val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
+        JsonFormat(
+          ApiBranchProtection(protection).required_status_checks
+        )
+      } else { NotFound() }
+  })
+
+  /*
+   * xvi. Update status check protection
+   * https://docs.github.com/en/rest/reference/repos#update-status-check-protection
    */
 
   /*
-   * xv. Remove pull request review enforcement of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-pull-request-review-enforcement-of-protected-branch
+   * xvii. Remove status check protection
+   * https://docs.github.com/en/rest/reference/repos#remove-status-check-protection
    */
 
   /*
-   * xvi. Get required signatures of protected branch
-   * https://developer.github.com/v3/repos/branches/#get-required-signatures-of-protected-branch
+   * xviii. Get all status check contexts
+   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#get-all-status-check-contexts
+   */
+  get("/api/v3/repos/:owner/:repository/branches/:branch/protection/required_status_checks/contexts")(referrersOnly {
+    repository =>
+      val branch = params("branch")
+      if (repository.branchList.contains(branch)) {
+        val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
+        if (protection.enabled) {
+          protection.contexts.toList
+        } else NotFound()
+      } else NotFound()
+  })
+
+  /*
+   * xix. Add status check contexts
+   * https://docs.github.com/en/rest/reference/repos#add-status-check-contexts
    */
 
   /*
-   * xvii. Add required signatures of protected branch
-   * https://developer.github.com/v3/repos/branches/#add-required-signatures-of-protected-branch
+   * xx. Set status check contexts
+   * https://docs.github.com/en/rest/reference/repos#set-status-check-contexts
    */
 
   /*
-   * xviii. Remove required signatures of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-required-signatures-of-protected-branch
+   * xxi. Remove status check contexts
+   * https://docs.github.com/en/rest/reference/repos#remove-status-check-contexts
    */
 
   /*
-   * xix. Get admin enforcement of protected branch
-   * https://developer.github.com/v3/repos/branches/#get-admin-enforcement-of-protected-branch
+   * xxii. Get access restrictions
+   * https://docs.github.com/en/rest/reference/repos#get-access-restrictions
    */
 
   /*
-   * xx. Add admin enforcement of protected branch
-   * https://developer.github.com/v3/repos/branches/#add-admin-enforcement-of-protected-branch
+   * xxiii. Delete access restrictions
+   * https://docs.github.com/en/rest/reference/repos#delete-access-restrictions
    */
 
   /*
-   * xxi. Remove admin enforcement of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-admin-enforcement-of-protected-branch
+   * xxiv. Get apps with access to the protected branch
+   * https://docs.github.com/en/rest/reference/repos#get-apps-with-access-to-the-protected-branch
    */
 
   /*
-   * xxii. Get restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#get-restrictions-of-protected-branch
+   * xxv. Add app access restrictions
+   * https://docs.github.com/en/rest/reference/repos#add-app-access-restrictions
    */
 
   /*
-   * xxiii. Remove restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-restrictions-of-protected-branch
+   * xxvi. Set app access restrictions
+   * https://docs.github.com/en/rest/reference/repos#set-app-access-restrictions
    */
 
   /*
-   * xxiv. List team restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#list-team-restrictions-of-protected-branch
+   * xxvii. Remove app access restrictions
+   * https://docs.github.com/en/rest/reference/repos#remove-app-access-restrictions
    */
 
   /*
-   * xxv. Replace team restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#replace-team-restrictions-of-protected-branch
+   * xxviii. Get teams with access to the protected branch
+   * https://docs.github.com/en/rest/reference/repos#get-teams-with-access-to-the-protected-branch
    */
 
   /*
-   * xxvi. Add team restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#add-team-restrictions-of-protected-branch
+   * xxix. Add team access restrictions
+   * https://docs.github.com/en/rest/reference/repos#add-team-access-restrictions
    */
 
   /*
-   * xxvii. Remove team restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-team-restrictions-of-protected-branch
+   * xxx. Set team access restrictions
+   * https://docs.github.com/en/rest/reference/repos#set-team-access-restrictions
    */
 
   /*
-   * xxviii. List user restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#list-user-restrictions-of-protected-branch
+   * xxxi. Remove team access restrictions
+   * https://docs.github.com/en/rest/reference/repos#remove-team-access-restrictions
    */
 
   /*
-   * xxix. Replace user restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#replace-user-restrictions-of-protected-branch
+   * xxxii. Get users with access to the protected branch
+   * https://docs.github.com/en/rest/reference/repos#get-users-with-access-to-the-protected-branch
    */
 
   /*
-   * xxx. Add user restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#add-user-restrictions-of-protected-branch
+   * xxxiii. Add user access restrictions
+   * https://docs.github.com/en/rest/reference/repos#add-user-access-restrictions
    */
 
   /*
-   * xxxi. Remove user restrictions of protected branch
-   * https://developer.github.com/v3/repos/branches/#remove-user-restrictions-of-protected-branch
+   * xxxiv. Set user access restrictions
+   * https://docs.github.com/en/rest/reference/repos#set-user-access-restrictions
+   */
+
+  /*
+   * xxxv. Remove user access restrictions
+   * https://docs.github.com/en/rest/reference/repos#remove-user-access-restrictions
    */
 
   /**
@@ -214,7 +275,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
    */
   patch("/api/v3/repos/:owner/:repository/branches/*")(ownerOnly { repository =>
     import gitbucket.core.api._
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
       git =>
         (for {
           branch <- params.get("splat") if repository.branchList.contains(branch)

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

@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{AddACollaborator, ApiUser, JsonFormat}
+import gitbucket.core.api.{AddACollaborator, ApiRepositoryCollaborator, ApiUser, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.Implicits._
@@ -10,8 +10,8 @@ trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
   self: RepositoryService with AccountService with ReferrerAuthenticator with OwnerAuthenticator =>
 
   /*
-   * i. List collaborators
-   * https://developer.github.com/v3/repos/collaborators/#list-collaborators
+   * i. List repository collaborators
+   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#list-repository-collaborators
    */
   get("/api/v3/repos/:owner/:repository/collaborators")(referrersOnly { repository =>
     // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
@@ -19,19 +19,40 @@ trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
       getCollaboratorUserNames(params("owner"), params("repository")).map(u => ApiUser(getAccountByUserName(u).get))
     )
   })
+
   /*
    * ii. Check if a user is a collaborator
-   * https://developer.github.com/v3/repos/collaborators/#check-if-a-user-is-a-collaborator
+   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#check-if-a-user-is-a-repository-collaborator
    */
+  get("/api/v3/repos/:owner/:repository/collaborators/:userName")(referrersOnly { repository =>
+    (for (account <- getAccountByUserName(params("userName"))) yield {
+      if (getCollaboratorUserNames(repository.owner, repository.name).contains(account.userName)) {
+        NoContent()
+      } else {
+        NotFound()
+      }
+    }) getOrElse NotFound()
+  })
 
   /*
-   * iii. Review a user's permission level
-   * https://developer.github.com/v3/repos/collaborators/#review-a-users-permission-level
+   * iii. Get repository permissions for a user
+   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#get-repository-permissions-for-a-user
    */
+  get("/api/v3/repos/:owner/:repository/collaborators/:userName/permission")(referrersOnly { repository =>
+    (for {
+      account <- getAccountByUserName(params("userName"))
+      collaborator <- getCollaborators(repository.owner, repository.name)
+        .find(p => p._1.collaboratorName == account.userName)
+    } yield {
+      JsonFormat(
+        ApiRepositoryCollaborator(collaborator._1.role, ApiUser(account))
+      )
+    }) getOrElse NotFound()
+  })
 
   /*
-   * iv. Add user as a collaborator
-   * https://developer.github.com/v3/repos/collaborators/#add-user-as-a-collaborator
+   * iv. Add a repository collaborator
+   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#add-a-repository-collaborator
    * requested #1586
    */
   put("/api/v3/repos/:owner/:repository/collaborators/:userName")(ownerOnly { repository =>
@@ -44,8 +65,8 @@ trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
   })
 
   /*
-   * v. Remove user as a collaborator
-   * https://developer.github.com/v3/repos/collaborators/#remove-user-as-a-collaborator
+   * v. Remove a repository collaborator
+   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#remove-a-repository-collaborator
    * requested #1586
    */
   delete("/api/v3/repos/:owner/:repository/collaborators/:userName")(ownerOnly { repository =>

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

@@ -1,22 +1,51 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiCommits, JsonFormat}
+import gitbucket.core.api.{ApiBranchCommit, ApiBranchForHeadCommit, ApiCommits, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, CommitsService}
+import gitbucket.core.service.{AccountService, CommitsService, ProtectedBranchService}
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.JGitUtil.CommitInfo
+import gitbucket.core.util.JGitUtil.{CommitInfo, getBranches, getBranchesOfCommit}
 import gitbucket.core.util.{JGitUtil, ReferrerAuthenticator, RepositoryName}
-import gitbucket.core.util.SyntaxSugars.using
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
 
+import scala.jdk.CollectionConverters._
+import scala.util.Using
+
 trait ApiRepositoryCommitControllerBase extends ControllerBase {
-  self: AccountService with CommitsService with ReferrerAuthenticator =>
+  self: AccountService with CommitsService with ProtectedBranchService with ReferrerAuthenticator =>
   /*
    * i. List commits on a repository
    * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository
    */
+  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.getOrElse("sha", "refs/heads/master")
+    Using.resource(Git.open(getRepositoryDir(owner, name))) {
+      git =>
+        val repo = git.getRepository
+        Using.resource(new RevWalk(repo)) {
+          revWalk =>
+            val objectId = repo.resolve(sha)
+            revWalk.markStart(revWalk.parseCommit(objectId))
+            JsonFormat(revWalk.asScala.take(30).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.toString).size
+                )
+            })
+        }
+    }
+  })
 
   /*
    * ii. Get a single commit
@@ -27,11 +56,11 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
     val name = repository.name
     val sha = params("sha")
 
-    using(Git.open(getRepositoryDir(owner, name))) {
+    Using.resource(Git.open(getRepositoryDir(owner, name))) {
       git =>
         val repo = git.getRepository
         val objectId = repo.resolve(sha)
-        val commitInfo = using(new RevWalk(repo)) { revWalk =>
+        val commitInfo = Using.resource(new RevWalk(repo)) { revWalk =>
           new CommitInfo(revWalk.parseCommit(objectId))
         }
 
@@ -79,7 +108,25 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
    */
 
   /*
- * v. Commit signature verification
- * https://developer.github.com/v3/repos/commits/#commit-signature-verification
- */
+   * v. Commit signature verification
+   * https://developer.github.com/v3/repos/commits/#commit-signature-verification
+   */
+
+  /*
+   * vi. List branches for HEAD commit
+   * https://docs.github.com/en/rest/reference/repos#list-branches-for-head-commit
+   */
+  get("/api/v3/repos/:owner/:repository/commits/:sha/branches-where-head")(referrersOnly { repository =>
+    val sha = params("sha")
+    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)
+      } yield {
+        val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
+        ApiBranchForHeadCommit(branch, ApiBranchCommit(br.commitId), protection.enabled)
+      }
+      JsonFormat(apiBranchForCommits)
+    }
+  })
 }

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

@@ -1,22 +1,38 @@
 package gitbucket.core.controller.api
 import gitbucket.core.api.{ApiContents, ApiError, CreateAFile, JsonFormat}
 import gitbucket.core.controller.ControllerBase
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.{RepositoryCommitFileService, RepositoryService}
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.JGitUtil.{FileInfo, getContentFromId, getFileList}
 import gitbucket.core.util._
-import gitbucket.core.util.SyntaxSugars.using
 import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
 import gitbucket.core.util.Implicits._
 import org.eclipse.jgit.api.Git
 
+import scala.util.Using
+
 trait ApiRepositoryContentsControllerBase extends ControllerBase {
   self: ReferrerAuthenticator with WritableUsersAuthenticator with RepositoryCommitFileService =>
 
-  /*
-   * i. Get the README
-   * https://developer.github.com/v3/repos/contents/#get-the-readme
+  /**
+   * 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")))) {
+      git =>
+        val refStr = params.getOrElse("ref", repository.repository.defaultBranch)
+        val files = getFileList(git, refStr, ".", maxFiles = context.settings.repositoryViewer.maxFiles)
+        files // files should be sorted alphabetically.
+          .find { file =>
+            !file.isDirectory && RepositoryService.readmeFiles.contains(file.name.toLowerCase)
+          } match {
+          case Some(x) => getContents(repository = repository, path = x.name, refStr = refStr, ignoreCase = true)
+          case _       => NotFound()
+        }
+    }
+  })
 
   /**
    * ii. Get contents
@@ -34,21 +50,32 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
     getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
   })
 
-  private def getContents(repository: RepositoryService.RepositoryInfo, path: String, refStr: String) = {
-    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
+  private def getContents(
+    repository: RepositoryService.RepositoryInfo,
+    path: String,
+    refStr: String,
+    ignoreCase: Boolean = false
+  ) = {
+    def getFileInfo(git: Git, revision: String, pathStr: String, ignoreCase: Boolean): Option[FileInfo] = {
       val (dirName, fileName) = pathStr.lastIndexOf('/') match {
         case -1 =>
           (".", pathStr)
         case n =>
           (pathStr.take(n), pathStr.drop(n + 1))
       }
-      getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
+      if (ignoreCase) {
+        getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
+          .find(_.name.toLowerCase.equals(fileName.toLowerCase))
+      } else {
+        getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
+          .find(_.name.equals(fileName))
+      }
     }
 
-    using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
-      val fileList = getFileList(git, refStr, path)
+    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
-        getFileInfo(git, refStr, path)
+        getFileInfo(git, refStr, path, ignoreCase)
           .flatMap { f =>
             val largeFile = params.get("large_file").exists(s => s.equals("true"))
             val content = getContentFromId(git, f.id, largeFile)
@@ -113,7 +140,7 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
       data <- extractFromJsonBody[CreateAFile]
     } yield {
       val branch = data.branch.getOrElse(repository.repository.defaultBranch)
-      val commit = using(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))
         revCommit.name
       }
@@ -127,17 +154,14 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
           branch,
           path,
           Some(paths.last),
-          if (data.sha.isDefined) {
-            Some(paths.last)
-          } else {
-            None
-          },
+          data.sha.map(_ => paths.last),
           StringUtil.base64Decode(data.content),
           data.message,
           commit,
           context.loginAccount.get,
           data.committer.map(_.name).getOrElse(context.loginAccount.get.fullName),
-          data.committer.map(_.email).getOrElse(context.loginAccount.get.mailAddress)
+          data.committer.map(_.email).getOrElse(context.loginAccount.get.mailAddress),
+          context.settings
         )
         ApiContents("file", paths.last, path, objectId.name, None, None)(RepositoryName(repository))
       }

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

@@ -6,12 +6,12 @@ import gitbucket.core.servlet.Database
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars.using
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.eclipse.jgit.api.Git
 
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
+import scala.util.Using
 
 trait ApiRepositoryControllerBase extends ControllerBase {
   self: RepositoryService
@@ -54,11 +54,15 @@ trait ApiRepositoryControllerBase extends ControllerBase {
     })
   }
 
-  /*
+  /**
    * iv. List all public repositories
-   * https://developer.github.com/v3/repos/#list-all-public-repositories
-   * Not implemented
+   * https://developer.github.com/v3/repos/#list-public-repositories
    */
+  get("/api/v3/repositories") {
+    JsonFormat(getPublicRepositories().map { r =>
+      ApiRepository(r, getAccountByUserName(r.owner).get)
+    })
+  }
 
   /*
    * v. Create
@@ -174,9 +178,14 @@ trait ApiRepositoryControllerBase extends ControllerBase {
    */
 
   /*
-   * xiii. List tags
-   * https://developer.github.com/v3/repos/#list-tags
+   * xiii. List repository tags
+   * https://docs.github.com/en/rest/reference/repos#list-repository-tags
    */
+  get("/api/v3/repos/:owner/:repository/tags")(referrersOnly { repository =>
+    JsonFormat(
+      repository.tags.map(tagInfo => ApiTag(tagInfo.name, RepositoryName(repository), tagInfo.id))
+    )
+  })
 
   /*
    * xiv. Delete a repository
@@ -193,7 +202,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {
    */
   get("/api/v3/repos/:owner/:repository/raw/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
 
       getPathObjectId(git, path, revCommit).map { objectId =>

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

@@ -47,7 +47,7 @@ trait ApiRepositoryStatusControllerBase extends ControllerBase {
       ref <- params.get("ref")
       sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
     } yield {
-      JsonFormat(getCommitStatuesWithCreator(repository.owner, repository.name, sha).map {
+      JsonFormat(getCommitStatusesWithCreator(repository.owner, repository.name, sha).map {
         case (status, creator) =>
           ApiCommitStatus(status, ApiUser(creator))
       })
@@ -73,7 +73,7 @@ trait ApiRepositoryStatusControllerBase extends ControllerBase {
       owner <- getAccountByUserName(repository.owner)
       sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
     } yield {
-      val statuses = getCommitStatuesWithCreator(repository.owner, repository.name, sha)
+      val statuses = getCommitStatusesWithCreator(repository.owner, repository.name, sha)
       JsonFormat(ApiCombinedCommitStatus(sha, statuses, ApiRepository(repository, owner)))
     }) getOrElse NotFound()
   })

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

@@ -0,0 +1,120 @@
+package gitbucket.core.controller.api
+import gitbucket.core.api._
+import gitbucket.core.controller.ControllerBase
+import gitbucket.core.model.{WebHook, WebHookContentType}
+import gitbucket.core.service.{RepositoryService, WebHookService}
+import gitbucket.core.util._
+import gitbucket.core.util.Implicits._
+import org.scalatra.NoContent
+
+trait ApiRepositoryWebhookControllerBase extends ControllerBase {
+  self: RepositoryService with WebHookService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+
+  /*
+   * i. List repository webhooks
+   * https://docs.github.com/en/rest/reference/repos#list-repository-webhooks
+   */
+  get("/api/v3/repos/:owner/:repository/hooks")(referrersOnly { repository =>
+    val apiWebhooks = for {
+      (hook, events) <- getWebHooks(repository.owner, repository.name)
+    } yield {
+      ApiWebhook("Repository", hook, events)
+    }
+    JsonFormat(apiWebhooks)
+  })
+
+  /*
+   * ii. Create a repository webhook
+   * https://docs.github.com/en/rest/reference/repos#create-a-repository-webhook
+   */
+  post("/api/v3/repos/:owner/:repository/hooks")(writableUsersOnly { repository =>
+    (for {
+      data <- extractFromJsonBody[CreateARepositoryWebhook] if data.isValid
+      ctype = if (data.config.content_type == "form") WebHookContentType.FORM else WebHookContentType.JSON
+      events = data.events.map(p => WebHook.Event.valueOf(p)).toSet
+    } yield {
+      addWebHook(
+        repository.owner,
+        repository.name,
+        data.config.url,
+        events,
+        ctype,
+        data.config.secret
+      )
+      getWebHook(repository.owner, repository.name, data.config.url) match {
+        case Some(createdHook) => JsonFormat(ApiWebhook("Repository", createdHook._1, createdHook._2))
+        case _                 =>
+      }
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * iii. Get a repository webhook
+   * https://docs.github.com/en/rest/reference/repos#get-a-repository-webhook
+   */
+  get("/api/v3/repos/:owner/:repository/hooks/:id")(referrersOnly { repository =>
+    val hookId = params("id").toInt
+    getWebHookById(hookId) match {
+      case Some(hook) => JsonFormat(ApiWebhook("Repository", hook._1, hook._2))
+      case _          => NotFound()
+    }
+  })
+
+  /*
+   * iv. Update a repository webhook
+   * https://docs.github.com/en/rest/reference/repos#update-a-repository-webhook
+   */
+  patch("/api/v3/repos/:owner/:repository/hooks/:id")(writableUsersOnly { repository =>
+    val hookId = params("id").toInt
+    (for {
+      data <- extractFromJsonBody[UpdateARepositoryWebhook] if data.isValid
+      ctype = data.config.content_type match {
+        case "json" => WebHookContentType.JSON
+        case _      => WebHookContentType.FORM
+      }
+    } yield {
+      val events = (data.events ++ data.add_events)
+        .filterNot(p => data.remove_events.contains(p))
+        .map(p => WebHook.Event.valueOf(p))
+        .toSet
+      updateWebHookByApi(
+        hookId,
+        repository.owner,
+        repository.name,
+        data.config.url,
+        events,
+        ctype,
+        data.config.secret
+      )
+      getWebHookById(hookId) match {
+        case Some(updatedHook) => JsonFormat(ApiWebhook("Repository", updatedHook._1, updatedHook._2))
+        case _                 =>
+      }
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * v. Delete a repository webhook
+   * https://docs.github.com/en/rest/reference/repos#delete-a-repository-webhook
+   */
+  delete("/api/v3/repos/:owner/:repository/hooks/:id")(writableUsersOnly { repository =>
+    val hookId = params("id").toInt
+    getWebHookById(hookId) match {
+      case Some(_) =>
+        deleteWebHookById(params("id").toInt)
+        NoContent()
+      case _ => NotFound()
+    }
+  })
+
+  /*
+   * vi. Ping a repository webhook
+   * https://docs.github.com/en/rest/reference/repos#ping-a-repository-webhook
+   */
+
+  /*
+ * vi. 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

@@ -4,6 +4,7 @@ import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.{AdminAuthenticator, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.StringUtil._
 import org.scalatra.NoContent
 
 trait ApiUserControllerBase extends ControllerBase {
@@ -70,7 +71,7 @@ trait ApiUserControllerBase extends ControllerBase {
     } yield {
       val user = createAccount(
         data.login,
-        data.password,
+        pbkdf2_sha256(data.password),
         data.fullName.getOrElse(data.login),
         data.email,
         data.isAdmin.getOrElse(false),

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

@@ -0,0 +1,21 @@
+package gitbucket.core.model
+
+trait AccountPreferenceComponent { self: Profile =>
+  import profile.api._
+
+  lazy val AccountPreferences = TableQuery[AccountPreferences]
+
+  class AccountPreferences(tag: Tag) extends Table[AccountPreference](tag, "ACCOUNT_PREFERENCE") {
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val highlighterTheme = column[String]("HIGHLIGHTER_THEME")
+    def * =
+      (userName, highlighterTheme) <> (AccountPreference.tupled, AccountPreference.unapply)
+
+    def byPrimaryKey(userName: String): Rep[Boolean] = this.userName === userName.bind
+  }
+}
+
+case class AccountPreference(
+  userName: String,
+  highlighterTheme: String = "prettify"
+)

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

@@ -1,5 +1,9 @@
 package gitbucket.core.model
 
+/**
+ * ActivityComponent has been deprecated, but keep it for binary compatibility.
+ */
+@deprecated("ActivityComponent has been deprecated, but keep it for binary compatibility.", "4.34.0")
 trait ActivityComponent extends TemplateComponent { self: Profile =>
   import profile.api._
   import self._
@@ -7,14 +11,7 @@ trait ActivityComponent extends TemplateComponent { self: Profile =>
   lazy val Activities = TableQuery[Activities]
 
   class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
-    val activityId = column[Int]("ACTIVITY_ID", O AutoInc)
-    val activityUserName = column[String]("ACTIVITY_USER_NAME")
-    val activityType = column[String]("ACTIVITY_TYPE")
-    val message = column[String]("MESSAGE")
-    val additionalInfo = column[String]("ADDITIONAL_INFO")
-    val activityDate = column[java.util.Date]("ACTIVITY_DATE")
-    def * =
-      (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
+    def * = ???
   }
 }
 
@@ -26,5 +23,5 @@ case class Activity(
   message: String,
   additionalInfo: Option[String],
   activityDate: java.util.Date,
-  activityId: Int = 0
+  activityId: String
 )

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

@@ -45,7 +45,7 @@ trait CoreProfile
     with Profile
     with AccessTokenComponent
     with AccountComponent
-    with ActivityComponent
+    with ActivityComponent // ActivityComponent has been deprecated, but keep it for binary compatibility
     with CollaboratorComponent
     with CommitCommentComponent
     with CommitStatusComponent
@@ -70,5 +70,6 @@ trait CoreProfile
     with ReleaseTagComponent
     with ReleaseAssetComponent
     with AccountExtraMailAddressComponent
+    with AccountPreferenceComponent
 
 object Profile extends CoreProfile

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

@@ -12,6 +12,7 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
     val requestBranch = column[String]("REQUEST_BRANCH")
     val commitIdFrom = column[String]("COMMIT_ID_FROM")
     val commitIdTo = column[String]("COMMIT_ID_TO")
+    val isDraft = column[Boolean]("IS_DRAFT")
     def * =
       (
         userName,
@@ -22,7 +23,8 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
         requestRepositoryName,
         requestBranch,
         commitIdFrom,
-        commitIdTo
+        commitIdTo,
+        isDraft
       ) <> (PullRequest.tupled, PullRequest.unapply)
 
     def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) =
@@ -41,5 +43,6 @@ case class PullRequest(
   requestRepositoryName: String,
   requestBranch: String,
   commitIdFrom: String,
-  commitIdTo: String
+  commitIdTo: String,
+  isDraft: Boolean
 )

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

@@ -9,20 +9,25 @@ trait RepositoryWebHookComponent extends TemplateComponent { self: Profile =>
   lazy val RepositoryWebHooks = TableQuery[RepositoryWebHooks]
 
   class RepositoryWebHooks(tag: Tag) extends Table[RepositoryWebHook](tag, "WEB_HOOK") with BasicTemplate {
+    val hookId = column[Int]("HOOK_ID", O AutoInc)
     val url = column[String]("URL")
     val token = column[Option[String]]("TOKEN")
     val ctype = column[WebHookContentType]("CTYPE")
     def * =
-      (userName, repositoryName, url, ctype, token) <> ((RepositoryWebHook.apply _).tupled, RepositoryWebHook.unapply)
+      (userName, repositoryName, hookId, url, ctype, token) <> ((RepositoryWebHook.apply _).tupled, RepositoryWebHook.unapply)
 
-    def byPrimaryKey(owner: String, repository: String, url: String) =
+    def byRepositoryUrl(owner: String, repository: String, url: String) =
       byRepository(owner, repository) && (this.url === url.bind)
+
+    def byId(id: Int) =
+      (this.hookId === id.bind)
   }
 }
 
 case class RepositoryWebHook(
   userName: String,
   repositoryName: String,
+  hookId: Int = 0,
   url: String,
   ctype: WebHookContentType,
   token: Option[String]

src/main/scala/gitbucket/core/model/activity/BaseActivityInfo.scala

@@ -0,0 +1,12 @@
+package gitbucket.core.model.activity
+
+import gitbucket.core.model.Activity
+
+trait BaseActivityInfo {
+
+  def toActivity: Activity
+
+  protected def trimInfoString(str: String, maxLen: Int): String =
+    if (str.length > maxLen) s"${str.substring(0, maxLen)}..."
+    else str
+}

src/main/scala/gitbucket/core/model/activity/BranchActivityInfo.scala

@@ -0,0 +1,74 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+import gitbucket.core.util.JGitUtil.CommitInfo
+
+final case class PushInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  branchName: String,
+  commits: List[CommitInfo]
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "push",
+      s"[user:$activityUserName] pushed to [branch:$userName/$repositoryName#$branchName] at [repo:$userName/$repositoryName]",
+      Some(buildCommitSummary(commits)),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+
+  private[this] def buildCommitSummary(commits: List[CommitInfo]): String =
+    commits
+      .take(5)
+      .map(commit => s"${commit.id}:${commit.shortMessage}")
+      .mkString("\n")
+}
+
+final case class CreateBranchInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  branchName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "create_branch",
+      s"[user:$activityUserName] created branch [branch:$userName/$repositoryName#$branchName] at [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class DeleteBranchInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  branchName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "delete_branch",
+      s"[user:$activityUserName] deleted branch $branchName at [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/CommentActivityInfo.scala

@@ -0,0 +1,69 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class IssueCommentInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  comment: String,
+  issueId: Int
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "comment_issue",
+      s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
+      Some(trimInfoString(comment, 200)),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class PullRequestCommentInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  comment: String,
+  issueId: Int
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "comment_issue",
+      s"[user:$activityUserName] commented on pull request [pullreq:$userName/$repositoryName#$issueId]",
+      Some(trimInfoString(comment, 200)),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class CommitCommentInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  comment: String,
+  commitId: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "comment_commit",
+      s"[user:$activityUserName] commented on commit [commit:$userName/$repositoryName@$commitId]",
+      Some(trimInfoString(comment, 200)),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/ForkActivityInfo.scala

@@ -0,0 +1,26 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class ForkInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  forkedUserName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "fork",
+      s"[user:$activityUserName] forked [repo:$userName/$repositoryName] to [repo:$forkedUserName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/IssueActivityInfo.scala

@@ -0,0 +1,132 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class CreateIssueInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  issueId: Int,
+  title: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "open_issue",
+      s"[user:$activityUserName] opened issue [issue:$userName/$repositoryName#$issueId]",
+      Some(title),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class CloseIssueInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  issueId: Int,
+  title: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "close_issue",
+      s"[user:$activityUserName] closed issue [issue:$userName/$repositoryName#$issueId]",
+      Some(title),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class ReopenIssueInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  issueId: Int,
+  title: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "reopen_issue",
+      s"[user:$activityUserName] reopened issue [issue:$userName/$repositoryName#$issueId]",
+      Some(title),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class OpenPullRequestInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  issueId: Int,
+  title: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "open_pullreq",
+      s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
+      Some(title),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class ClosePullRequestInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  issueId: Int,
+  title: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "close_issue",
+      s"[user:$activityUserName] closed pull request [pullreq:$userName/$repositoryName#$issueId]",
+      Some(title),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class ReopenPullRequestInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  issueId: Int,
+  title: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "reopen_issue",
+      s"[user:$activityUserName] reopened pull request [issue:$userName/$repositoryName#$issueId]",
+      Some(title),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/MergeActivityInfo.scala

@@ -0,0 +1,27 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class MergeInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  issueId: Int,
+  message: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "merge_pullreq",
+      s"[user:$activityUserName] merged pull request [pullreq:$userName/$repositoryName#$issueId]",
+      Some(message),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/ReleaseActivityInfo.scala

@@ -0,0 +1,27 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class ReleaseInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  releaseName: String,
+  tagName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "release",
+      s"[user:$activityUserName] released [release:$userName/$repositoryName/$tagName:$releaseName] at [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/RepositoryActivityInfo.scala

@@ -0,0 +1,84 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class CreateRepositoryInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "create_repository",
+      s"[user:$activityUserName] created [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class DeleteRepositoryInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "delete_repository",
+      s"[user:$activityUserName] deleted [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class TransferRepositoryInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  oldUserName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "transfer_repository",
+      s"[user:$activityUserName] transferred [repo:$oldUserName/$repositoryName] to [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class RenameRepositoryInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  oldRepositoryName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "rename_repository",
+      s"[user:$activityUserName] renamed [repo:$userName/$oldRepositoryName] at [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/TagActivityInfo.scala

@@ -0,0 +1,46 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class CreateTagInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  tagName: String,
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "create_tag",
+      s"[user:$activityUserName] created tag [tag:$userName/$repositoryName#$tagName] at [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class DeleteTagInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  tagName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "delete_tag",
+      s"[user:$activityUserName] deleted tag $tagName at [repo:$userName/$repositoryName]",
+      None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

src/main/scala/gitbucket/core/model/activity/WikiActivityInfo.scala

@@ -0,0 +1,67 @@
+package gitbucket.core.model.activity
+
+import java.util.UUID
+
+import gitbucket.core.model.Activity
+import gitbucket.core.model.Profile.currentDate
+
+final case class CreateWikiPageInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  pageName: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "create_wiki",
+      s"[user:$activityUserName] created the [repo:$userName/$repositoryName] wiki",
+      Some(pageName),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class EditWikiPageInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  pageName: String,
+  commitId: String
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "edit_wiki",
+      s"[user:$activityUserName] edited the [repo:$userName/$repositoryName] wiki",
+      Some(s"$pageName:$commitId"),
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}
+
+final case class DeleteWikiInfo(
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  pageName: String,
+) extends BaseActivityInfo {
+
+  override def toActivity: Activity =
+    Activity(
+      userName,
+      repositoryName,
+      activityUserName,
+      "delete_wiki",
+      s"[user:$activityUserName] deleted the page [$pageName] in the [repo:$userName/$repositoryName] wiki",
+      additionalInfo = None,
+      currentDate,
+      UUID.randomUUID().toString
+    )
+}

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

@@ -13,6 +13,14 @@ trait IssueHook {
     implicit session: Session,
     context: Context
   ): Unit = ()
+  def deletedComment(commentId: Int, issue: Issue, repository: RepositoryInfo)(
+    implicit session: Session,
+    context: Context
+  ): Unit = ()
+  def updatedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(
+    implicit session: Session,
+    context: Context
+  ): Unit = ()
   def closed(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
   def reopened(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
   def assigned(

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

@@ -6,10 +6,10 @@ import gitbucket.core.controller.{Context, ControllerBase}
 import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
-import gitbucket.core.util.SyntaxSugars._
 import io.github.gitbucket.solidbase.model.Version
 import org.apache.sshd.server.command.Command
 import play.twirl.api.Html
+import scala.util.Using
 
 /**
  * Trait for define plugin interface.
@@ -434,7 +434,7 @@ abstract class Plugin {
    * Helper method to get a resource from classpath.
    */
   protected def fromClassPath(path: String): Array[Byte] =
-    using(getClass.getClassLoader.getResourceAsStream(path)) { in =>
+    Using.resource(getClass.getClassLoader.getResourceAsStream(path)) { in =>
       val bytes = new Array[Byte](in.available)
       in.read(bytes)
       bytes

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

@@ -15,19 +15,17 @@ import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.service.SystemSettingsService.SystemSettings
-import gitbucket.core.util.DatabaseConfig
+import gitbucket.core.util.{ConfigUtil, DatabaseConfig}
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.HttpClientUtil._
 import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
 import org.apache.commons.io.FileUtils
-import org.apache.http.client.methods.HttpGet
 import org.apache.sshd.server.command.Command
 import org.slf4j.LoggerFactory
 import play.twirl.api.Html
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class PluginRegistry {
 
@@ -59,6 +57,7 @@ class PluginRegistry {
   private val textDecorators = new ConcurrentLinkedQueue[TextDecorator]
   private val suggestionProviders = new ConcurrentLinkedQueue[SuggestionProvider]
   suggestionProviders.add(new UserNameSuggestionProvider())
+  suggestionProviders.add(new IssueSuggestionProvider())
   private val sshCommandProviders = new ConcurrentLinkedQueue[PartialFunction[String, Command]]()
 
   def addPlugin(pluginInfo: PluginInfo): Unit = plugins.add(pluginInfo)
@@ -227,40 +226,6 @@ object PluginRegistry {
       initialize(context, settings, conn)
     }
 
-  /**
-   * Install a plugin from a specified jar file.
-   */
-  def install(
-    pluginId: String,
-    url: java.net.URL,
-    context: ServletContext,
-    settings: SystemSettings,
-    conn: java.sql.Connection
-  ): Unit =
-    synchronized {
-      shutdown(context, settings)
-
-      new File(PluginHome)
-        .listFiles((_: File, name: String) => {
-          name.startsWith(s"gitbucket-${pluginId}-plugin") && name.endsWith(".jar")
-        })
-        .foreach(_.delete())
-
-      withHttpClient(settings.pluginProxy) { httpClient =>
-        val httpGet = new HttpGet(url.toString)
-        try {
-          val response = httpClient.execute(httpGet)
-          val in = response.getEntity.getContent
-          FileUtils.copyToFile(in, new File(PluginHome, new File(url.getFile).getName))
-        } finally {
-          httpGet.releaseConnection()
-        }
-      }
-
-      instance = new PluginRegistry()
-      initialize(context, settings, conn)
-    }
-
   private def listPluginJars(dir: File): Seq[File] = {
     dir
       .listFiles(new FilenameFilter {
@@ -271,7 +236,7 @@ object PluginRegistry {
       .reverse
   }
 
-  lazy val extraPluginDir: Option[String] = Option(System.getProperty("gitbucket.pluginDir"))
+  lazy val extraPluginDir: Option[String] = ConfigUtil.getConfigValue[String]("gitbucket.pluginDir")
 
   def getGitBucketVersion(pluginJarFileName: String): Option[String] = {
     val regex = ".+-gitbucket\\_(\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?)-.+".r
@@ -449,7 +414,6 @@ case class PluginInfo(
 
 class PluginWatchThread(context: ServletContext, dir: String) extends Thread with SystemSettingsService {
   import gitbucket.core.model.Profile.profile.blockingApi._
-  import scala.collection.JavaConverters._
 
   private val logger = LoggerFactory.getLogger(classOf[PluginWatchThread])
 
@@ -479,7 +443,7 @@ class PluginWatchThread(context: ServletContext, dir: String) extends Thread wit
         }
         if (events.nonEmpty) {
           events.foreach { event =>
-            logger.info(event.kind + ": " + event.context)
+            logger.info(s"${event.kind}: ${event.context}")
           }
           new Thread {
             override def run(): Unit = {

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

@@ -1,59 +0,0 @@
-package gitbucket.core.plugin
-
-import gitbucket.core.controller.Context
-import gitbucket.core.util.SyntaxSugars.using
-import gitbucket.core.util.HttpClientUtil._
-import org.json4s._
-import org.apache.commons.io.IOUtils
-
-import org.apache.http.client.methods.HttpGet
-import org.slf4j.LoggerFactory
-
-object PluginRepository {
-  private val logger = LoggerFactory.getLogger(getClass)
-  implicit val formats = DefaultFormats
-
-  def parsePluginJson(json: String): Seq[PluginMetadata] = {
-    org.json4s.jackson.JsonMethods.parse(json).extract[Seq[PluginMetadata]]
-  }
-
-  def getPlugins()(implicit context: Context): Seq[PluginMetadata] = {
-    try {
-      val url = new java.net.URL("https://plugins.gitbucket-community.org/releases/plugins.json")
-
-      withHttpClient(context.settings.pluginProxy) { httpClient =>
-        val httpGet = new HttpGet(url.toString)
-        try {
-          val response = httpClient.execute(httpGet)
-          using(response.getEntity.getContent) { in =>
-            val str = IOUtils.toString(in, "UTF-8")
-            parsePluginJson(str)
-          }
-        } finally {
-          httpGet.releaseConnection()
-        }
-      }
-    } catch {
-      case t: Throwable =>
-        logger.warn("Failed to access to the plugin repository: " + t.toString)
-        Nil
-    }
-  }
-}
-
-// Mapped from plugins.json
-case class PluginMetadata(
-  id: String,
-  name: String,
-  description: String,
-  versions: Seq[VersionDef],
-  default: Boolean = false
-) {
-  lazy val latestVersion: VersionDef = versions.last
-}
-
-case class VersionDef(
-  version: String,
-  url: String,
-  gitbucketVersion: String
-)

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

@@ -6,11 +6,25 @@ import profile.api._
 
 trait ReceiveHook {
 
-  def preReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)(
+  def preReceive(
+    owner: String,
+    repository: String,
+    receivePack: ReceivePack,
+    command: ReceiveCommand,
+    pusher: String,
+    mergePullRequest: Boolean
+  )(
     implicit session: Session
   ): Option[String] = None
 
-  def postReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)(
+  def postReceive(
+    owner: String,
+    repository: String,
+    receivePack: ReceivePack,
+    command: ReceiveCommand,
+    pusher: String,
+    mergePullRequest: Boolean
+  )(
     implicit session: Session
   ): Unit = ()
 

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

@@ -91,7 +91,7 @@ trait SuggestionProvider {
    * If this suggestion provider needs some additional process to assemble the proposal list (e.g. It need to use Ajax
    * to get a proposal list from the server), then override this method and return any JavaScript code.
    */
-  def additionalScript(implicit context: Context): String = ""
+  def additionalScript(repository: RepositoryInfo)(implicit context: Context): String = ""
 
 }
 
@@ -99,6 +99,14 @@ class UserNameSuggestionProvider extends SuggestionProvider {
   override val id: String = "user"
   override val prefix: String = "@"
   override val context: Seq[String] = Seq("issues")
-  override def additionalScript(implicit context: Context): String =
+  override def additionalScript(repository: RepositoryInfo)(implicit context: Context): String =
     s"""$$.get('${context.path}/_user/proposals', { query: '', user: true, group: false }, function (data) { user = data.options; });"""
 }
+
+class IssueSuggestionProvider extends SuggestionProvider {
+  override val id: String = "issue"
+  override val prefix: String = "#"
+  override val context: Seq[String] = Seq("issues")
+  override def additionalScript(repository: RepositoryInfo)(implicit context: Context): String =
+    s"""$$.get('${context.path}/${repository.owner}/${repository.name}/_issue/proposals', function (data) { issue = data.options; });"""
+}

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

@@ -1,7 +1,7 @@
 package gitbucket.core.service
 
 import org.slf4j.LoggerFactory
-import gitbucket.core.model.{Account, AccountExtraMailAddress, GroupMember}
+import gitbucket.core.model.{Account, AccountExtraMailAddress, AccountPreference, GroupMember}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
@@ -17,7 +17,9 @@ trait AccountService {
   def authenticate(settings: SystemSettings, userName: String, password: String)(
     implicit s: Session
   ): Option[Account] = {
-    val account = if (settings.ldapAuthentication) {
+    val account = if (password.isEmpty) {
+      None
+    } else if (settings.ldapAuthentication) {
       ldapAuthentication(settings, userName, password)
     } else {
       defaultAuthentication(userName, password)
@@ -308,6 +310,33 @@ trait AccountService {
       Collaborators.filter(_.collaboratorName === userName.bind).sortBy(_.userName).map(_.userName).list.distinct
   }
 
+  /*
+   * For account preference
+   */
+  def getAccountPreference(userName: String)(
+    implicit s: Session
+  ): Option[AccountPreference] = {
+    AccountPreferences filter (_.byPrimaryKey(userName)) firstOption
+  }
+
+  def addAccountPreference(userName: String, highlighterTheme: String)(implicit s: Session): Unit = {
+    AccountPreferences insert AccountPreference(userName = userName, highlighterTheme = highlighterTheme)
+  }
+
+  def updateAccountPreference(userName: String, highlighterTheme: String)(implicit s: Session): Unit = {
+    AccountPreferences
+      .filter(_.byPrimaryKey(userName))
+      .map(t => t.highlighterTheme)
+      .update(highlighterTheme)
+  }
+
+  def addOrUpdateAccountPreference(userName: String, highlighterTheme: String)(implicit s: Session): Unit = {
+    getAccountPreference(userName) match {
+      case Some(_) => updateAccountPreference(userName, highlighterTheme)
+      case _       => addAccountPreference(userName, highlighterTheme)
+    }
+  }
+
 }
 
 object AccountService extends AccountService

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

@@ -3,372 +3,101 @@ package gitbucket.core.service
 import gitbucket.core.model.Activity
 import gitbucket.core.util.JGitUtil
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.util.Directory._
+import org.json4s._
+import org.json4s.jackson.Serialization
+import org.json4s.jackson.Serialization.{read, write}
+
+import scala.util.Using
+import java.io.FileOutputStream
+import java.nio.charset.StandardCharsets
+import java.util.UUID
+
+import gitbucket.core.controller.Context
+import gitbucket.core.model.activity.BaseActivityInfo
+import org.apache.commons.io.input.ReversedLinesFileReader
+
+import scala.collection.mutable.ListBuffer
 
 trait ActivityService {
+  self: RequestCache =>
 
-  def deleteOldActivities(limit: Int)(implicit s: Session): Int = {
-    Activities.map(_.activityId).sortBy(_ desc).drop(limit).firstOption.map { id =>
-      Activities.filter(_.activityId <= id.bind).delete
-    } getOrElse 0
+  private implicit val formats = Serialization.formats(NoTypeHints)
+
+  private def writeLog(activity: Activity): Unit = {
+    Using.resource(new FileOutputStream(ActivityLog, true)) { out =>
+      out.write((write(activity) + "\n").getBytes(StandardCharsets.UTF_8))
+    }
   }
 
-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean)(implicit s: Session): List[Activity] =
-    Activities
-      .join(Repositories)
-      .on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter {
-        case (t1, t2) =>
-          if (isPublic) {
-            (t1.activityUserName === activityUserName.bind) && (t2.isPrivate === false.bind)
-          } else {
-            (t1.activityUserName === activityUserName.bind)
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean)(implicit context: Context): List[Activity] = {
+    if (!ActivityLog.exists()) {
+      List.empty
+    } else {
+      val list = new ListBuffer[Activity]
+      Using.resource(new ReversedLinesFileReader(ActivityLog, StandardCharsets.UTF_8)) { reader =>
+        var json: String = null
+        while (list.length < 50 && { json = reader.readLine(); json } != null) {
+          val activity = read[Activity](json)
+          if (activity.activityUserName == activityUserName) {
+            if (isPublic == false) {
+              list += activity
+            } else {
+              if (!getRepositoryInfoFromCache(activity.userName, activity.repositoryName)
+                    .map(_.isPrivate)
+                    .getOrElse(true)) {
+                list += activity
+              }
+            }
           }
+        }
       }
-      .sortBy { case (t1, t2) => t1.activityId desc }
-      .map { case (t1, t2) => t1 }
-      .take(30)
-      .list
+      list.toList
+    }
+  }
 
-  def getRecentActivities()(implicit s: Session): List[Activity] =
-    Activities
-      .join(Repositories)
-      .on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) => t2.isPrivate === false.bind }
-      .sortBy { case (t1, t2) => t1.activityId desc }
-      .map { case (t1, t2) => t1 }
-      .take(30)
-      .list
-
-  def getRecentActivitiesByOwners(owners: Set[String])(implicit s: Session): List[Activity] =
-    Activities
-      .join(Repositories)
-      .on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) => (t2.isPrivate === false.bind) || (t2.userName inSetBind owners) }
-      .sortBy { case (t1, t2) => t1.activityId desc }
-      .map { case (t1, t2) => t1 }
-      .take(30)
-      .list
-
-  def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String)(
-    implicit s: Session
-  ): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "create_repository",
-      s"[user:${activityUserName}] created [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate
-    )
-
-  def recordCreateIssueActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    title: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "open_issue",
-      s"[user:${activityUserName}] opened issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate
-    )
-
-  def recordCloseIssueActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    title: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "close_issue",
-      s"[user:${activityUserName}] closed issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate
-    )
-
-  def recordClosePullRequestActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    title: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "close_issue",
-      s"[user:${activityUserName}] closed pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate
-    )
-
-  def recordReopenIssueActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    title: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "reopen_issue",
-      s"[user:${activityUserName}] reopened issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate
-    )
-
-  def recordCommentIssueActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    comment: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "comment_issue",
-      s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(cut(comment, 200)),
-      currentDate
-    )
-
-  def recordCommentPullRequestActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    comment: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "comment_issue",
-      s"[user:${activityUserName}] commented on pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(cut(comment, 200)),
-      currentDate
-    )
-
-  def recordCommentCommitActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    commitId: String,
-    comment: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "comment_commit",
-      s"[user:${activityUserName}] commented on commit [commit:${userName}/${repositoryName}@${commitId}]",
-      Some(cut(comment, 200)),
-      currentDate
-    )
-
-  def recordCreateWikiPageActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    pageName: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "create_wiki",
-      s"[user:${activityUserName}] created the [repo:${userName}/${repositoryName}] wiki",
-      Some(pageName),
-      currentDate
-    )
-
-  def recordEditWikiPageActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    pageName: String,
-    commitId: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "edit_wiki",
-      s"[user:${activityUserName}] edited the [repo:${userName}/${repositoryName}] wiki",
-      Some(pageName + ":" + commitId),
-      currentDate
-    )
-
-  def recordPushActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    branchName: String,
-    commits: List[JGitUtil.CommitInfo]
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "push",
-      s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
-      Some(
-        commits
-          .take(5)
-          .map { commit =>
-            commit.id + ":" + commit.shortMessage
+  def getRecentPublicActivities()(implicit context: Context): List[Activity] = {
+    if (!ActivityLog.exists()) {
+      List.empty
+    } else {
+      val list = new ListBuffer[Activity]
+      Using.resource(new ReversedLinesFileReader(ActivityLog, StandardCharsets.UTF_8)) { reader =>
+        var json: String = null
+        while (list.length < 50 && { json = reader.readLine(); json } != null) {
+          val activity = read[Activity](json)
+          if (!getRepositoryInfoFromCache(activity.userName, activity.repositoryName)
+                .map(_.isPrivate)
+                .getOrElse(true)) {
+            list += activity
           }
-          .mkString("\n")
-      ),
-      currentDate
-    )
+        }
+      }
+      list.toList
+    }
+  }
 
-  def recordCreateTagActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    tagName: String,
-    commits: List[JGitUtil.CommitInfo]
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "create_tag",
-      s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate
-    )
+  def getRecentActivitiesByOwners(owners: Set[String])(implicit context: Context): List[Activity] = {
+    if (!ActivityLog.exists()) {
+      List.empty
+    } else {
+      val list = new ListBuffer[Activity]
+      Using.resource(new ReversedLinesFileReader(ActivityLog, StandardCharsets.UTF_8)) { reader =>
+        var json: String = null
+        while (list.length < 50 && { json = reader.readLine(); json } != null) {
+          val activity = read[Activity](json)
+          if (owners.contains(activity.userName)) {
+            list += activity
+          } else if (!getRepositoryInfoFromCache(activity.userName, activity.repositoryName)
+                       .map(_.isPrivate)
+                       .getOrElse(true)) {
+            list += activity
+          }
+        }
+      }
+      list.toList
+    }
+  }
 
-  def recordDeleteTagActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    tagName: String,
-    commits: List[JGitUtil.CommitInfo]
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "delete_tag",
-      s"[user:${activityUserName}] deleted tag ${tagName} at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate
-    )
-
-  def recordCreateBranchActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    branchName: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "create_branch",
-      s"[user:${activityUserName}] created branch [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate
-    )
-
-  def recordDeleteBranchActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    branchName: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "delete_branch",
-      s"[user:${activityUserName}] deleted branch ${branchName} at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate
-    )
-
-  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(
-    implicit s: Session
-  ): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "fork",
-      s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${forkedUserName}/${repositoryName}]",
-      None,
-      currentDate
-    )
-
-  def recordPullRequestActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    title: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "open_pullreq",
-      s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate
-    )
-
-  def recordMergeActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    issueId: Int,
-    message: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "merge_pullreq",
-      s"[user:${activityUserName}] merged pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(message),
-      currentDate
-    )
-
-  def recordReleaseActivity(
-    userName: String,
-    repositoryName: String,
-    activityUserName: String,
-    releaseName: String,
-    tagName: String
-  )(implicit s: Session): Unit =
-    Activities insert Activity(
-      userName,
-      repositoryName,
-      activityUserName,
-      "release",
-      s"[user:${activityUserName}] released [release:${userName}/${repositoryName}/${tagName}:${releaseName}] at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate
-    )
-
-  private def cut(value: String, length: Int): String =
-    if (value.length > length) value.substring(0, length) + "..." else value
+  def recordActivity[T <: { def toActivity: Activity }](info: T): Unit =
+    writeLog(info.toActivity)
 }

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

@@ -47,6 +47,18 @@ trait CommitStatusService {
         )
     }
 
+  def getCommitStatusWithSummary(userName: String, repositoryName: String, sha: String)(
+    implicit s: Session
+  ): Option[(CommitState, List[CommitStatus])] = {
+    val statuses = getCommitStatuses(userName, repositoryName, sha)
+    if (statuses.isEmpty) {
+      None
+    } else {
+      val summary = CommitState.combine(statuses.groupBy(_.state).keySet)
+      Some((summary, statuses))
+    }
+  }
+
   def getCommitStatus(userName: String, repositoryName: String, id: Int)(implicit s: Session): Option[CommitStatus] =
     CommitStatuses.filter(t => t.byPrimaryKey(id) && t.byRepository(userName, repositoryName)).firstOption
 
@@ -55,10 +67,12 @@ trait CommitStatusService {
   ): Option[CommitStatus] =
     CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) && t.context === context.bind).firstOption
 
-  def getCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session): List[CommitStatus] =
-    byCommitStatues(userName, repositoryName, sha).list
+  def getCommitStatuses(userName: String, repositoryName: String, sha: String)(
+    implicit s: Session
+  ): List[CommitStatus] =
+    byCommitStatus(userName, repositoryName, sha).list
 
-  def getRecentStatuesContexts(userName: String, repositoryName: String, time: java.util.Date)(
+  def getRecentStatusContexts(userName: String, repositoryName: String, time: java.util.Date)(
     implicit s: Session
   ): List[String] =
     CommitStatuses
@@ -68,15 +82,15 @@ trait CommitStatusService {
       .map(_._1)
       .list
 
-  def getCommitStatuesWithCreator(userName: String, repositoryName: String, sha: String)(
+  def getCommitStatusesWithCreator(userName: String, repositoryName: String, sha: String)(
     implicit s: Session
   ): List[(CommitStatus, Account)] =
-    byCommitStatues(userName, repositoryName, sha)
+    byCommitStatus(userName, repositoryName, sha)
       .join(Accounts)
       .filter { case (t, a) => t.creator === a.userName }
       .list
 
-  protected def byCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session) =
+  protected def byCommitStatus(userName: String, repositoryName: String, sha: String)(implicit s: Session) =
     CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha)).sortBy(_.updatedDate desc)
 
 }

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

@@ -8,6 +8,7 @@ import gitbucket.core.model.{Account, CommitComment}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
+import gitbucket.core.model.activity.{CommitCommentInfo, PullRequestCommentInfo}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Directory._
@@ -80,13 +81,9 @@ trait CommitsService {
       case Some(issueId) =>
         getPullRequest(repository.owner, repository.name, issueId).foreach {
           case (issue, pullRequest) =>
-            recordCommentPullRequestActivity(
-              repository.owner,
-              repository.name,
-              loginAccount.userName,
-              issueId,
-              content
-            )
+            val pullRequestCommentInfo =
+              PullRequestCommentInfo(repository.owner, repository.name, loginAccount.userName, content, issueId)
+            recordActivity(pullRequestCommentInfo)
             PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId, content, issue, repository))
             callPullRequestReviewCommentWebHook(
               "create",
@@ -94,17 +91,14 @@ trait CommitsService {
               repository,
               issue,
               pullRequest,
-              loginAccount
+              loginAccount,
+              context.settings
             )
         }
       case None =>
-        recordCommentCommitActivity(
-          repository.owner,
-          repository.name,
-          loginAccount.userName,
-          commitId,
-          content
-        )
+        val commitCommentInfo =
+          CommitCommentInfo(repository.owner, repository.name, loginAccount.userName, content, commitId)
+        recordActivity(commitCommentInfo)
     }
 
     commentId

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

@@ -3,14 +3,14 @@ package gitbucket.core.service
 import java.io.ByteArrayInputStream
 
 import gitbucket.core.model.GpgKey
-
-import collection.JavaConverters._
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.bouncycastle.bcpg.ArmoredInputStream
 import org.bouncycastle.openpgp.PGPPublicKeyRing
 import org.bouncycastle.openpgp.bc.BcPGPObjectFactory
 
+import scala.jdk.CollectionConverters._
+
 trait GpgKeyService {
   def getGpgPublicKeys(userName: String)(implicit s: Session): List[GpgKey] =
     GpgKeys.filter(_.userName === userName.bind).sortBy(_.gpgKeyId).list

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

@@ -1,9 +1,18 @@
 package gitbucket.core.service
 
 import gitbucket.core.controller.Context
-import gitbucket.core.model.Issue
+import gitbucket.core.model.{Issue, IssueComment}
 import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.model.activity.{
+  CloseIssueInfo,
+  ClosePullRequestInfo,
+  IssueCommentInfo,
+  PullRequestCommentInfo,
+  ReopenIssueInfo,
+  ReopenPullRequestInfo
+}
+import gitbucket.core.plugin.{IssueHook, PluginRegistry}
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 
@@ -29,22 +38,31 @@ trait HandleCommentService {
         case (owner, name) =>
           val userName = loginAccount.userName
 
-          val (action, actionActivity) = actionOpt
+          actionOpt.collect {
+            case "close" if !issue.closed =>
+              updateClosed(owner, name, issue.issueId, true)
+            case "reopen" if issue.closed =>
+              updateClosed(owner, name, issue.issueId, false)
+          }
+
+          val (action, _) = actionOpt
             .collect {
-              case "close" if (!issue.closed) =>
-                true ->
-                  (Some("close") -> Some(
-                    if (issue.isPullRequest) recordClosePullRequestActivity _
-                    else recordCloseIssueActivity _
-                  ))
-              case "reopen" if (issue.closed) =>
-                false ->
-                  (Some("reopen") -> Some(recordReopenIssueActivity _))
-            }
-            .map {
-              case (closed, t) =>
-                updateClosed(owner, name, issue.issueId, closed)
-                t
+              case "close" if !issue.closed =>
+                val info = if (issue.isPullRequest) {
+                  ClosePullRequestInfo(owner, name, userName, issue.issueId, issue.title)
+                } else {
+                  CloseIssueInfo(owner, name, userName, issue.issueId, issue.title)
+                }
+                recordActivity(info)
+                Some("close") -> info
+              case "reopen" if issue.closed =>
+                val info = if (issue.isPullRequest) {
+                  ReopenPullRequestInfo(owner, name, userName, issue.issueId, issue.title)
+                } else {
+                  ReopenIssueInfo(owner, name, userName, issue.issueId, issue.title)
+                }
+                recordActivity(info)
+                Some("reopen") -> info
             }
             .getOrElse(None -> None)
 
@@ -65,8 +83,12 @@ trait HandleCommentService {
               )
 
               // record comment activity
-              if (issue.isPullRequest) recordCommentPullRequestActivity(owner, name, userName, issue.issueId, content)
-              else recordCommentIssueActivity(owner, name, userName, issue.issueId, content)
+              val commentInfo = if (issue.isPullRequest) {
+                PullRequestCommentInfo(owner, name, userName, content, issue.issueId)
+              } else {
+                IssueCommentInfo(owner, name, userName, content, issue.issueId)
+              }
+              recordActivity(commentInfo)
 
               // extract references and create refer comment
               createReferComment(owner, name, issue, content, loginAccount)
@@ -74,22 +96,19 @@ trait HandleCommentService {
               id
           }
 
-          actionActivity.foreach { f =>
-            f(owner, name, userName, issue.issueId, issue.title)
-          }
-
           // call web hooks
           action match {
-            case None => commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount))
+            case None =>
+              commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount, context.settings))
             case Some(act) =>
               val webHookAction = act match {
                 case "close"  => "closed"
                 case "reopen" => "reopened"
               }
               if (issue.isPullRequest)
-                callPullRequestWebHook(webHookAction, repository, issue.issueId, loginAccount)
+                callPullRequestWebHook(webHookAction, repository, issue.issueId, loginAccount, context.settings)
               else
-                callIssuesWebHook(webHookAction, repository, issue, loginAccount)
+                callIssuesWebHook(webHookAction, repository, issue, loginAccount, context.settings)
           }
 
           // call hooks
@@ -117,4 +136,59 @@ trait HandleCommentService {
     }
   }
 
+  def deleteCommentByApi(repoInfo: RepositoryInfo, comment: IssueComment, issue: Issue)(
+    implicit context: Context,
+    s: Session
+  ): Option[IssueComment] = context.loginAccount.flatMap { _ =>
+    comment.action match {
+      case "comment" =>
+        val deleteResult = deleteComment(repoInfo.owner, repoInfo.name, comment.issueId, comment.commentId)
+        val registry = PluginRegistry()
+        val hooks: Seq[IssueHook] = if (issue.isPullRequest) registry.getPullRequestHooks else registry.getIssueHooks
+        hooks.foreach(_.deletedComment(comment.commentId, issue, repoInfo))
+        deleteResult match {
+          case n if n > 0 => Some(comment)
+          case _          => None
+        }
+      case _ => None
+    }
+  }
+
+  def updateCommentByApi(
+    repository: RepositoryService.RepositoryInfo,
+    issue: Issue,
+    commentId: String,
+    content: Option[String]
+  )(implicit context: Context, s: Session): Option[(Issue, Int)] = {
+    context.loginAccount.flatMap { loginAccount =>
+      defining(repository.owner, repository.name) {
+        case (owner, name) =>
+          val userName = loginAccount.userName
+          content match {
+            case Some(content) =>
+              // Update comment
+              val _commentId = Some(updateComment(issue.issueId, commentId.toInt, content))
+              // Record comment activity
+              val commentInfo = if (issue.isPullRequest) {
+                PullRequestCommentInfo(owner, name, userName, content, issue.issueId)
+              } else {
+                IssueCommentInfo(owner, name, userName, content, issue.issueId)
+              }
+              recordActivity(commentInfo)
+              // extract references and create refer comment
+              createReferComment(owner, name, issue, content, loginAccount)
+              // call web hooks
+              commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount, context.settings))
+              // call hooks
+              if (issue.isPullRequest)
+                PluginRegistry().getPullRequestHooks
+                  .foreach(_.updatedComment(commentId.toInt, content, issue, repository))
+              else
+                PluginRegistry().getIssueHooks.foreach(_.updatedComment(commentId.toInt, content, issue, repository))
+              _commentId.map(issue -> _)
+            case _ => None
+          }
+      }
+    }
+  }
 }

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

@@ -3,6 +3,7 @@ package gitbucket.core.service
 import gitbucket.core.controller.Context
 import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.model.activity.CreateIssueInfo
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Implicits._
@@ -51,13 +52,14 @@ trait IssueCreationService {
     }
 
     // record activity
-    recordCreateIssueActivity(owner, name, userName, issueId, title)
+    val createIssueInfo = CreateIssueInfo(owner, name, userName, issueId, title)
+    recordActivity(createIssueInfo)
 
     // extract references and create refer comment
     createReferComment(owner, name, issue, title + " " + body.getOrElse(""), loginAccount)
 
     // call web hooks
-    callIssuesWebHook("opened", repository, issue, loginAccount)
+    callIssuesWebHook("opened", repository, issue, loginAccount, context.settings)
 
     // call hooks
     PluginRegistry().getIssueHooks.foreach(_.created(issue, repository))
@@ -72,6 +74,13 @@ trait IssueCreationService {
     hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
   }
 
+  /**
+   * Tests whether an logged-in user can manage issues comment.
+   */
+  protected def isIssueCommentManageable(repository: RepositoryInfo)(implicit context: Context, s: Session): Boolean = {
+    hasOwnerRole(repository.owner, repository.name, context.loginAccount)
+  }
+
   /**
    * Tests whether an logged-in user can post issues.
    */

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

@@ -31,6 +31,9 @@ trait IssuesService {
       Issues filter (_.byPrimaryKey(owner, repository, issueId.toInt)) firstOption
     else None
 
+  def getOpenIssues(owner: String, repository: String)(implicit s: Session): List[Issue] =
+    Issues filter (_.byRepository(owner, repository)) filterNot (_.closed) sortBy (_.issueId desc) list
+
   def getComments(owner: String, repository: String, issueId: Int)(implicit s: Session) =
     IssueComments filter (_.byIssue(owner, repository, issueId)) sortBy (_.commentId asc) list
 
@@ -68,6 +71,20 @@ trait IssuesService {
     else None
   }
 
+  def getCommentForApi(owner: String, repository: String, commentId: Int)(
+    implicit s: Session
+  ): Option[(IssueComment, Account, Issue)] =
+    IssueComments
+      .filter(_.byRepository(owner, repository))
+      .filter(_.commentId === commentId)
+      .filter(_.action inSetBind Set("comment", "close_comment", "reopen_comment"))
+      .join(Accounts)
+      .on { case t1 ~ t2 => t1.commentedUserName === t2.userName }
+      .join(Issues)
+      .on { case t1 ~ t2 ~ t3 => t3.byIssue(t1.userName, t1.repositoryName, t1.issueId) }
+      .map { case t1 ~ t2 ~ t3 => (t1, t2, t3) }
+      .firstOption
+
   def getIssueLabels(owner: String, repository: String, issueId: Int)(implicit s: Session): List[Label] = {
     IssueLabels
       .join(Labels)
@@ -90,14 +107,14 @@ trait IssuesService {
    * Returns the count of the search result against  issues.
    *
    * @param condition the search condition
-   * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request.
+   * @param searchOption if true then counts only pull request, false then counts both of issue and pull request.
    * @param repos Tuple of the repository owner and the repository name
    * @return the count of the search result
    */
-  def countIssue(condition: IssueSearchCondition, onlyPullRequest: Boolean, repos: (String, String)*)(
+  def countIssue(condition: IssueSearchCondition, searchOption: IssueSearchOption, repos: (String, String)*)(
     implicit s: Session
   ): Int = {
-    Query(searchIssueQuery(repos, condition, onlyPullRequest).length).first
+    Query(searchIssueQuery(repos, condition, searchOption).length).first
   }
 
   /**
@@ -115,7 +132,7 @@ trait IssuesService {
     filterUser: Map[String, String]
   )(implicit s: Session): Map[String, Int] = {
 
-    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false)
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), IssueSearchOption.Issues)
       .join(IssueLabels)
       .on {
         case t1 ~ t2 =>
@@ -153,7 +170,7 @@ trait IssuesService {
     filterUser: Map[String, String]
   )(implicit s: Session): Map[String, Int] = {
 
-    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false)
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), IssueSearchOption.Issues)
       .join(Priorities)
       .on {
         case t1 ~ t2 =>
@@ -171,42 +188,11 @@ trait IssuesService {
       .toMap
   }
 
-  def getCommitStatues(userName: String, repositoryName: String, issueId: Int)(
-    implicit s: Session
-  ): Option[CommitStatusInfo] = {
-    val status = PullRequests
-      .filter { pr =>
-        pr.userName === userName.bind && pr.repositoryName === repositoryName.bind && pr.issueId === issueId.bind
-      }
-      .join(CommitStatuses)
-      .on {
-        case pr ~ cs =>
-          pr.userName === cs.userName && pr.repositoryName === cs.repositoryName && pr.commitIdTo === cs.commitId
-      }
-      .list
-
-    if (status.nonEmpty) {
-      val (_, cs) = status.head
-      Some(
-        CommitStatusInfo(
-          count = status.length,
-          successCount = status.count(_._2.state == CommitState.SUCCESS),
-          context = (if (status.length == 1) Some(cs.context) else None),
-          state = (if (status.length == 1) Some(cs.state) else None),
-          targetUrl = (if (status.length == 1) cs.targetUrl else None),
-          description = (if (status.length == 1) cs.description else None)
-        )
-      )
-    } else {
-      None
-    }
-  }
-
   /**
-   * Returns the search result against  issues.
+   * Returns the search result against issues.
    *
    * @param condition the search condition
-   * @param pullRequest if true then returns only pull requests, false then returns only issues.
+   * @param searchOption if true then returns only pull requests, false then returns only issues.
    * @param offset the offset for pagination
    * @param limit the limit for pagination
    * @param repos Tuple of the repository owner and the repository name
@@ -214,13 +200,13 @@ trait IssuesService {
    */
   def searchIssue(
     condition: IssueSearchCondition,
-    pullRequest: Boolean,
+    searchOption: IssueSearchOption,
     offset: Int,
     limit: Int,
     repos: (String, String)*
   )(implicit s: Session): List[IssueInfo] = {
     // get issues and comment count and labels
-    val result = searchIssueQueryBase(condition, pullRequest, offset, limit, repos)
+    val result = searchIssueQueryBase(condition, searchOption, offset, limit, repos)
       .joinLeft(IssueLabels)
       .on { case t1 ~ t2 ~ i ~ t3 => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
       .joinLeft(Labels)
@@ -229,9 +215,11 @@ trait IssuesService {
       .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
       .joinLeft(Priorities)
       .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t1.byPriority(t6.userName, t6.repositoryName, t6.priorityId) }
-      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
+      .joinLeft(PullRequests)
+      .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => t1.byIssue(t7.userName, t7.repositoryName, t7.issueId) }
+      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => i asc }
       .map {
-        case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 =>
+        case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 =>
           (
             t1,
             t2.commentCount,
@@ -239,7 +227,8 @@ trait IssuesService {
             t4.map(_.labelName),
             t4.map(_.color),
             t5.map(_.title),
-            t6.map(_.priorityName)
+            t6.map(_.priorityName),
+            t7.map(_.commitIdTo)
           )
       }
       .list
@@ -249,7 +238,7 @@ trait IssuesService {
 
     result.map { issues =>
       issues.head match {
-        case (issue, commentCount, _, _, _, milestone, priority) =>
+        case (issue, commentCount, _, _, _, milestone, priority, commitId) =>
           IssueInfo(
             issue,
             issues.flatMap { t =>
@@ -258,24 +247,26 @@ trait IssuesService {
             milestone,
             priority,
             commentCount,
-            getCommitStatues(issue.userName, issue.repositoryName, issue.issueId)
+            commitId
           )
       }
     } toList
   }
 
   /** for api
-   * @return (issue, issueUser, commentCount)
+   * @return (issue, issueUser, assignedUser)
    */
   def searchIssueByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*)(
     implicit s: Session
-  ): List[(Issue, Account)] = {
+  ): List[(Issue, Account, Option[Account])] = {
     // get issues and comment count and labels
-    searchIssueQueryBase(condition, false, offset, limit, repos)
+    searchIssueQueryBase(condition, IssueSearchOption.Issues, offset, limit, repos)
       .join(Accounts)
       .on { case t1 ~ t2 ~ i ~ t3 => t3.userName === t1.openedUserName }
-      .sortBy { case t1 ~ t2 ~ i ~ t3 => i asc }
-      .map { case t1 ~ t2 ~ i ~ t3 => (t1, t3) }
+      .joinLeft(Accounts)
+      .on { case t1 ~ t2 ~ i ~ t3 ~ t4 => t4.userName === t1.assignedUserName }
+      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 => i asc }
+      .map { case t1 ~ t2 ~ i ~ t3 ~ t4 => (t1, t3, t4) }
       .list
   }
 
@@ -286,7 +277,7 @@ trait IssuesService {
     implicit s: Session
   ): List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] = {
     // get issues and comment count and labels
-    searchIssueQueryBase(condition, true, offset, limit, repos)
+    searchIssueQueryBase(condition, IssueSearchOption.PullRequests, offset, limit, repos)
       .join(PullRequests)
       .on { case t1 ~ t2 ~ i ~ t3 => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
       .join(Repositories)
@@ -304,12 +295,12 @@ trait IssuesService {
 
   private def searchIssueQueryBase(
     condition: IssueSearchCondition,
-    pullRequest: Boolean,
+    searchOption: IssueSearchOption,
     offset: Int,
     limit: Int,
     repos: Seq[(String, String)]
   )(implicit s: Session) =
-    searchIssueQuery(repos, condition, pullRequest)
+    searchIssueQuery(repos, condition, searchOption)
       .join(IssueOutline)
       .on { (t1, t2) =>
         t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
@@ -347,7 +338,11 @@ trait IssuesService {
   /**
    * Assembles query for conditional issue searching.
    */
-  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition, pullRequest: Boolean)(
+  private def searchIssueQuery(
+    repos: Seq[(String, String)],
+    condition: IssueSearchCondition,
+    searchOption: IssueSearchOption
+  )(
     implicit s: Session
   ) =
     Issues filter { t1 =>
@@ -361,7 +356,11 @@ trait IssuesService {
       (t1.priorityId.? isEmpty, condition.priority == Some(None)) &&
       (t1.assignedUserName.? isEmpty, condition.assigned == Some(None)) &&
       (t1.openedUserName === condition.author.get.bind, condition.author.isDefined) &&
-      (t1.pullRequest === pullRequest.bind) &&
+      (searchOption match {
+        case IssueSearchOption.Issues       => t1.pullRequest === false
+        case IssueSearchOption.PullRequests => t1.pullRequest === true
+        case IssueSearchOption.Both         => t1.pullRequest === false || t1.pullRequest === true
+      }) &&
       // Milestone filter
       (Milestones filter { t2 =>
         (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) &&
@@ -633,7 +632,10 @@ trait IssuesService {
     IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
   }
 
-  def deleteComment(issueId: Int, commentId: Int)(implicit s: Session): Int = {
+  def deleteComment(owner: String, repository: String, issueId: Int, commentId: Int)(
+    implicit context: Context,
+    s: Session
+  ): Int = {
     Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
     IssueComments.filter(_.byPrimaryKey(commentId)).firstOption match {
       case Some(c) if c.action == "reopen_comment" =>
@@ -642,6 +644,16 @@ trait IssuesService {
         IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.action)).update("Close", "close")
       case Some(_) =>
         IssueComments.filter(_.byPrimaryKey(commentId)).delete
+        IssueComments insert IssueComment(
+          userName = owner,
+          repositoryName = repository,
+          issueId = issueId,
+          action = "delete_comment",
+          commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
+          content = s"",
+          registeredDate = currentDate,
+          updatedDate = currentDate
+        )
     }
   }
 
@@ -752,7 +764,7 @@ trait IssuesService {
     implicit s: Session
   ): Unit = {
     extractIssueId(message).foreach { issueId =>
-      val content = fromIssue.issueId + ":" + fromIssue.title
+      val content = s"${fromIssue.issueId}:${fromIssue.title}"
       if (getIssue(owner, repository, issueId).isDefined) {
         // Not add if refer comment already exist.
         if (!getComments(owner, repository, issueId.toInt).exists { x =>
@@ -908,23 +920,31 @@ object IssuesService {
         param(request, "groups").map(_.split(",").toSet).getOrElse(Set.empty)
       )
 
-    def page(request: HttpServletRequest) =
-      try {
-        val i = param(request, "page").getOrElse("1").toInt
-        if (i <= 0) 1 else i
-      } catch {
-        case e: NumberFormatException => 1
-      }
-  }
+    def apply(request: HttpServletRequest, milestone: String): IssueSearchCondition =
+      IssueSearchCondition(
+        param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
+        Some(Some(milestone)),
+        param(request, "priority").map {
+          case "none" => None
+          case x      => Some(x)
+        },
+        param(request, "author"),
+        param(request, "assigned").map {
+          case "none" => None
+          case x      => Some(x)
+        },
+        param(request, "mentioned"),
+        param(request, "state", Seq("open", "closed")).getOrElse("open"),
+        param(request, "sort", Seq("created", "comments", "updated", "priority")).getOrElse("created"),
+        param(request, "direction", Seq("asc", "desc")).getOrElse("desc"),
+        param(request, "visibility"),
+        param(request, "groups").map(_.split(",").toSet).getOrElse(Set.empty)
+      )
 
-  case class CommitStatusInfo(
-    count: Int,
-    successCount: Int,
-    context: Option[String],
-    state: Option[CommitState],
-    targetUrl: Option[String],
-    description: Option[String]
-  )
+    def page(request: HttpServletRequest) = {
+      PaginationHelper.page(param(request, "page"))
+    }
+  }
 
   case class IssueInfo(
     issue: Issue,
@@ -932,7 +952,14 @@ object IssuesService {
     milestone: Option[String],
     priority: Option[String],
     commentCount: Int,
-    status: Option[CommitStatusInfo]
+    commitId: Option[String]
   )
-
+}
+
+sealed trait IssueSearchOption
+
+object IssueSearchOption {
+  case object Issues extends IssueSearchOption
+  case object PullRequests extends IssueSearchOption
+  case object Both extends IssueSearchOption
 }

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

@@ -2,23 +2,24 @@ package gitbucket.core.service
 
 import gitbucket.core.api.JsonFormat
 import gitbucket.core.controller.Context
-import gitbucket.core.model.{Account, PullRequest, WebHook}
-import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.model.{Account, Issue, PullRequest, WebHook}
+import gitbucket.core.plugin.{PluginRegistry, ReceiveHook}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.{JGitUtil, LockUtil}
-import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.model.activity.{CloseIssueInfo, MergeInfo, PushInfo}
+import gitbucket.core.service.SystemSettingsService.SystemSettings
+import gitbucket.core.util.JGitUtil.CommitInfo
 import org.eclipse.jgit.merge.{MergeStrategy, Merger, RecursiveMerger}
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.transport.RefSpec
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack, RefSpec}
 import org.eclipse.jgit.errors.NoMergeBaseException
 import org.eclipse.jgit.lib.{CommitBuilder, ObjectId, PersonIdent, Repository}
 import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+import scala.util.Using
 
 trait MergeService {
   self: AccountService
@@ -35,8 +36,8 @@ trait MergeService {
    * Returns true if conflict will be caused.
    */
   def checkConflict(userName: String, repositoryName: String, branch: String, issueId: Int): Option[String] = {
-    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
-      new MergeCacheInfo(git, branch, issueId).checkConflict()
+    Using.resource(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
+      new MergeCacheInfo(git, userName, repositoryName, branch, issueId, Nil).checkConflict()
     }
   }
 
@@ -52,42 +53,48 @@ trait MergeService {
     branch: String,
     issueId: Int
   ): Option[Option[String]] = {
-    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
-      new MergeCacheInfo(git, branch, issueId).checkConflictCache()
+    Using.resource(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
+      new MergeCacheInfo(git, userName, repositoryName, branch, issueId, Nil).checkConflictCache()
     }
   }
 
   /** merge the pull request with a merge commit */
-  def mergePullRequest(
+  def mergeWithMergeCommit(
     git: Git,
+    userName: String,
+    repositoryName: String,
     branch: String,
     issueId: Int,
     message: String,
     committer: PersonIdent
-  ): ObjectId = {
-    new MergeCacheInfo(git, branch, issueId).merge(message, committer)
+  )(implicit s: Session): ObjectId = {
+    new MergeCacheInfo(git, userName, repositoryName, branch, issueId, getReceiveHooks()).merge(message, committer)
   }
 
   /** rebase to the head of the pull request branch */
-  def rebasePullRequest(
+  def mergeWithRebase(
     git: Git,
+    userName: String,
+    repositoryName: String,
     branch: String,
     issueId: Int,
     commits: Seq[RevCommit],
     committer: PersonIdent
-  ): ObjectId = {
-    new MergeCacheInfo(git, branch, issueId).rebase(committer, commits)
+  )(implicit s: Session): ObjectId = {
+    new MergeCacheInfo(git, userName, repositoryName, branch, issueId, getReceiveHooks()).rebase(committer, commits)
   }
 
   /** squash commits in the pull request and append it */
-  def squashPullRequest(
+  def mergeWithSquash(
     git: Git,
+    userName: String,
+    repositoryName: String,
     branch: String,
     issueId: Int,
     message: String,
     committer: PersonIdent
-  ): ObjectId = {
-    new MergeCacheInfo(git, branch, issueId).squash(message, committer)
+  )(implicit s: Session): ObjectId = {
+    new MergeCacheInfo(git, userName, repositoryName, branch, issueId, getReceiveHooks()).squash(message, committer)
   }
 
   /** fetch remote branch to my repository refs/pull/{issueId}/head */
@@ -99,7 +106,7 @@ trait MergeService {
     requestBranch: String,
     issueId: Int
   ): Unit = {
-    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
+    Using.resource(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
       git.fetch
         .setRemote(getRepositoryDir(requestUserName, requestRepositoryName).toURI.toString)
         .setRefSpecs(new RefSpec(s"refs/heads/${requestBranch}:refs/pull/${issueId}/head"))
@@ -118,7 +125,7 @@ trait MergeService {
     remoteRepositoryName: String,
     remoteBranch: String
   ): Either[String, (ObjectId, ObjectId, ObjectId)] = {
-    using(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
+    Using.resource(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
       val remoteRefName = s"refs/heads/${remoteBranch}"
       val tmpRefName = s"refs/remote-temp/${remoteUserName}/${remoteRepositoryName}/${remoteBranch}"
       val refSpec = new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true)
@@ -169,7 +176,8 @@ trait MergeService {
     remoteBranch: String,
     loginAccount: Account,
     message: String,
-    pullreq: Option[PullRequest]
+    pullRequest: Option[PullRequest],
+    settings: SystemSettings
   )(implicit s: Session, c: JsonFormat.Context): Option[ObjectId] = {
     val localUserName = localRepository.owner
     val localRepositoryName = localRepository.name
@@ -177,7 +185,7 @@ trait MergeService {
     val remoteRepositoryName = remoteRepository.name
     tryMergeRemote(localUserName, localRepositoryName, localBranch, remoteUserName, remoteRepositoryName, remoteBranch).map {
       case (newTreeId, oldBaseId, oldHeadId) =>
-        using(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
+        Using.resource(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
           val existIds = JGitUtil.getAllCommitIds(git).toSet
 
           val committer = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
@@ -200,13 +208,14 @@ trait MergeService {
           }
 
           // record activity
-          recordPushActivity(
+          val pushInfo = PushInfo(
             localUserName,
             localRepositoryName,
             loginAccount.userName,
             localBranch,
             commits
           )
+          recordActivity(pushInfo)
 
           // close issue by commit message
           if (localBranch == localRepository.repository.defaultBranch) {
@@ -214,7 +223,15 @@ trait MergeService {
               closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, localUserName, localRepositoryName)
                 .foreach { issueId =>
                   getIssue(localRepository.owner, localRepository.name, issueId.toString).foreach { issue =>
-                    callIssuesWebHook("closed", localRepository, issue, loginAccount)
+                    callIssuesWebHook("closed", localRepository, issue, loginAccount, settings)
+                    val closeIssueInfo = CloseIssueInfo(
+                      localRepository.owner,
+                      localRepository.name,
+                      localUserName,
+                      issue.issueId,
+                      issue.title
+                    )
+                    recordActivity(closeIssueInfo)
                     PluginRegistry().getIssueHooks
                       .foreach(
                         _.closedByCommitComment(issue, localRepository, commit.fullMessage, loginAccount)
@@ -224,15 +241,15 @@ trait MergeService {
             }
           }
 
-          pullreq.foreach { pullreq =>
-            callWebHookOf(localRepository.owner, localRepository.name, WebHook.Push) {
+          pullRequest.foreach { pullRequest =>
+            callWebHookOf(localRepository.owner, localRepository.name, WebHook.Push, settings) {
               for {
                 ownerAccount <- getAccountByUserName(localRepository.owner)
               } yield {
                 WebHookService.WebHookPushPayload(
                   git,
                   loginAccount,
-                  pullreq.requestBranch,
+                  pullRequest.requestBranch,
                   localRepository,
                   commits,
                   ownerAccount,
@@ -247,140 +264,220 @@ trait MergeService {
     }.toOption
   }
 
+  protected def getReceiveHooks(): Seq[ReceiveHook] = {
+    PluginRegistry().getReceiveHooks
+  }
+
   def mergePullRequest(
     repository: RepositoryInfo,
     issueId: Int,
     loginAccount: Account,
     message: String,
-    strategy: String
+    strategy: String,
+    isDraft: Boolean,
+    settings: SystemSettings
   )(implicit s: Session, c: JsonFormat.Context, context: Context): Either[String, ObjectId] = {
-    if (repository.repository.options.mergeOptions.split(",").contains(strategy)) {
-      LockUtil.lock(s"${repository.owner}/${repository.name}") {
-        getPullRequest(repository.owner, repository.name, issueId)
-          .map {
-            case (issue, pullreq) =>
-              using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-                // mark issue as merged and close.
-                val commentId =
-                  createComment(repository.owner, repository.name, loginAccount.userName, issueId, message, "merge")
-                createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close")
-                updateClosed(repository.owner, repository.name, issueId, true)
+    if (!isDraft) {
+      if (repository.repository.options.mergeOptions.split(",").contains(strategy)) {
+        LockUtil.lock(s"${repository.owner}/${repository.name}") {
+          getPullRequest(repository.owner, repository.name, issueId)
+            .map {
+              case (issue, pullRequest) =>
+                Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+                  val (commits, _) = getRequestCompareInfo(
+                    repository.owner,
+                    repository.name,
+                    pullRequest.commitIdFrom,
+                    pullRequest.requestUserName,
+                    pullRequest.requestRepositoryName,
+                    pullRequest.commitIdTo
+                  )
 
-                // record activity
-                recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, message)
+                  // merge git repository
+                  mergeGitRepository(
+                    git,
+                    repository,
+                    issue,
+                    pullRequest,
+                    loginAccount,
+                    message,
+                    strategy,
+                    commits,
+                    getReceiveHooks()
+                  ) match {
+                    case Some(newCommitId) =>
+                      // mark issue as merged and close.
+                      val commentId =
+                        createComment(
+                          repository.owner,
+                          repository.name,
+                          loginAccount.userName,
+                          issueId,
+                          message,
+                          "merge"
+                        )
+                      createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close")
+                      updateClosed(repository.owner, repository.name, issueId, true)
 
-                val (commits, _) = getRequestCompareInfo(
-                  repository.owner,
-                  repository.name,
-                  pullreq.commitIdFrom,
-                  pullreq.requestUserName,
-                  pullreq.requestRepositoryName,
-                  pullreq.commitIdTo
-                )
+                      // record activity
+                      val mergeInfo =
+                        MergeInfo(repository.owner, repository.name, loginAccount.userName, issueId, message)
+                      recordActivity(mergeInfo)
+                      updateLastActivityDate(repository.owner, repository.name)
 
-                val revCommits = using(new RevWalk(git.getRepository)) { revWalk =>
-                  commits.flatten.map { commit =>
-                    revWalk.parseCommit(git.getRepository.resolve(commit.id))
-                  }
-                }.reverse
-
-                // merge git repository
-                (strategy match {
-                  case "merge-commit" =>
-                    Some(
-                      mergePullRequest(
-                        git,
-                        pullreq.branch,
-                        issueId,
-                        s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" + message,
-                        new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
-                      )
-                    )
-                  case "rebase" =>
-                    Some(
-                      rebasePullRequest(
-                        git,
-                        pullreq.branch,
-                        issueId,
-                        revCommits,
-                        new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
-                      )
-                    )
-                  case "squash" =>
-                    Some(
-                      squashPullRequest(
-                        git,
-                        pullreq.branch,
-                        issueId,
-                        s"${issue.title} (#${issueId})\n\n" + message,
-                        new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
-                      )
-                    )
-                  case _ =>
-                    None
-                }) match {
-                  case Some(newCommitId) =>
-                    // close issue by content of pull request
-                    val defaultBranch = getRepository(repository.owner, repository.name).get.repository.defaultBranch
-                    if (pullreq.branch == defaultBranch) {
-                      commits.flatten.foreach { commit =>
+                      // close issue by content of pull request
+                      val defaultBranch = getRepository(repository.owner, repository.name).get.repository.defaultBranch
+                      if (pullRequest.branch == defaultBranch) {
+                        commits.flatten.foreach { commit =>
+                          closeIssuesFromMessage(
+                            commit.fullMessage,
+                            loginAccount.userName,
+                            repository.owner,
+                            repository.name
+                          ).foreach { issueId =>
+                            getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                              callIssuesWebHook("closed", repository, issue, loginAccount, context.settings)
+                              val closeIssueInfo = CloseIssueInfo(
+                                repository.owner,
+                                repository.name,
+                                loginAccount.userName,
+                                issue.issueId,
+                                issue.title
+                              )
+                              recordActivity(closeIssueInfo)
+                              PluginRegistry().getIssueHooks
+                                .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
+                            }
+                          }
+                        }
+                        val issueContent = issue.title + " " + issue.content.getOrElse("")
                         closeIssuesFromMessage(
-                          commit.fullMessage,
+                          issueContent,
                           loginAccount.userName,
                           repository.owner,
                           repository.name
                         ).foreach { issueId =>
                           getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                            callIssuesWebHook("closed", repository, issue, loginAccount)
-                            PluginRegistry().getIssueHooks
-                              .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
-                          }
-                        }
-                      }
-                      val issueContent = issue.title + " " + issue.content.getOrElse("")
-                      closeIssuesFromMessage(
-                        issueContent,
-                        loginAccount.userName,
-                        repository.owner,
-                        repository.name
-                      ).foreach { issueId =>
-                        getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                          callIssuesWebHook("closed", repository, issue, loginAccount)
-                          PluginRegistry().getIssueHooks
-                            .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
-                        }
-                      }
-                      closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
-                        .foreach { issueId =>
-                          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                            callIssuesWebHook("closed", repository, issue, loginAccount)
+                            callIssuesWebHook("closed", repository, issue, loginAccount, context.settings)
+                            val closeIssueInfo = CloseIssueInfo(
+                              repository.owner,
+                              repository.name,
+                              loginAccount.userName,
+                              issue.issueId,
+                              issue.title
+                            )
+                            recordActivity(closeIssueInfo)
                             PluginRegistry().getIssueHooks
                               .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
                           }
                         }
-                    }
+                        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+                          .foreach { issueId =>
+                            getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                              callIssuesWebHook("closed", repository, issue, loginAccount, context.settings)
+                              val closeIssueInfo = CloseIssueInfo(
+                                repository.owner,
+                                repository.name,
+                                loginAccount.userName,
+                                issue.issueId,
+                                issue.title
+                              )
+                              recordActivity(closeIssueInfo)
+                              PluginRegistry().getIssueHooks
+                                .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
+                            }
+                          }
+                      }
 
-                    callPullRequestWebHook("closed", repository, issueId, context.loginAccount.get)
+                      callPullRequestWebHook("closed", repository, issueId, context.loginAccount.get, context.settings)
 
-                    updatePullRequests(repository.owner, repository.name, pullreq.branch, loginAccount, "closed")
+                      updatePullRequests(
+                        repository.owner,
+                        repository.name,
+                        pullRequest.branch,
+                        loginAccount,
+                        "closed",
+                        settings
+                      )
 
-                    // call hooks
-                    PluginRegistry().getPullRequestHooks.foreach { h =>
-                      h.addedComment(commentId, message, issue, repository)
-                      h.merged(issue, repository)
-                    }
+                      // call hooks
+                      PluginRegistry().getPullRequestHooks.foreach { h =>
+                        h.addedComment(commentId, message, issue, repository)
+                        h.merged(issue, repository)
+                      }
 
-                    Right(newCommitId)
-                  case None =>
-                    Left("Unknown strategy")
+                      Right(newCommitId)
+                    case None =>
+                      Left("Unknown strategy")
+                  }
                 }
-              }
-            case _ => Left("Unknown error")
-          }
-          .getOrElse(Left("Pull request not found"))
-      }
-    } else Left("Strategy not allowed")
+              case _ => Left("Unknown error")
+            }
+            .getOrElse(Left("Pull request not found"))
+        }
+      } else Left("Strategy not allowed")
+    } else Left("Draft pull requests cannot be merged")
+  }
 
+  private def mergeGitRepository(
+    git: Git,
+    repository: RepositoryInfo,
+    issue: Issue,
+    pullRequest: PullRequest,
+    loginAccount: Account,
+    message: String,
+    strategy: String,
+    commits: Seq[Seq[CommitInfo]],
+    receiveHooks: Seq[ReceiveHook]
+  )(implicit s: Session): Option[ObjectId] = {
+    val revCommits = Using
+      .resource(new RevWalk(git.getRepository)) { revWalk =>
+        commits.flatten.map { commit =>
+          revWalk.parseCommit(git.getRepository.resolve(commit.id))
+        }
+      }
+      .reverse
+
+    strategy match {
+      case "merge-commit" =>
+        Some(
+          mergeWithMergeCommit(
+            git,
+            repository.owner,
+            repository.name,
+            pullRequest.branch,
+            issue.issueId,
+            s"Merge pull request #${issue.issueId} from ${pullRequest.requestUserName}/${pullRequest.requestBranch}\n\n" + message,
+            new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+          )
+        )
+      case "rebase" =>
+        Some(
+          mergeWithRebase(
+            git,
+            repository.owner,
+            repository.name,
+            pullRequest.branch,
+            issue.issueId,
+            revCommits,
+            new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+          )
+        )
+      case "squash" =>
+        Some(
+          mergeWithSquash(
+            git,
+            repository.owner,
+            repository.name,
+            pullRequest.branch,
+            issue.issueId,
+            s"${issue.title} (#${issue.issueId})\n\n" + message,
+            new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+          )
+        )
+      case _ =>
+        None
+    }
   }
 }
 
@@ -402,7 +499,7 @@ object MergeService {
       mergeCommit.setCommitter(committer)
       mergeCommit.setMessage(message)
       // insertObject and got mergeCommit Object Id
-      using(repository.newObjectInserter) { inserter =>
+      Using.resource(repository.newObjectInserter) { inserter =>
         val mergeCommitId = inserter.insert(mergeCommit)
         inserter.flush()
         mergeCommitId
@@ -428,18 +525,22 @@ object MergeService {
     }
   }
 
-  class MergeCacheInfo(git: Git, branch: String, issueId: Int) {
-
-    private val repository = git.getRepository
-
+  class MergeCacheInfo(
+    git: Git,
+    userName: String,
+    repositoryName: String,
+    branch: String,
+    issueId: Int,
+    receiveHooks: Seq[ReceiveHook]
+  ) {
     private val mergedBranchName = s"refs/pull/${issueId}/merge"
     private val conflictedBranchName = s"refs/pull/${issueId}/conflict"
 
-    lazy val mergeBaseTip = repository.resolve(s"refs/heads/${branch}")
-    lazy val mergeTip = repository.resolve(s"refs/pull/${issueId}/head")
+    lazy val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${branch}")
+    lazy val mergeTip = git.getRepository.resolve(s"refs/pull/${issueId}/head")
 
     def checkConflictCache(): Option[Option[String]] = {
-      Option(repository.resolve(mergedBranchName))
+      Option(git.getRepository.resolve(mergedBranchName))
         .flatMap { merged =>
           if (parseCommit(merged).getParents().toSet == Set(mergeBaseTip, mergeTip)) {
             // merged branch exists
@@ -448,7 +549,7 @@ object MergeService {
             None
           }
         }
-        .orElse(Option(repository.resolve(conflictedBranchName)).flatMap { conflicted =>
+        .orElse(Option(git.getRepository.resolve(conflictedBranchName)).flatMap { conflicted =>
           val commit = parseCommit(conflicted)
           if (commit.getParents().toSet == Set(mergeBaseTip, mergeTip)) {
             // conflict branch exists
@@ -464,19 +565,19 @@ object MergeService {
     }
 
     def checkConflictForce(): Option[String] = {
-      val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
+      val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
       val conflicted = try {
         !merger.merge(mergeBaseTip, mergeTip)
       } catch {
         case e: NoMergeBaseException => true
       }
-      val mergeTipCommit = using(new RevWalk(repository))(_.parseCommit(mergeTip))
+      val mergeTipCommit = Using.resource(new RevWalk(git.getRepository))(_.parseCommit(mergeTip))
       val committer = mergeTipCommit.getCommitterIdent
 
       def _updateBranch(treeId: ObjectId, message: String, branchName: String): Unit = {
         // creates merge commit
         val mergeCommitId = createMergeCommit(treeId, committer, message)
-        Util.updateRefs(repository, branchName, mergeCommitId, true, committer)
+        Util.updateRefs(git.getRepository, branchName, mergeCommitId, true, committer)
       }
 
       if (!conflicted) {
@@ -492,26 +593,48 @@ object MergeService {
     }
 
     // update branch from cache
-    def merge(message: String, committer: PersonIdent): ObjectId = {
+    def merge(message: String, committer: PersonIdent)(implicit s: Session): ObjectId = {
       if (checkConflict().isDefined) {
         throw new RuntimeException("This pull request can't merge automatically.")
       }
-      val mergeResultCommit = parseCommit(Option(repository.resolve(mergedBranchName)).getOrElse {
+      val mergeResultCommit = parseCommit(Option(git.getRepository.resolve(mergedBranchName)).getOrElse {
         throw new RuntimeException(s"Not found branch ${mergedBranchName}")
       })
       // creates merge commit
       val mergeCommitId = createMergeCommit(mergeResultCommit.getTree().getId(), committer, message)
+
+      val refName = s"refs/heads/${branch}"
+      val currentObjectId = git.getRepository.resolve(refName)
+      val receivePack = new ReceivePack(git.getRepository)
+      val receiveCommand = new ReceiveCommand(currentObjectId, mergeCommitId, refName)
+
+      // call pre-commit hooks
+      val error = receiveHooks.flatMap { hook =>
+        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+      }.headOption
+
+      error.foreach { error =>
+        throw new RuntimeException(error)
+      }
+
       // update refs
-      Util.updateRefs(repository, s"refs/heads/${branch}", mergeCommitId, false, committer, Some("merged"))
+      val objectId = Util.updateRefs(git.getRepository, refName, mergeCommitId, false, committer, Some("merged"))
+
+      // call post-commit hook
+      receiveHooks.foreach { hook =>
+        hook.postReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+      }
+
+      objectId
     }
 
-    def rebase(committer: PersonIdent, commits: Seq[RevCommit]): ObjectId = {
+    def rebase(committer: PersonIdent, commits: Seq[RevCommit])(implicit s: Session): ObjectId = {
       if (checkConflict().isDefined) {
         throw new RuntimeException("This pull request can't merge automatically.")
       }
 
       def _cloneCommit(commit: RevCommit, parentId: ObjectId, baseId: ObjectId): CommitBuilder = {
-        val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
+        val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
         merger.merge(commit.toObjectId, baseId)
 
         val newCommit = new CommitBuilder()
@@ -523,10 +646,10 @@ object MergeService {
         newCommit
       }
 
-      val mergeBaseTipCommit = using(new RevWalk(repository))(_.parseCommit(mergeBaseTip))
+      val mergeBaseTipCommit = Using.resource(new RevWalk(git.getRepository))(_.parseCommit(mergeBaseTip))
       var previousId = mergeBaseTipCommit.getId
 
-      using(repository.newObjectInserter) { inserter =>
+      Using.resource(git.getRepository.newObjectInserter) { inserter =>
         commits.foreach { commit =>
           val nextCommit = _cloneCommit(commit, previousId, mergeBaseTipCommit.getId)
           previousId = inserter.insert(nextCommit)
@@ -534,16 +657,40 @@ object MergeService {
         inserter.flush()
       }
 
-      Util.updateRefs(repository, s"refs/heads/${branch}", previousId, false, committer, Some("rebased"))
+      val refName = s"refs/heads/${branch}"
+      val currentObjectId = git.getRepository.resolve(refName)
+      val receivePack = new ReceivePack(git.getRepository)
+      val receiveCommand = new ReceiveCommand(currentObjectId, previousId, refName)
+
+      // call pre-commit hooks
+      val error = receiveHooks.flatMap { hook =>
+        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+      }.headOption
+
+      error.foreach { error =>
+        throw new RuntimeException(error)
+      }
+
+      // update refs
+      val objectId =
+        Util.updateRefs(git.getRepository, s"refs/heads/${branch}", previousId, false, committer, Some("rebased"))
+
+      // call post-commit hook
+      receiveHooks.foreach { hook =>
+        hook.postReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+      }
+
+      objectId
     }
 
-    def squash(message: String, committer: PersonIdent): ObjectId = {
+    def squash(message: String, committer: PersonIdent)(implicit s: Session): ObjectId = {
       if (checkConflict().isDefined) {
         throw new RuntimeException("This pull request can't merge automatically.")
       }
 
-      val mergeBaseTipCommit = using(new RevWalk(repository))(_.parseCommit(mergeBaseTip))
-      val mergeBranchHeadCommit = using(new RevWalk(repository))(_.parseCommit(repository.resolve(mergedBranchName)))
+      val mergeBaseTipCommit = Using.resource(new RevWalk(git.getRepository))(_.parseCommit(mergeBaseTip))
+      val mergeBranchHeadCommit =
+        Using.resource(new RevWalk(git.getRepository))(_.parseCommit(git.getRepository.resolve(mergedBranchName)))
 
       // Create squash commit
       val mergeCommit = new CommitBuilder()
@@ -554,30 +701,52 @@ object MergeService {
       mergeCommit.setMessage(message)
 
       // insertObject and got squash commit Object Id
-      val newCommitId = using(repository.newObjectInserter) { inserter =>
+      val newCommitId = Using.resource(git.getRepository.newObjectInserter) { inserter =>
         val newCommitId = inserter.insert(mergeCommit)
         inserter.flush()
         newCommitId
       }
 
-      Util.updateRefs(repository, mergedBranchName, newCommitId, true, committer)
+      val refName = s"refs/heads/${branch}"
+      val currentObjectId = git.getRepository.resolve(refName)
+      val receivePack = new ReceivePack(git.getRepository)
+      val receiveCommand = new ReceiveCommand(currentObjectId, newCommitId, refName)
+
+      // call pre-commit hooks
+      val error = receiveHooks.flatMap { hook =>
+        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+      }.headOption
+
+      error.foreach { error =>
+        throw new RuntimeException(error)
+      }
+
+      // update refs
+      Util.updateRefs(git.getRepository, mergedBranchName, newCommitId, true, committer)
 
       // rebase to squash commit
-      Util.updateRefs(
-        repository,
+      val objectId = Util.updateRefs(
+        git.getRepository,
         s"refs/heads/${branch}",
-        repository.resolve(mergedBranchName),
+        git.getRepository.resolve(mergedBranchName),
         false,
         committer,
         Some("squashed")
       )
+
+      // call post-commit hook
+      receiveHooks.foreach { hook =>
+        hook.postReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+      }
+
+      objectId
     }
 
     // return treeId
     private def createMergeCommit(treeId: ObjectId, committer: PersonIdent, message: String) =
-      Util.createMergeCommit(repository, treeId, committer, message, Seq[ObjectId](mergeBaseTip, mergeTip))
+      Util.createMergeCommit(git.getRepository, treeId, committer, message, Seq[ObjectId](mergeBaseTip, mergeTip))
 
-    private def parseCommit(id: ObjectId) = using(new RevWalk(repository))(_.parseCommit(id))
+    private def parseCommit(id: ObjectId) = Using.resource(new RevWalk(git.getRepository))(_.parseCommit(id))
 
   }
 

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

@@ -13,8 +13,8 @@ trait MilestonesService {
     title: String,
     description: Option[String],
     dueDate: Option[java.util.Date]
-  )(implicit s: Session): Unit =
-    Milestones insert Milestone(
+  )(implicit s: Session): Int = {
+    Milestones returning Milestones.map(_.milestoneId) insert Milestone(
       userName = owner,
       repositoryName = repository,
       title = title,
@@ -22,6 +22,7 @@ trait MilestonesService {
       dueDate = dueDate,
       closedDate = None
     )
+  }
 
   def updateMilestone(milestone: Milestone)(implicit s: Session): Unit =
     Milestones

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

@@ -17,7 +17,7 @@ import gitbucket.core.model.Account
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.slf4j.LoggerFactory
 
-import scala.collection.JavaConverters.{asScalaSet, mapAsJavaMap}
+import scala.jdk.CollectionConverters._
 
 /**
  * Service class for the OpenID Connect authentication.
@@ -101,7 +101,7 @@ trait OpenIDConnectService {
     redirectURI: URI
   ): Option[AuthenticationSuccessResponse] =
     try {
-      AuthenticationResponseParser.parse(redirectURI, mapAsJavaMap(params)) match {
+      AuthenticationResponseParser.parse(redirectURI, params.asJava) match {
         case response: AuthenticationSuccessResponse =>
           if (response.getState == state) {
             Some(response)
@@ -207,5 +207,5 @@ object OpenIDConnectService {
     "RSA" -> Family.RSA,
     "ECDSA" -> Family.EC,
     "EdDSA" -> Family.ED
-  ).toMap.map { case (name, family) => (name, asScalaSet(family).toSet) }
+  ).toMap.map { case (name, family) => (name, family.asScala.toSet) }
 }

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

@@ -0,0 +1,15 @@
+package gitbucket.core.service
+
+import scala.util.Try
+
+object PaginationHelper {
+
+  def page(page: Option[String]) = {
+
+    page
+      .flatMap(pageStr => Try(pageStr.toInt).toOption)
+      .map(Math.max(1, _)) // remove negative pages
+      .getOrElse(1)
+  }
+
+}

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

@@ -24,13 +24,15 @@ trait ProtectedBranchService {
       }
       .map {
         case (t1, contexts) =>
-          new ProtectedBranchInfo(t1.userName, t1.repositoryName, true, contexts, t1.statusCheckAdmin)
+          new ProtectedBranchInfo(t1.userName, t1.repositoryName, t1.branch, true, contexts, t1.statusCheckAdmin)
       }
 
   def getProtectedBranchInfo(owner: String, repository: String, branch: String)(
     implicit session: Session
   ): ProtectedBranchInfo =
-    getProtectedBranchInfoOpt(owner, repository, branch).getOrElse(ProtectedBranchInfo.disabled(owner, repository))
+    getProtectedBranchInfoOpt(owner, repository, branch).getOrElse(
+      ProtectedBranchInfo.disabled(owner, repository, branch)
+    )
 
   def getProtectedBranchList(owner: String, repository: String)(implicit session: Session): List[String] =
     ProtectedBranches.filter(_.byRepository(owner, repository)).map(_.branch).list
@@ -66,7 +68,22 @@ object ProtectedBranchService {
       repository: String,
       receivePack: ReceivePack,
       command: ReceiveCommand,
-      pusher: String
+      pusher: String,
+      mergePullRequest: Boolean
+    )(implicit session: Session): Option[String] = {
+      if (mergePullRequest == true) {
+        None
+      } else {
+        checkBranchProtection(owner, repository, receivePack, command, pusher)
+      }
+    }
+
+    private def checkBranchProtection(
+      owner: String,
+      repository: String,
+      receivePack: ReceivePack,
+      command: ReceiveCommand,
+      pusher: String,
     )(implicit session: Session): Option[String] = {
       val branch = command.getRefName.stripPrefix("refs/heads/")
       if (branch != command.getRefName) {
@@ -91,6 +108,7 @@ object ProtectedBranchService {
   case class ProtectedBranchInfo(
     owner: String,
     repository: String,
+    branch: String,
     enabled: Boolean,
     /**
      * Require status checks to pass before merging
@@ -151,7 +169,7 @@ object ProtectedBranchService {
       if (contexts.isEmpty) {
         Set.empty
       } else {
-        contexts.toSet -- getCommitStatues(owner, repository, sha1)
+        contexts.toSet -- getCommitStatuses(owner, repository, sha1)
           .filter(_.state == CommitState.SUCCESS)
           .map(_.context)
           .toSet
@@ -165,7 +183,7 @@ object ProtectedBranchService {
     }
   }
   object ProtectedBranchInfo {
-    def disabled(owner: String, repository: String): ProtectedBranchInfo =
-      ProtectedBranchInfo(owner, repository, false, Nil, false)
+    def disabled(owner: String, repository: String, branch: String): ProtectedBranchInfo =
+      ProtectedBranchInfo(owner, repository, branch, false, Nil, false)
   }
 }