Disable GitHub Actions cache

2025-10-30 10:06:07 +01:00 · 2020-07-06 09:59:59 +09:00
357 changed files with 4804 additions and 14992 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,10 +5,6 @@ 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
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +0,0 @@
-* @takezoe
-
-build.sbt @xuwei-k
-project/* @xuwei-k
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # The guidelines for contributing

 - At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before starting your work.
+- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before staring your work.
 - You can edit the GitBucket documentation on Wiki if you have a GitHub account. When you find any mistakes or lacks in the documentation, please update it directly.
 - All your contributions are handled as [Apache Software License, Version 2.0](https://github.com/gitbucket/gitbucket/blob/master/LICENSE). When you create a pull request or update the documentation, we assume you agreed this clause.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -12,7 +12,7 @@
 **Deployment mode**: *explain here how you use GitBucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*

 **Problem description**:
- *be as explicit as you can*
+- *be as explicit has you can*
 - *describe the problem and its symptoms*
 - *explain how to reproduce*
 - *attach whatever information that can help understanding the context (screen capture, log files)*
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,39 +1,29 @@
 name: build

-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]

 jobs:
  build:
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    strategy:
      matrix:
-        java: [8, 11, 17]
+        java: [8, 11]    
    steps:
-    - uses: actions/checkout@v3
-    - name: Cache
-      uses: actions/cache@v3
-      env:
-        cache-name: cache-sbt-libs
-      with:
-        path: |
-          ~/.ivy2/cache
-          ~/.sbt
-          ~/.cache/coursier/v1
-        key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }}
+    - uses: actions/checkout@v2
    - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v1
      with:
        java-version: ${{ matrix.java }}
-        distribution: adopt
    - name: Run tests
      run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
-    - name: Scala 3
-      run: sbt '++ 3.1.2!' update # TODO
    - name: Build executable
      run: sbt executable
    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
        name: gitbucket-java${{ matrix.java }}-${{ github.sha }}
        path: ./target/executable/gitbucket.*
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
-.bsp/

 # Scala-IDE specific
 .scala_dependencies
@@ -29,8 +28,4 @@ project/plugins/project/
 # Metals specific
 .metals
 .bloop
-**/metals.sbt
-
-# Visual Studio Code specific
-.vscode
-
+project/metals.sbt
--- a/.scala-steward.conf
+++ b/.scala-steward.conf
@@ -1,9 +0,0 @@
-updates.limit = 3
-
-updates.includeScala = true
-
-updates.pin = [
-  { groupId = "org.eclipse.jetty", version = "9." }
-  { groupId = "org.eclipse.jgit", version = "5." }
-  { groupId = "com.zaxxer", version = "4." }
-]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,90 +1,15 @@
 # Changelog
 All changes to the project will be documented in this file.

-## 4.38.0 - 3 Sep 2022
- Support multiple assignees for Issues and Pull requests
- Custom fields for issues and pull requests
- Reset password by users
- Allow to configure Jetty idle timeout in standalone mode
- Horizontal scroll for too wide tables in Markdown
- Hide header content on signin and register page
- Fix the default charset of the online editor in the repository viewer
- Fix the milestone count
- Some improvements and bugfixes for WebAPI and WebHook
+### 4.33.0 - 31 Dec 2019

-## 4.37.2 - 16 Jan 2022
- Fixed a security issue reported by [Positive Technologies](https://www.ptsecurity.com/ww-en/). Great thanks for their detailed report and close support!
-
-## 4.37.1 - 14 Dec 2021
- Update gist-plugin and notification-plugin
- Fix SSHCommand extension point for apache-sshd 2.x
-
-## 4.37.0 - 11 Dec 2021
- Enhance Git Reference APIs
- Add milestone data to issue list API
- Support "all" in issue list API
- Support EDDSA in signed commit verification
- Support custom SSH url
- Relax max passward length limitation
- Relax max webhook url length limitation
-
-## 4.36.2 - 16 Aug 2021
- Escape user name in avatar image tag
-
-## 4.36.1 - 22 Jul 2021
- Bump gitbucket-gist-plugin to 4.21.0
-
-## 4.36.0 - 17 Jul 2021
- Tag selector in the repository viewer
- Link issues/pull requests of other repositories
- Files and lines can be linked in the diff view
- Option to disable XSS protection
-
-## 4.35.3 - 14 Jan 2021
- Fix a bug that Wiki page cannot be deleted
- Fix a deployment issue on Tomcat
-
-## 4.35.2 - 30 Dec 2020
- Upgrade gitbucket-notifications-plugin to 1.10.0
- Upgrade oauth2-oidc-sdk to 8.29.1 to solve dependency issue
-
-## 4.35.1 - 29 Dec 2020
- Fix database migration issue which happens if webhook is configured
- Call push webhook when pull request is merged
- Show commit status at commits tab of pull request
-
-## 4.35.0 - 25 Dec 2020
- Editor and source viewer color theme
- Auto completion for issues and pull requests
- Upload image from clipboard
- Close multiple issues by commit comment
- Create pull request from online editor
- Milestone overview
- Commit status at various places
- WebAPI coverage improvements
-
-## 4.34.0 - 26 Jul 2020
- Enhancement admin settings UI
-   - File upload settings
-   - Restrict repository operations
-   - User-defined CSS
-   - Limit the repository list in the sidebar
- Improve MariaDB support
- Improve activity logging
- CLI option to persist session on disk in the standalone mode
- Web API updates
-  - Add [list commits API](https://developer.github.com/v3/repos/commits/#list-commits)
- Bundled plugins updates
-  - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin) 4.18.0 -> 4.19.0
-  - [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin) 1.8.0 -> 1.9.0
-
-## 4.33.0 - 31 Dec 2019
 - All CLI options are configurable by environment variables
 - Folding pull request files
 - WebHook security options
 - Add assignee and assignees properties to some Web APIs' response

-## 4.32.0 - 7 Aug 2019
+### 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
@@ -92,20 +17,20 @@ All changes to the project will be documented in this file.
 - Apply default priority to pull requests
 - Focus title after clicking issue / pull request edit button

-## 4.31.2 - 7 Apr 2019
+### 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
@@ -192,7 +117,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
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket/actions?query=workflow%3Abuild+branch%3Amaster) [![gitbucket Scala version support](https://index.scala-lang.org/gitbucket/gitbucket/gitbucket/latest-by-scala-version.svg)](https://index.scala-lang.org/gitbucket/gitbucket/gitbucket) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
+GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket/actions?query=workflow%3Abuild+branch%3Amaster) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
 =========

 GitBucket is a Git web platform powered by Scala offering:
@@ -8,7 +8,7 @@ GitBucket is a Git web platform powered by Scala offering:
 - High extensibility by plugins
 - API compatibility with GitHub

-![GitBucket](https://gitbucket.github.io/img/screenshots/screenshot-repository_viewer.png)
+You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/).

 Features
 --------
@@ -22,6 +22,8 @@ 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/readme.md).
+
 Installation
 --------
 GitBucket requires **Java8**. You have to install it, if it is not already installed.
@@ -29,7 +31,7 @@ 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 also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc). Note that GitBucket doesn't support Jakarta EE yet.
+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).

@@ -46,30 +48,20 @@ GitBucket has a plug-in system that allows extra functionality. Officially the f

 You can find more plugins made by the community at [GitBucket community plugins](https://gitbucket-plugins.github.io/).

-Building and Development
-----------
-If you want to try the development version of GitBucket, or want to contribute to the project, please see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/readme.md).
-It provides instructions on building from source and on setting up an IDE for debugging. 
-It also contains documentation of the core concepts used within the project.
-
 Support
 --------

 - If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
- If you can't find same question and report, send it to our [Gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
+- 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.38.x
+What's New in 4.33.x
 -------------
-## 4.38.0 - 3 Sep 2022
- Support multiple assignees for Issues and Pull requests
- Custom fields for issues and pull requests
- Reset password by users
- Allow to configure Jetty idle timeout in standalone mode
- Horizontal scroll for too wide tables in Markdown
- Hide header content on signin and register page
- Fix the default charset of the online editor in the repository viewer
- Fix the milestone count
- Some improvements and bugfixes for WebAPI and WebHook
+### 4.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

 See the [change log](CHANGELOG.md) for all of the updates.
--- a/build.sbt
+++ b/build.sbt
@@ -1,21 +1,23 @@
 import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
-import com.jsuereth.sbtpgp.PgpKeys._
+import com.typesafe.sbt.pgp.PgpKeys._

 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.38.0"
-val ScalatraVersion = "2.8.2"
-val JettyVersion = "9.4.48.v20220622"
-val JgitVersion = "5.13.1.202206130422-r"
+val GitBucketVersion = "4.33.0"
+val ScalatraVersion = "2.7.0-RC1"
+val JettyVersion = "9.4.30.v20200611"
+val JgitVersion = "5.8.0.202006091008-r"

 lazy val root = (project in file("."))
  .enablePlugins(SbtTwirl, ScalatraPlugin)
+  .settings(
+    )

 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.13.8"
+scalaVersion := "2.13.1"

 scalafmtOnCompile := true

@@ -24,86 +26,72 @@ coverageExcludedPackages := ".*\\.html\\..*"
 // dependency settings
 resolvers ++= Seq(
  Classpaths.typesafeReleases,
+  Resolver.jcenterRepo,
  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
 )

 libraryDependencies ++= Seq(
  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
-  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion cross CrossVersion.for3Use2_13,
-  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion cross CrossVersion.for3Use2_13,
-  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion cross CrossVersion.for3Use2_13,
-  "org.json4s"                      %% "json4s-jackson"              % "4.0.5" cross CrossVersion.for3Use2_13,
-  "commons-io"                      % "commons-io"                   % "2.11.0",
-  "io.github.gitbucket"             % "solidbase"                    % "1.0.5",
-  "io.github.gitbucket"             % "markedj"                      % "1.0.17",
-  "org.apache.commons"              % "commons-compress"             % "1.21",
+  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
+  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
+  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
+  "org.json4s"                      %% "json4s-jackson"              % "3.6.9",
+  "commons-io"                      % "commons-io"                   % "2.7",
+  "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
+  "io.github.gitbucket"             % "markedj"                      % "1.0.16",
+  "org.apache.commons"              % "commons-compress"             % "1.20",
  "org.apache.commons"              % "commons-email"                % "1.5",
-  "commons-net"                     % "commons-net"                  % "3.8.0",
-  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.13",
-  "org.apache.sshd"                 % "apache-sshd"                  % "2.9.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
-  "org.apache.tika"                 % "tika-core"                    % "2.4.1",
-  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
+  "commons-net"                     % "commons-net"                  % "3.6",
+  "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.24.1",
+  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12",
  "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
  "com.h2database"                  % "h2"                           % "1.4.199",
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "3.0.7",
-  "org.postgresql"                  % "postgresql"                   % "42.5.0",
-  "ch.qos.logback"                  % "logback-classic"              % "1.2.11",
-  "com.zaxxer"                      % "HikariCP"                     % "4.0.3" exclude ("org.slf4j", "slf4j-api"),
-  "com.typesafe"                    % "config"                       % "1.4.2",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.6.0",
+  "org.postgresql"                  % "postgresql"                   % "42.2.6",
+  "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
+  "com.zaxxer"                      % "HikariCP"                     % "3.4.5",
+  "com.typesafe"                    % "config"                       % "1.4.0",
+  "com.typesafe.akka"               %% "akka-actor"                  % "2.5.27",
  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
-  "io.github.java-diff-utils"       % "java-diff-utils"              % "4.12",
-  "org.cache2k"                     % "cache2k-all"                  % "1.6.0.Final",
-  "net.coobird"                     % "thumbnailator"                % "0.4.17",
+  "com.github.bkromhout"            % "java-diff-utils"              % "2.1.1",
+  "org.cache2k"                     % "cache2k-all"                  % "1.2.4.Final",
+  "com.enragedginger"               %% "akka-quartz-scheduler"       % "1.8.1-akka-2.5.x" exclude ("com.mchange", "c3p0") exclude ("com.zaxxer", "HikariCP-java6"),
+  "net.coobird"                     % "thumbnailator"                % "0.4.11",
  "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
-  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "9.42",
+  "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.13.2" % "test",
-  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
-  "org.mockito"                     % "mockito-core"                 % "4.7.0" % "test",
-  "com.dimafeng"                    %% "testcontainers-scala"        % "0.40.10" % "test",
-  "org.testcontainers"              % "mysql"                        % "1.17.3" % "test",
-  "org.testcontainers"              % "postgresql"                   % "1.17.3" % "test",
+  "junit"                           % "junit"                        % "4.13" % "test",
+  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "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.11.0",
-  "org.ec4j.core"                   % "ec4j-core"                    % "0.3.0",
-  "org.kohsuke"                     % "github-api"                   % "1.308" % "test"
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.3"
 )

-libraryDependencies ~= {
-  _.map {
-    case x if x.name == "twirl-api" =>
-      x cross CrossVersion.for3Use2_13
-    case x =>
-      x
-  }
-}
-
 // Compiler settings
-scalacOptions := Seq(
-  "-deprecation",
-  "-language:postfixOps",
-  "-opt:l:method",
-  "-feature",
-  "-Wunused:imports",
-  "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s"
-)
-compile / javacOptions ++= Seq("-target", "8", "-source", "8")
-Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml"
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
+javacOptions in compile ++= Seq("-target", "8", "-source", "8")
+javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"

 // Test settings
 //testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
-Test / javaOptions += "-Dgitbucket.home=target/gitbucket_home_for_test"
-Test / testOptions += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
-Test / fork := true
+javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
+testOptions in Test += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
+fork in Test := true

 // Packaging options
 packageOptions += Package.MainClass("JettyLauncher")

 // Assembly settings
-assembly / test := {}
-assembly / assemblyMergeStrategy := {
+test in assembly := {}
+assemblyMergeStrategy in assembly := {
  case PathList("META-INF", xs @ _*) =>
    (xs map { _.toLowerCase }) match {
      case ("manifest.mf" :: Nil) => MergeStrategy.discard
@@ -134,12 +122,6 @@ libraryDependencies ++= Seq(
  "org.eclipse.jetty" % "jetty-util"         % JettyVersion % "executable"
 )

-// Run package task before test to generate target/webapp for integration test
-Test / test := {
-  _root_.sbt.Keys.`package`.value
-  (Test / test).value
-}
-
 val executableKey = TaskKey[File]("executable")
 executableKey := {
  import java.util.jar.Attributes.{Name => AttrName}
@@ -168,7 +150,7 @@ executableKey := {
  IO unzip (warFile, temp)

  // include launcher classes
-  val classDir = (Compile / Keys.classDirectory).value
+  val classDir = (Keys.classDirectory in Compile).value
  val launchClasses = Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */ )
  launchClasses foreach { name =>
    IO copyFile (classDir / name, temp / name)
@@ -199,7 +181,7 @@ executableKey := {
  manifest.getMainAttributes put (AttrName.MANIFEST_VERSION, "1.0")
  manifest.getMainAttributes put (AttrName.MAIN_CLASS, "JettyLauncher")
  val outputFile = workDir / warName
-  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest, None)
+  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest)

  // generate checksums
  Seq(
@@ -271,7 +253,12 @@ pomExtra := (
  </developers>
 )

-Test / testOptions ++= {
+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(
@@ -284,8 +271,3 @@ Test / testOptions ++= {
    Nil
  }
 }
-
-Jetty / javaOptions ++= Seq(
-  "-Xdebug",
-  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
-)
--- a/doc/authenticator.md
+++ b/doc/authenticator.md
@@ -2,7 +2,7 @@ Authentication in Controller
 ========
 GitBucket provides many [authenticators](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/util/Authenticator.scala) to access controlling in the controller.

-For example, in the case of `RepositoryViewerController`,
+For example, in the case of `RepositoryViwerController`,
 it references three authenticators: `ReadableUsersAuthenticator`, `ReferrerAuthenticator` and `CollaboratorsAuthenticator`.

 ```scala
@@ -19,13 +19,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  ...
 ```

-Authenticators provide a method to add guard to actions in the controller:
+Authenticators provides a method to add guard to actions in the controller:

 - `ReadableUsersAuthenticator` provides `readableUsersOnly` method
 - `ReferrerAuthenticator` provides `referrersOnly` method
 - `CollaboratorsAuthenticator` provides `collaboratorsOnly` method

-These methods are available in each action as below:
+These methods are available in each actions as below:

 ```scala
 // Allows only the repository owner (or manager for group repository) and administrators.
@@ -38,7 +38,7 @@ get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
  ...
 })

-// Allows only signed-in users which can access the repository.
+// Allows only signed in users which can access the repository.
 post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
  ...
 })
@@ -50,11 +50,11 @@ Currently, GitBucket provides below authenticators:
 |--------------------------|-----------------|--------------------------------------------------------------------------------------|
 |OneselfAuthenticator      |oneselfOnly      |Allows only oneself and administrators.                                               |
 |OwnerAuthenticator        |ownerOnly        |Allows only the repository owner and administrators.                                  |
-|UsersAuthenticator        |usersOnly        |Allows only signed-in users.                                                          |
+|UsersAuthenticator        |usersOnly        |Allows only signed in users.                                                          |
 |AdminAuthenticator        |adminOnly        |Allows only administrators.                                                           |
 |CollaboratorsAuthenticator|collaboratorsOnly|Allows only collaborators and administrators.                                         |
 |ReferrerAuthenticator     |referrersOnly    |Allows only the repository owner (or manager for group repository) and administrators.|
-|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed-in users which can access the repository.                          |
+|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed in users which can access the repository.                          |
 |GroupManagerAuthenticator |managersOnly     |Allows only the group managers.                                                       |

-Of course, if you make a new plugin, you can implement your own authenticator according to requirement in your plugin.
+Of course, if you make a new plugin, you can define a your own authenticator according to requirement in your plugin.
--- a/doc/auto_update.md
+++ b/doc/auto_update.md
@@ -2,7 +2,7 @@ Automatic Schema Updating
 ========
 GitBucket updates database schema automatically using [Solidbase](https://github.com/gitbucket/solidbase) in the first run after the upgrading.

-To release a new version of GitBucket, add the version definition to [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.
+To release a new version of GitBucket, add the version definition to the [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.

 ```scala
 object GitBucketCoreModule extends Module("gitbucket-core",
@@ -17,7 +17,7 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```

-Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filename defined in `GitBucketCoreModule`.
+Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filenane defined in `GitBucketCoreModule`.

 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -31,9 +31,9 @@ Next, add a XML file which updates database schema into [/src/main/resources/upd
 </changeSet>
 ```

-Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version different from the actual version, it executes differences between the stored version and the actual version.
+Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version differs from the actual version, it executes differences between the stored version and the actual version.

-We can add the SQL file instead of the XML file using `SqlMigration`. It tries to load a SQL file from classpath in the following order:
+We can add the SQL file instead of the XML file using `SqlMigration`. It try to load a SQL file from classpath as following order:

 1. Specified path (if specified)
 2. `${moduleId}_${version}_${database}.sql`
@@ -51,4 +51,4 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```

-See more details at [README of Solidbase](https://github.com/gitbucket/solidbase).
+See more details [README of Solidbase](https://github.com/gitbucket/solidbase).
--- a/doc/build.md
+++ b/doc/build.md
@@ -18,12 +18,12 @@ $ sbt ~jetty:start

 Then access `http://localhost:8080/` in your browser. The default administrator account is `root` and password is `root`.

-Source code modifications are detected and a reloading happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`.
+Source code modifications are detected and a reloaded happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`.

 Build war file
 --------

-To build a war file, run the following command:
+To build war file, run the following command:

 ```shell
 $ sbt package
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.3.12
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,11 +1,10 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

-addSbtPlugin("org.scalameta"    % "sbt-scalafmt"       % "2.4.6")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"          % "1.5.1")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly"       % "1.2.0")
-addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"       % "1.0.4")
-addSbtPlugin("com.github.sbt"   % "sbt-pgp"            % "2.1.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"      % "2.0.0")
-
-addDependencyTreePlugin
+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.6.1")
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -1,101 +1,51 @@
-import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.server.ConnectionFactory;
+import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.server.handler.SecuredRedirectHandler;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
 import org.eclipse.jetty.server.session.DefaultSessionCache;
 import org.eclipse.jetty.server.session.FileSessionDataStore;
 import org.eclipse.jetty.server.session.SessionCache;
 import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.webapp.WebAppContext;

 import java.io.File;
-import java.net.InetAddress;
 import java.net.URL;
+import java.net.InetSocketAddress;
 import java.security.ProtectionDomain;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toSet;

 public class JettyLauncher {
-
-    private interface Defaults {
-
-        String CONNECTORS = "http";
-        String HOST = "0.0.0.0";
-
-        int HTTP_PORT = 8080;
-        int HTTPS_PORT = 8443;
-
-        boolean REDIRECT_HTTPS = false;
-    }
-
-    private interface Connectors {
-
-        String HTTP = "http";
-        String HTTPS = "https";
-    }
-
    public static void main(String[] args) throws Exception {
        System.setProperty("java.awt.headless", "true");

-        String connectors = getEnvironmentVariable("gitbucket.connectors");
-        String host = getEnvironmentVariable("gitbucket.host");
-        String port = getEnvironmentVariable("gitbucket.port");
-        String securePort = getEnvironmentVariable("gitbucket.securePort");
-        String keyStorePath = getEnvironmentVariable("gitbucket.keyStorePath");
-        String keyStorePassword = getEnvironmentVariable("gitbucket.keyStorePassword");
-        String keyManagerPassword = getEnvironmentVariable("gitbucket.keyManagerPassword");
-        String redirectHttps = getEnvironmentVariable("gitbucket.redirectHttps");
-        String contextPath = getEnvironmentVariable("gitbucket.prefix");
-        String tmpDirPath = getEnvironmentVariable("gitbucket.tempDir");
-        String jettyIdleTimeout = getEnvironmentVariable("gitbucket.jettyIdleTimeout");
+        String host = null;
+        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("=", 2);
-                if(dim.length == 2) {
+                String[] dim = arg.split("=");
+                if(dim.length >= 2) {
                    switch (dim[0]) {
-                        case "--connectors":
-                            connectors = dim[1];
-                            break;
                        case "--host":
                            host = dim[1];
                            break;
                        case "--port":
                            port = dim[1];
                            break;
-                        case "--secure_port":
-                            securePort = dim[1];
-                            break;
-                        case "--key_store_path":
-                            keyStorePath = dim[1];
-                            break;
-                        case "--key_store_password":
-                            keyStorePassword = dim[1];
-                            break;
-                        case "--key_manager_password":
-                            keyManagerPassword = dim[1];
-                            break;
-                        case "--redirect_https":
-                            redirectHttps = dim[1];
-                            break;
                        case "--prefix":
                            contextPath = dim[1];
                            break;
@@ -108,9 +58,6 @@ public class JettyLauncher {
                        case "--plugin_dir":
                            System.setProperty("gitbucket.pluginDir", dim[1]);
                            break;
-                        case "--jetty_idle_timeout":
-                            jettyIdleTimeout = dim[1];
-                            break;
                    }
                }
            }
@@ -120,74 +67,38 @@ public class JettyLauncher {
            contextPath = "/" + contextPath;
        }

-        final String hostName = InetAddress.getByName(fallback(host, Defaults.HOST)).getHostName();
-
-        final Server server = new Server();
-
-        final Set<String> connectorsSet = Stream.of(fallback(connectors, Defaults.CONNECTORS)
-            .toLowerCase().split(",")).map(String::trim).collect(toSet());
-
-        final List<ServerConnector> connectorInstances = new ArrayList<>();
-
-        final HttpConfiguration httpConfig = new HttpConfiguration();
-        httpConfig.setSendServerVersion(false);
-        if (connectorsSet.contains(Connectors.HTTPS)) {
-            httpConfig.setSecurePort(fallback(securePort, Defaults.HTTPS_PORT, Integer::parseInt));
-        }
-        if (jettyIdleTimeout != null && jettyIdleTimeout.trim().length() != 0) {
-            httpConfig.setIdleTimeout(Long.parseLong(jettyIdleTimeout.trim()));
+        if(host != null) {
+            address = new InetSocketAddress(host, getPort(port));
        } else {
-            httpConfig.setIdleTimeout(300000L); // default is 5min
+            address = new InetSocketAddress(getPort(port));
        }

-        if (connectorsSet.contains(Connectors.HTTP)) {
-            final ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
-            connector.setHost(hostName);
-            connector.setPort(fallback(port, Defaults.HTTP_PORT, Integer::parseInt));
+        Server server = new Server(address);

-            connectorInstances.add(connector);
+//        SelectChannelConnector connector = new SelectChannelConnector();
+//        if(host != null) {
+//            connector.setHost(host);
+//        }
+//        connector.setMaxIdleTime(1000 * 60 * 60);
+//        connector.setSoLingerTime(-1);
+//        connector.setPort(port);
+//        server.addConnector(connector);
+
+        // Disabling Server header
+        for (Connector connector : server.getConnectors()) {
+            for (ConnectionFactory factory : connector.getConnectionFactories()) {
+                if (factory instanceof HttpConnectionFactory) {
+                    ((HttpConnectionFactory) factory).getHttpConfiguration().setSendServerVersion(false);
+                }
+            }
        }

-        if (connectorsSet.contains(Connectors.HTTPS)) {
-            final SslContextFactory sslContextFactory = new SslContextFactory.Server();
-
-            sslContextFactory.setKeyStorePath(requireNonNull(keyStorePath,
-                "You must specify a path to an SSL keystore via the --key_store_path command line argument" +
-                    " or GITBUCKET_KEYSTOREPATH environment variable."));
-
-            sslContextFactory.setKeyStorePassword(requireNonNull(keyStorePassword,
-                "You must specify a an SSL keystore password via the --key_store_password argument" +
-                    " or GITBUCKET_KEYSTOREPASSWORD environment variable."));
-
-            sslContextFactory.setKeyManagerPassword(requireNonNull(keyManagerPassword,
-                "You must specify a key manager password via the --key_manager_password' argument" +
-                    " or GITBUCKET_KEYMANAGERPASSWORD environment variable."));
-
-            final HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
-            httpsConfig.addCustomizer(new SecureRequestCustomizer());
-
-            final ServerConnector connector = new ServerConnector(server,
-                new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
-                new HttpConnectionFactory(httpsConfig));
-
-            connector.setHost(hostName);
-            connector.setPort(fallback(securePort, Defaults.HTTPS_PORT, Integer::parseInt));
-
-            connectorInstances.add(connector);
-        }
-
-        require(!connectorInstances.isEmpty(),
-            "No server connectors could be configured, please check your --connectors command line argument" +
-                " or GITBUCKET_CONNECTORS environment variable.");
-
-        server.setConnectors(connectorInstances.toArray(new ServerConnector[0]));
-
        WebAppContext context = new WebAppContext();

        if(saveSessions) {
            File sessDir = new File(getGitBucketHome(), "sessions");
            if(!sessDir.exists()){
-                mkdir(sessDir);
+                sessDir.mkdirs();
            }
            SessionHandler sessions = context.getSessionHandler();
            SessionCache cache = new DefaultSessionCache(sessions);
@@ -201,7 +112,7 @@ public class JettyLauncher {
        if(tmpDirPath == null || tmpDirPath.equals("")){
            tmpDir = new File(getGitBucketHome(), "tmp");
            if(!tmpDir.exists()){
-                mkdir(tmpDir);
+                tmpDir.mkdirs();
            }
        } else {
            tmpDir = new File(tmpDirPath);
@@ -225,16 +136,13 @@ public class JettyLauncher {
        context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
        context.setServer(server);
        context.setWar(location.toExternalForm());
-
-        final HandlerList handlers = new HandlerList();
-
-        if (fallback(redirectHttps, Defaults.REDIRECT_HTTPS, Boolean::parseBoolean)) {
-            handlers.addHandler(new SecuredRedirectHandler());
+        if (forceHttps) {
+            context.setInitParameter("org.scalatra.ForceHttps", "true");
        }

-        handlers.addHandler(addStatisticsHandler(context));
+        Handler handler = addStatisticsHandler(context);

-        server.setHandler(handlers);
+        server.setHandler(handler);
        server.setStopAtShutdown(true);
        server.setStopTimeout(7_000);
        server.start();
@@ -262,28 +170,11 @@ public class JettyLauncher {
        }
    }

-    private static <T, R> T fallback(R value, T defaultValue, Function<R, T> converter) {
-        return value == null ? defaultValue : converter.apply(value);
-    }
-
-    private static <T> T fallback(T value, T defaultValue) {
-        return fallback(value, defaultValue, identity());
-    }
-
-    private static void require(boolean condition, String message) {
-        if (!condition) {
-            throw new IllegalArgumentException(message);
-        }
-    }
-
-    private static <T> T requireNonNull(T value, String message) {
-        require(value != null, message);
-        return value;
-    }
-
-    private static void mkdir(File dir) {
-        if (!dir.mkdirs()) {
-            throw new RuntimeException("Unable to create directory: " + dir);
+    private static int getPort(String port){
+        if(port == null) {
+            return 8080;
+        } else {
+            return Integer.parseInt(port);
        }
    }

--- a/src/main/java/gitbucket/core/util/PatchUtil.java
+++ b/src/main/java/gitbucket/core/util/PatchUtil.java
@@ -20,15 +20,15 @@ public class PatchUtil {
    public static String apply(String source, String patch, FileHeader fh)
            throws IOException, PatchApplyException {
        RawText rt = new RawText(source.getBytes("UTF-8"));
-        List<String> oldLines = new ArrayList<>(rt.size());
+        List<String> oldLines = new ArrayList<String>(rt.size());
        for (int i = 0; i < rt.size(); i++)
            oldLines.add(rt.getString(i));
-        List<String> newLines = new ArrayList<>(oldLines);
+        List<String> newLines = new ArrayList<String>(oldLines);
        for (HunkHeader hh : fh.getHunks()) {
            ByteArrayOutputStream out = new ByteArrayOutputStream();
            out.write(patch.getBytes("UTF-8"), hh.getStartOffset(), hh.getEndOffset() - hh.getStartOffset());
            RawText hrt = new RawText(out.toByteArray());
-            List<String> hunkLines = new ArrayList<>(hrt.size());
+            List<String> hunkLines = new ArrayList<String>(hrt.size());
            for (int i = 0; i < hrt.size(); i++)
                hunkLines.add(hrt.getString(i));
            int pos = 0;
--- a/src/main/resources/bundle-plugins.txt
+++ b/src/main/resources/bundle-plugins.txt
@@ -1,4 +1,4 @@
-notifications:1.11.0
-gist:4.22.0
+notifications:1.8.0
+gist:4.18.0
 emoji:4.6.0
-pages:1.10.0
+pages:1.8.0
--- a/src/main/resources/update/gitbucket-core_4.0.sql
+++ b/src/main/resources/update/gitbucket-core_4.0.sql
@@ -0,0 +1,18 @@
+CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+ SELECT
+   A.USER_NAME,
+   A.REPOSITORY_NAME,
+   A.ISSUE_ID,
+   COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT
+ FROM ISSUE A
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+   WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) B
+ ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) C
+ ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID);
--- a/src/main/resources/update/gitbucket-core_4.0.xml
+++ b/src/main/resources/update/gitbucket-core_4.0.xml
@@ -343,28 +343,4 @@
  <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK" tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT"/>
  <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0" baseTableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" baseColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" referencedTableName="PROTECTED_BRANCH" referencedColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" onDelete="CASCADE" onUpdate="CASCADE"/>

-  <!--================================================================================================-->
-  <!-- ISSUE_OUTLINE_VIEW -->
-  <!--================================================================================================-->
-  <sql>
-    CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
-      SELECT
-        A.USER_NAME,
-        A.REPOSITORY_NAME,
-        A.ISSUE_ID,
-        COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT
-      FROM ISSUE A
-      LEFT OUTER JOIN (
-        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
-        WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
-        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
-      ) B
-      ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
-      LEFT OUTER JOIN (
-        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
-        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
-      ) C
-      ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID)
-  </sql>
-
 </changeSet>
--- a/src/main/resources/update/gitbucket-core_4.14.sql
+++ b/src/main/resources/update/gitbucket-core_4.14.sql
@@ -0,0 +1,26 @@
+CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+
+ SELECT
+   A.USER_NAME,
+   A.REPOSITORY_NAME,
+   A.ISSUE_ID,
+   COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT,
+   COALESCE(D.ORDERING, 9999) AS PRIORITY
+
+ FROM ISSUE A
+
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+   WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) B
+ ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
+
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) C
+ ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID)
+
+ LEFT OUTER JOIN PRIORITY D
+ ON (A.PRIORITY_ID = D.PRIORITY_ID);
--- a/src/main/resources/update/gitbucket-core_4.14.xml
+++ b/src/main/resources/update/gitbucket-core_4.14.xml
@@ -35,28 +35,4 @@
    <column name="URL" type="varchar(200)" nullable="false"/>
    <column name="EVENT" type="varchar(30)" nullable="false"/>
  </createTable>
-
-  <sql>
-    CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
-      SELECT
-        A.USER_NAME,
-        A.REPOSITORY_NAME,
-        A.ISSUE_ID,
-        COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT,
-        COALESCE(D.ORDERING, 9999) AS PRIORITY
-      FROM ISSUE A
-      LEFT OUTER JOIN (
-        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
-        WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
-        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
-      ) B
-      ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
-      LEFT OUTER JOIN (
-        SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
-        GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
-      ) C
-      ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID)
-      LEFT OUTER JOIN PRIORITY D
-      ON (A.PRIORITY_ID = D.PRIORITY_ID);
-  </sql>
 </changeSet>
--- a/src/main/resources/update/gitbucket-core_4.34.xml
+++ b/src/main/resources/update/gitbucket-core_4.34.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <dropTable tableName="ACTIVITY" />
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.35.xml
+++ b/src/main/resources/update/gitbucket-core_4.35.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <!--================================================================================================-->
-  <!-- WEB_HOOK -->
-  <!--================================================================================================-->
-  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT"/>
-  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK"/>
-  <dropPrimaryKey constraintName="IDX_WEB_HOOK_PK" tableName="WEB_HOOK"/>
-  
-  <createTable tableName="WEB_HOOK_2">
-    <column name="HOOK_ID" type="int" nullable="true" autoIncrement="true" unique="false" primaryKeyName="IDX_WEB_HOOK_PK" primaryKey="true" />
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="URL" type="varchar(200)" nullable="false"/>
-    <column name="TOKEN" type="varchar(100)" nullable="true"/>
-    <column name="CTYPE" type="varchar(10)" nullable="true"/>
-  </createTable>
-
-  <sql>
-    INSERT INTO WEB_HOOK_2 (USER_NAME, REPOSITORY_NAME, URL, TOKEN, CTYPE) SELECT USER_NAME, REPOSITORY_NAME, URL, TOKEN, CTYPE FROM WEB_HOOK
-  </sql>
-
-  <renameTable newTableName="WEB_HOOK_BK" oldTableName="WEB_HOOK"/>
-  <renameTable newTableName="WEB_HOOK" oldTableName="WEB_HOOK_2"/>
-
-  <addUniqueConstraint constraintName="IDX_WEB_HOOK_1" tableName="WEB_HOOK" columnNames="USER_NAME, REPOSITORY_NAME, URL"/>
-  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, URL" referencedTableName="WEB_HOOK" referencedColumnNames="USER_NAME, REPOSITORY_NAME, URL" onDelete="CASCADE" onUpdate="CASCADE"/>
-
-  <!--================================================================================================-->
-  <!-- ACCOUNT_PREFERENCE -->
-  <!--================================================================================================-->
-  <createTable tableName="ACCOUNT_PREFERENCE">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="HIGHLIGHTER_THEME" type="varchar(100)" nullable="false" defaultValue="prettify"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_ACCOUNT_PREFERENCE_PK" tableName="ACCOUNT_PREFERENCE" columnNames="USER_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_PREFERENCE_FK0" baseTableName="ACCOUNT_PREFERENCE" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.36.xml
+++ b/src/main/resources/update/gitbucket-core_4.36.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <addColumn tableName="REPOSITORY">
-    <column name="SAFE_MODE" type="boolean" nullable="false" defaultValue="true"/>
-  </addColumn>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.37.xml
+++ b/src/main/resources/update/gitbucket-core_4.37.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT"/>
-  <modifyDataType columnName="URL" newDataType="varchar(400)" tableName="WEB_HOOK_EVENT"/>
-  <modifyDataType columnName="URL" newDataType="varchar(400)" tableName="WEB_HOOK"/>
-  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, URL" referencedTableName="WEB_HOOK" referencedColumnNames="USER_NAME, REPOSITORY_NAME, URL" onDelete="CASCADE" onUpdate="CASCADE"/>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.38.xml
+++ b/src/main/resources/update/gitbucket-core_4.38.xml
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <!--================================================================================================-->
-  <!-- CUSTOM_FIELD -->
-  <!--================================================================================================-->
-  <createTable tableName="CUSTOM_FIELD">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="FIELD_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="FIELD_NAME" type="varchar(100)" nullable="false"/>
-    <column name="FIELD_TYPE" type="varchar(100)" nullable="false"/>
-    <column name="ENABLE_FOR_ISSUES" type="boolean" nullable="false"/>
-    <column name="ENABLE_FOR_PULL_REQUESTS" type="boolean" nullable="false"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_CUSTOM_FIELD_PK" tableName="CUSTOM_FIELD" columnNames="USER_NAME, REPOSITORY_NAME, FIELD_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_CUSTOM_FIELD_FK0" baseTableName="CUSTOM_FIELD" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- ISSUE_CUSTOM_FIELD -->
-  <!--================================================================================================-->
-  <createTable tableName="ISSUE_CUSTOM_FIELD">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="FIELD_ID" type="int" nullable="false"/>
-    <column name="VALUE" type="varchar(200)" nullable="true"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_ISSUE_CUSTOM_FIELD_PK" tableName="ISSUE_CUSTOM_FIELD" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID, FIELD_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_CUSTOM_FIELD_FK0" baseTableName="ISSUE_CUSTOM_FIELD" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_CUSTOM_FIELD_FK1" baseTableName="ISSUE_CUSTOM_FIELD" baseColumnNames="USER_NAME, REPOSITORY_NAME, FIELD_ID" referencedTableName="CUSTOM_FIELD" referencedColumnNames="USER_NAME, REPOSITORY_NAME, FIELD_ID"/>
-
-  <!--================================================================================================-->
-  <!-- ISSUE_ASSIGNEE -->
-  <!--================================================================================================-->
-  <createTable tableName="ISSUE_ASSIGNEE">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="ASSIGNEE_USER_NAME" type="varchar(100)" nullable="false"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_ISSUE_ASSIGNEE_PK" tableName="ISSUE_ASSIGNEE" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID, ASSIGNEE_USER_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_ASSIGNEE_FK0" baseTableName="ISSUE_ASSIGNEE" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
-  <!--
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_ASSIGNEE_FK1" baseTableName="ISSUE_ASSIGNEE" baseColumnNames="ASSIGNEE_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-  -->
-
-  <sql>
-    INSERT INTO ISSUE_ASSIGNEE (USER_NAME, REPOSITORY_NAME, ISSUE_ID, ASSIGNEE_USER_NAME)
-      SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, ASSIGNED_USER_NAME FROM ISSUE WHERE ASSIGNED_USER_NAME IS NOT NULL
-  </sql>
-
-  <dropColumn tableName="ISSUE" columnName="ASSIGNED_USER_NAME"/>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.7.sql
+++ b/src/main/resources/update/gitbucket-core_4.7.sql
@@ -0,0 +1,2 @@
+-- DELETE COLLABORATORS IN GROUP REPOSITORIES
+DELETE FROM COLLABORATOR WHERE USER_NAME IN (SELECT USER_NAME FROM ACCOUNT WHERE GROUP_ACCOUNT = TRUE)
--- a/src/main/resources/update/gitbucket-core_4.7.xml
+++ b/src/main/resources/update/gitbucket-core_4.7.xml
@@ -30,9 +30,4 @@
    <dropColumn tableName="REPOSITORY" columnName="ENABLE_WIKI"/>
    <dropColumn tableName="REPOSITORY" columnName="ALLOW_WIKI_EDITING"/>
    <dropColumn tableName="REPOSITORY" columnName="ENABLE_ISSUES"/>
-
-    <!-- DELETE COLLABORATORS IN GROUP REPOSITORIES -->
-    <sql>
-      DELETE FROM COLLABORATOR WHERE USER_NAME IN (SELECT USER_NAME FROM ACCOUNT WHERE GROUP_ACCOUNT = TRUE)
-    </sql>
 </changeSet>
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -2,6 +2,7 @@ import java.util.EnumSet
 import javax.servlet._

 import gitbucket.core.controller.{ReleaseController, _}
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.servlet._
 import gitbucket.core.util.Directory
--- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
@@ -1,26 +1,16 @@
 package gitbucket.core

-import java.io.FileOutputStream
-import java.nio.charset.StandardCharsets
-import java.sql.Connection
-import java.util.UUID
-
-import gitbucket.core.model.Activity
-import gitbucket.core.util.Directory.ActivityLog
-import gitbucket.core.util.JDBCUtil
-import io.github.gitbucket.solidbase.Solidbase
-import io.github.gitbucket.solidbase.migration.{LiquibaseMigration, Migration}
-import io.github.gitbucket.solidbase.model.{Module, Version}
-import org.json4s.{Formats, NoTypeHints}
-import org.json4s.jackson.Serialization
-import org.json4s.jackson.Serialization.write
-
-import scala.util.Using
+import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
+import io.github.gitbucket.solidbase.model.{Version, Module}

 object GitBucketCoreModule
    extends Module(
      "gitbucket-core",
-      new Version("4.0.0", new LiquibaseMigration("update/gitbucket-core_4.0.xml")),
+      new Version(
+        "4.0.0",
+        new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
+        new SqlMigration("update/gitbucket-core_4.0.sql")
+      ),
      new Version("4.1.0"),
      new Version("4.2.0", new LiquibaseMigration("update/gitbucket-core_4.2.xml")),
      new Version("4.2.1"),
@@ -28,7 +18,11 @@ object GitBucketCoreModule
      new Version("4.4.0"),
      new Version("4.5.0"),
      new Version("4.6.0", new LiquibaseMigration("update/gitbucket-core_4.6.xml")),
-      new Version("4.7.0", new LiquibaseMigration("update/gitbucket-core_4.7.xml")),
+      new Version(
+        "4.7.0",
+        new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
+        new SqlMigration("update/gitbucket-core_4.7.sql")
+      ),
      new Version("4.7.1"),
      new Version("4.8"),
      new Version("4.9.0", new LiquibaseMigration("update/gitbucket-core_4.9.xml")),
@@ -37,7 +31,11 @@ object GitBucketCoreModule
      new Version("4.12.0"),
      new Version("4.12.1"),
      new Version("4.13.0"),
-      new Version("4.14.0", new LiquibaseMigration("update/gitbucket-core_4.14.xml")),
+      new Version(
+        "4.14.0",
+        new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
+        new SqlMigration("update/gitbucket-core_4.14.sql")
+      ),
      new Version("4.14.1"),
      new Version("4.15.0"),
      new Version("4.16.0"),
@@ -67,49 +65,5 @@ object GitBucketCoreModule
      new Version("4.31.1"),
      new Version("4.31.2"),
      new Version("4.32.0", new LiquibaseMigration("update/gitbucket-core_4.32.xml")),
-      new Version("4.33.0"),
-      new Version(
-        "4.34.0",
-        new Migration() {
-          override def migrate(moduleId: String, version: String, context: java.util.Map[String, AnyRef]): Unit = {
-            implicit val formats: Formats = Serialization.formats(NoTypeHints)
-            import JDBCUtil._
-
-            val conn = context.get(Solidbase.CONNECTION).asInstanceOf[Connection]
-            val list = conn.select("SELECT * FROM ACTIVITY ORDER BY ACTIVITY_ID") {
-              rs =>
-                Activity(
-                  activityId = UUID.randomUUID().toString,
-                  userName = rs.getString("USER_NAME"),
-                  repositoryName = rs.getString("REPOSITORY_NAME"),
-                  activityUserName = rs.getString("ACTIVITY_USER_NAME"),
-                  activityType = rs.getString("ACTIVITY_TYPE"),
-                  message = rs.getString("MESSAGE"),
-                  additionalInfo = {
-                    val additionalInfo = rs.getString("ADDITIONAL_INFO")
-                    if (rs.wasNull()) None else Some(additionalInfo)
-                  },
-                  activityDate = rs.getTimestamp("ACTIVITY_DATE")
-                )
-            }
-            Using.resource(new FileOutputStream(ActivityLog, true)) { out =>
-              list.foreach { activity =>
-                out.write((write(activity) + "\n").getBytes(StandardCharsets.UTF_8))
-              }
-            }
-          }
-        },
-        new LiquibaseMigration("update/gitbucket-core_4.34.xml")
-      ),
-      new Version("4.35.0", new LiquibaseMigration("update/gitbucket-core_4.35.xml")),
-      new Version("4.35.1"),
-      new Version("4.35.2"),
-      new Version("4.35.3"),
-      new Version("4.36.0", new LiquibaseMigration("update/gitbucket-core_4.36.xml")),
-      new Version("4.36.1"),
-      new Version("4.36.2"),
-      new Version("4.37.0", new LiquibaseMigration("update/gitbucket-core_4.37.xml")),
-      new Version("4.37.1"),
-      new Version("4.37.2"),
-      new Version("4.38.0", new LiquibaseMigration("update/gitbucket-core_4.38.xml"))
+      new Version("4.33.0")
    )
--- a/src/main/scala/gitbucket/core/api/ApiBranch.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranch.scala
@@ -22,12 +22,3 @@ 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
-)
--- a/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
@@ -4,11 +4,7 @@ import gitbucket.core.service.ProtectedBranchService
 import org.json4s._

 /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(
-  url: Option[ApiPath], // for output
-  enabled: Boolean,
-  required_status_checks: Option[ApiBranchProtection.Status]
-) {
+case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]) {
  def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
 }

@@ -19,36 +15,13 @@ 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(
-          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"
-            )
-          )
-        )
+        Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)
      )
    )
-  val statusNone = Status(None, Off, Seq.empty, None)
-  case class Status(
-    url: Option[ApiPath], // for output
-    enforcement_level: EnforcementLevel,
-    contexts: Seq[String],
-    contexts_url: Option[ApiPath] // for output
-  )
+  val statusNone = Status(Off, Seq.empty)
+  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
  sealed class EnforcementLevel(val name: String)
  case object Off extends EnforcementLevel("off")
  case object NonAdmins extends EnforcementLevel("non_admins")
@@ -66,7 +39,7 @@ object ApiBranchProtection {
      }
  }

-  implicit val enforcementLevelSerializer: CustomSerializer[EnforcementLevel] = new CustomSerializer[EnforcementLevel](
+  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](
    format =>
      (
        {
--- a/src/main/scala/gitbucket/core/api/ApiCommits.scala
+++ b/src/main/scala/gitbucket/core/api/ApiCommits.scala
@@ -97,7 +97,7 @@ object ApiCommits {
    ApiCommits(
      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
      sha = commitInfo.id,
-      html_url = ApiPath(s"/${repositoryName.fullName}/commit/${commitInfo.id}"),
+      html_url = ApiPath(s"${repositoryName.fullName}/commit/${commitInfo.id}"),
      comment_url = ApiPath(""), // TODO no API for commit comment
      commit = Commit(
        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
--- a/src/main/scala/gitbucket/core/api/ApiContents.scala
+++ b/src/main/scala/gitbucket/core/api/ApiContents.scala
@@ -28,7 +28,7 @@ object ApiContents {
              "file",
              fileInfo.name,
              fileInfo.path,
-              fileInfo.id.getName,
+              fileInfo.commitId,
              Some(Base64.getEncoder.encodeToString(arr)),
              Some("base64")
            )(repositoryName)
--- a/src/main/scala/gitbucket/core/api/ApiIssue.scala
+++ b/src/main/scala/gitbucket/core/api/ApiIssue.scala
@@ -12,16 +12,15 @@ case class ApiIssue(
  number: Int,
  title: String,
  user: ApiUser,
-  assignees: List[ApiUser],
+  assignee: Option[ApiUser],
  labels: List[ApiLabel],
  state: String,
  created_at: Date,
  updated_at: Date,
-  body: String,
-  milestone: Option[ApiMilestone]
+  body: String
 )(repositoryName: RepositoryName, isPullRequest: Boolean) {
  val id = 0 // dummy id
-  val assignee = assignees.headOption
+  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) {
@@ -43,17 +42,15 @@ object ApiIssue {
    issue: Issue,
    repositoryName: RepositoryName,
    user: ApiUser,
-    assignees: List[ApiUser],
-    labels: List[ApiLabel],
-    milestone: Option[ApiMilestone]
+    assignee: Option[ApiUser],
+    labels: List[ApiLabel]
  ): ApiIssue =
    ApiIssue(
      number = issue.issueId,
      title = issue.title,
      user = user,
-      assignees = assignees,
+      assignee = assignee,
      labels = labels,
-      milestone = milestone,
      state = if (issue.closed) { "closed" } else { "open" },
      body = issue.content.getOrElse(""),
      created_at = issue.registeredDate,
--- a/src/main/scala/gitbucket/core/api/ApiMilestone.scala
+++ b/src/main/scala/gitbucket/core/api/ApiMilestone.scala
@@ -1,49 +0,0 @@
-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
-    )
-}
--- a/src/main/scala/gitbucket/core/api/ApiPlugin.scala
+++ b/src/main/scala/gitbucket/core/api/ApiPlugin.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.api

-import gitbucket.core.plugin.PluginInfo
+import gitbucket.core.plugin.{PluginRegistry, PluginInfo}

 case class ApiPlugin(
  id: String,
--- a/src/main/scala/gitbucket/core/api/ApiPullRequest.scala
+++ b/src/main/scala/gitbucket/core/api/ApiPullRequest.scala
@@ -21,11 +21,10 @@ case class ApiPullRequest(
  body: String,
  user: ApiUser,
  labels: List[ApiLabel],
-  assignees: List[ApiUser],
+  assignee: Option[ApiUser],
  draft: Option[Boolean]
 ) {
  val id = 0 // dummy id
-  val assignee = assignees.headOption
  val html_url = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
  //val diff_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}.diff")
  //val patch_url           = ApiPath(s"${base.repo.html_url.path}/pull/${number}.patch")
@@ -46,7 +45,7 @@ object ApiPullRequest {
    baseRepo: ApiRepository,
    user: ApiUser,
    labels: List[ApiLabel],
-    assignees: List[ApiUser],
+    assignee: Option[ApiUser],
    mergedComment: Option[(IssueComment, Account)]
  ): ApiPullRequest =
    ApiPullRequest(
@@ -64,7 +63,7 @@ object ApiPullRequest {
      body = issue.content.getOrElse(""),
      user = user,
      labels = labels,
-      assignees = assignees,
+      assignee = assignee,
      draft = Some(pullRequest.isDraft)
    )

--- a/src/main/scala/gitbucket/core/api/ApiRef.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRef.scala
@@ -1,55 +1,5 @@
 package gitbucket.core.api

-import gitbucket.core.util.JGitUtil.TagInfo
-import gitbucket.core.util.RepositoryName
-import org.eclipse.jgit.lib.Ref
+case class ApiObject(sha: String)

-case class ApiRefCommit(
-  sha: String,
-  `type`: String,
-  url: ApiPath
-)
-
-case class ApiRef(
-  ref: String,
-  node_id: String = "",
-  url: ApiPath,
-  `object`: ApiRefCommit,
-)
-
-object ApiRef {
-
-  def fromRef(
-    repositoryName: RepositoryName,
-    ref: Ref
-  ): ApiRef =
-    ApiRef(
-      ref = ref.getName,
-      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/${ref.getName}"),
-      `object` = ApiRefCommit(
-        sha = ref.getObjectId.getName,
-        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${ref.getObjectId.getName}"),
-        `type` = "commit"
-      )
-    )
-
-  def fromTag(
-    repositoryName: RepositoryName,
-    tagInfo: TagInfo
-  ): ApiRef =
-    ApiRef(
-      ref = s"refs/tags/${tagInfo.name}",
-      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/refs/tags/${tagInfo.name}"),
-      //the GH api distinguishes between "releases" and plain git tags
-      //for "releases", the api returns a reference to the release object (with type `tag`)
-      //this would be something like s"/api/v3/repos/${repositoryName.fullName}/git/tags/<hash-of-tag>"
-      //with a hash for the tag, which I do not fully understand
-      //since this is not yet implemented in GB, we always return a link to the plain `commit` object,
-      //which GH does for tags that are not annotated
-      `object` = ApiRefCommit(
-        sha = tagInfo.objectId,
-        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${tagInfo.objectId}"),
-        `type` = "commit"
-      )
-    )
-}
+case class ApiRef(ref: String, `object`: ApiObject)
--- a/src/main/scala/gitbucket/core/api/ApiRepository.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRepository.scala
@@ -12,16 +12,16 @@ case class ApiRepository(
  forks: Int,
  `private`: Boolean,
  default_branch: String,
-  owner: ApiUser,
-  has_issues: Boolean
+  owner: ApiUser
 ) {
  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(""))
+  val ssh_url = Some(SshPath(s":${full_name}.git"))
 }

 object ApiRepository {
@@ -39,16 +39,11 @@ object ApiRepository {
      forks = forkedCount,
      `private` = repository.isPrivate,
      default_branch = repository.defaultBranch,
-      owner = owner,
-      has_issues = if (repository.options.issuesOption == "DISABLE") false else true
+      owner = owner
    )

  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))
@@ -62,7 +57,6 @@ object ApiRepository {
      forks = 0,
      `private` = false,
      default_branch = "master",
-      owner = owner,
-      has_issues = true
+      owner = owner
    )
 }
--- a/src/main/scala/gitbucket/core/api/ApiRepositoryCollaborator.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRepositoryCollaborator.scala
@@ -1,6 +0,0 @@
-package gitbucket.core.api
-
-case class ApiRepositoryCollaborator(
-  permission: String,
-  user: ApiUser
-)
--- a/src/main/scala/gitbucket/core/api/ApiWebhook.scala
+++ b/src/main/scala/gitbucket/core/api/ApiWebhook.scala
@@ -1,44 +0,0 @@
-package gitbucket.core.api
-
-import gitbucket.core.model.{RepositoryWebHook, WebHook}
-
-/**
- * https://docs.github.com/en/rest/reference/repos#webhooks
- */
-case class ApiWebhookConfig(
-  content_type: String,
-//  insecure_ssl: String,
-  url: String
-)
-
-case class ApiWebhook(
-  `type`: String,
-  id: Int,
-  name: String,
-  active: Boolean,
-  events: List[String],
-  config: ApiWebhookConfig,
-//  updated_at: Option[Date],
-//  created_at: Option[Date],
-  url: ApiPath,
-//  test_url: ApiPath,
-//  ping_url: ApiPath,
-//  last_response: ...
-)
-
-object ApiWebhook {
-  def apply(
-    _type: String,
-    hook: RepositoryWebHook,
-    hookEvents: Set[WebHook.Event]
-  ): ApiWebhook =
-    ApiWebhook(
-      `type` = _type,
-      id = hook.hookId,
-      name = "web", // dummy
-      active = true, // dummy
-      events = hookEvents.toList.map(_.name),
-      config = ApiWebhookConfig(hook.ctype.code, hook.url),
-      url = ApiPath(s"/api/v3/${hook.userName}/${hook.repositoryName}/hooks/${hook.hookId}")
-    )
-}
--- a/src/main/scala/gitbucket/core/api/CreateAMilestone.scala
+++ b/src/main/scala/gitbucket/core/api/CreateAMilestone.scala
@@ -1,14 +0,0 @@
-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\\-\\+_.]+")
-  }
-}
--- a/src/main/scala/gitbucket/core/api/CreateAPullRequest.scala
+++ b/src/main/scala/gitbucket/core/api/CreateAPullRequest.scala
@@ -15,11 +15,3 @@ 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],
-)
--- a/src/main/scala/gitbucket/core/api/CreateARef.scala
+++ b/src/main/scala/gitbucket/core/api/CreateARef.scala
@@ -1,7 +0,0 @@
-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)
--- a/src/main/scala/gitbucket/core/api/CreateARepositoryWebhook.scala
+++ b/src/main/scala/gitbucket/core/api/CreateARepositoryWebhook.scala
@@ -1,35 +0,0 @@
-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"
-  }
-}
--- a/src/main/scala/gitbucket/core/api/MergeAPullRequest.scala
+++ b/src/main/scala/gitbucket/core/api/MergeAPullRequest.scala
@@ -1,23 +0,0 @@
-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
-)
--- a/src/main/scala/gitbucket/core/api/UpdateARef.scala
+++ b/src/main/scala/gitbucket/core/api/UpdateARef.scala
@@ -1,7 +0,0 @@
-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)
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -35,7 +35,6 @@ class AccountController
    with WebHookService
    with PrioritiesService
    with RepositoryCreationService
-    with RequestCache

 trait AccountControllerBase extends AccountManagementControllerBase {
  self: AccountService
@@ -82,11 +81,9 @@ 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(40)))),
+    "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(
@@ -98,7 +95,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  )(AccountNewForm.apply)

  val editForm = mapping(
-    "password" -> trim(label("Password", optional(text(maxlength(40))))),
+    "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(
@@ -124,19 +121,6 @@ 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)
-
-  val resetPasswordEmailForm = mapping(
-    "mailAddress" -> trim(label("Email", text(required)))
-  )(ResetPasswordEmailForm.apply)
-
-  val resetPasswordForm = mapping(
-    "token" -> trim(label("Token", text(required))),
-    "password" -> trim(label("Password", text(required, maxlength(40))))
-  )(ResetPasswordForm.apply)
-
  case class NewGroupForm(
    groupName: String,
    description: Option[String],
@@ -152,13 +136,6 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    members: String,
    clearImage: Boolean
  )
-  case class ResetPasswordEmailForm(
-    mailAddress: String
-  )
-  case class ResetPasswordForm(
-    token: String,
-    password: String
-  )

  val newGroupForm = mapping(
    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
@@ -450,7 +427,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {

  post("/:userName/_personalToken", personalTokenForm)(oneselfOnly { form =>
    val userName = params("userName")
-    getAccountByUserName(userName).foreach { x =>
+    getAccountByUserName(userName).map { x =>
      val (tokenId, token) = generateAccessToken(userName, form.note)
      flash.update("generatedToken", (tokenId, token))
    }
@@ -464,29 +441,6 @@ 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 =>
@@ -567,8 +521,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    val url = params("url")
    val token = Some(params("token"))
    val ctype = WebHookContentType.valueOf(params("ctype"))
-    val dummyWebHookInfo =
-      RepositoryWebHook(userName = userName, repositoryName = "dummy", url = url, ctype = ctype, token = token)
+    val dummyWebHookInfo = RepositoryWebHook(userName, "dummy", url, ctype, token)
    val dummyPayload = {
      val ownerAccount = getAccountByUserName(userName).get
      WebHookPushPayload.createDummyPayload(ownerAccount)
@@ -618,7 +571,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  })

  get("/register") {
-    if (context.settings.basicBehavior.allowAccountRegistration) {
+    if (context.settings.allowAccountRegistration) {
      if (context.loginAccount.isDefined) {
        redirect("/")
      } else {
@@ -628,7 +581,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  }

  post("/register", newForm) { form =>
-    if (context.settings.basicBehavior.allowAccountRegistration) {
+    if (context.settings.allowAccountRegistration) {
      createAccount(
        form.userName,
        pbkdf2_sha256(form.password),
@@ -644,67 +597,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    } else NotFound()
  }

-  get("/reset") {
-    if (context.settings.basicBehavior.allowResetPassword) {
-      html.reset()
-    } else NotFound()
-  }
-
-  post("/reset", resetPasswordEmailForm) { form =>
-    if (context.settings.basicBehavior.allowResetPassword) {
-      getAccountByMailAddress(form.mailAddress).foreach { account =>
-        val token = generateResetPasswordToken(form.mailAddress)
-        val mailer = new Mailer(context.settings)
-        mailer.send(
-          form.mailAddress,
-          "Reset password",
-          s"""Hello, ${account.fullName}!
-            |
-            |You requested to reset the password for your GitBucket account.
-            |If you are not sure about the request, you can ignore this email.
-            |Otherwise, click the following link to set the new password:
-            |${context.baseUrl}/reset/form/${token}
-            |""".stripMargin
-        )
-      }
-      redirect("/reset/sent")
-    } else NotFound()
-  }
-
-  get("/reset/sent") {
-    if (context.settings.basicBehavior.allowResetPassword) {
-      html.resetsent()
-    } else NotFound()
-  }
-
-  get("/reset/form/:token") {
-    if (context.settings.basicBehavior.allowResetPassword) {
-      val token = params("token")
-      decodeResetPasswordToken(token)
-        .map { _ =>
-          html.resetform(token)
-        }
-        .getOrElse(NotFound())
-    } else NotFound()
-  }
-
-  post("/reset/form", resetPasswordForm) { form =>
-    if (context.settings.basicBehavior.allowResetPassword) {
-      decodeResetPasswordToken(form.token)
-        .flatMap { mailAddress =>
-          getAccountByMailAddress(mailAddress).map { account =>
-            updateAccount(account.copy(password = pbkdf2_sha256(form.password)))
-            html.resetcomplete()
-          }
-        }
-        .getOrElse(NotFound())
-    } else NotFound()
-  }
-
  get("/groups/new")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      html.creategroup(List(GroupMember("", loginAccount.userName, true)))
-    }
+    html.creategroup(List(GroupMember("", context.loginAccount.get.userName, true)))
  })

  post("/groups/new", newGroupForm)(usersOnly { form =>
@@ -725,20 +619,22 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  })

  get("/:groupName/_editgroup")(managersOnly {
-    val groupName = params("groupName")
-    getAccountByUserName(groupName, true).map { account =>
-      html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
-    } getOrElse NotFound()
+    defining(params("groupName")) { groupName =>
+      getAccountByUserName(groupName, true).map { account =>
+        html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
+      } getOrElse NotFound()
+    }
  })

  get("/:groupName/_deletegroup")(managersOnly {
-    val groupName = params("groupName")
-    // Remove from GROUP_MEMBER
-    updateGroupMembers(groupName, Nil)
-    // Disable group
-    getAccountByUserName(groupName, false).foreach { account =>
-      updateGroup(groupName, account.description, account.url, true)
-    }
+    defining(params("groupName")) {
+      groupName =>
+        // Remove from GROUP_MEMBER
+        updateGroupMembers(groupName, Nil)
+        // Disable group
+        getAccountByUserName(groupName, false).foreach { account =>
+          updateGroup(groupName, account.description, account.url, true)
+        }
 //      // Remove repositories
 //      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
 //        deleteRepository(groupName, repositoryName)
@@ -746,25 +642,28 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
 //        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
 //      }
+    }
    redirect("/")
  })

  post("/:groupName/_editgroup", editGroupForm)(managersOnly { form =>
-    val groupName = params("groupName")
-    val members = form.members
-      .split(",")
-      .map {
-        _.split(":") match {
-          case Array(userName, isManager) => (userName, isManager.toBoolean)
+    defining(
+      params("groupName"),
+      form.members
+        .split(",")
+        .map {
+          _.split(":") match {
+            case Array(userName, isManager) => (userName, isManager.toBoolean)
+          }
        }
-      }
-      .toList
+        .toList
+    ) {
+      case (groupName, members) =>
+        getAccountByUserName(groupName, true).map { account =>
+          updateGroup(groupName, form.description, form.url, false)

-    getAccountByUserName(groupName, true).map { account =>
-      updateGroup(groupName, form.description, form.url, false)
-
-      // Update GROUP_MEMBER
-      updateGroupMembers(form.groupName, members)
+          // Update GROUP_MEMBER
+          updateGroupMembers(form.groupName, members)
 //        // Update COLLABORATOR for group repositories
 //        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //          removeCollaborators(form.groupName, repositoryName)
@@ -773,104 +672,87 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //          }
 //        }

-      updateImage(form.groupName, form.fileId, form.clearImage)
+          updateImage(form.groupName, form.fileId, form.clearImage)

-      flash.update("info", "Account information has been updated.")
-      redirect(s"/${groupName}/_editgroup")
+          flash.update("info", "Account information has been updated.")
+          redirect(s"/${groupName}/_editgroup")

-    } getOrElse NotFound()
+        } getOrElse NotFound()
+    }
  })

  /**
   * Show the new repository form.
   */
  get("/new")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      html.newrepo(getGroupsByUserName(loginAccount.userName), context.settings.basicBehavior.isCreateRepoOptionPublic)
-    }
+    html.newrepo(getGroupsByUserName(context.loginAccount.get.userName), context.settings.isCreateRepoOptionPublic)
  })

  /**
   * Create new repository.
   */
  post("/new", newRepositoryForm)(usersOnly { form =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (context.settings.basicBehavior.repositoryOperation.create || loginAccount.isAdmin) {
-          LockUtil.lock(s"${form.owner}/${form.name}") {
-            if (getRepository(form.owner, form.name).isDefined) {
-              // redirect to the repository if repository already exists
-              redirect(s"/${form.owner}/${form.name}")
-            } else if (!canCreateRepository(form.owner, loginAccount)) {
-              // Permission error
-              Forbidden()
-            } else {
-              // create repository asynchronously
-              createRepository(
-                loginAccount,
-                form.owner,
-                form.name,
-                form.description,
-                form.isPrivate,
-                form.initOption,
-                form.sourceUrl
-              )
-              // redirect to the repository
-              redirect(s"/${form.owner}/${form.name}")
-            }
-          }
-        } else Forbidden()
-    }
+    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}")
+    } else Forbidden()
  })

  get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (repository.repository.options.allowFork && (context.settings.basicBehavior.repositoryOperation.fork || loginAccount.isAdmin)) {
-          val loginUserName = loginAccount.userName
-          val groups = getGroupsByUserName(loginUserName)
-          groups match {
-            case _: List[String] =>
-              val managerPermissions = groups.map { group =>
-                val members = getGroupMembers(group)
-                context.loginAccount.exists(
-                  x =>
-                    members.exists { member =>
-                      member.userName == x.userName && member.isManager
-                  }
-                )
+    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 {
+        case _: List[String] =>
+          val managerPermissions = groups.map { group =>
+            val members = getGroupMembers(group)
+            context.loginAccount.exists(
+              x =>
+                members.exists { member =>
+                  member.userName == x.userName && member.isManager
              }
-              helper.html.forkrepository(
-                repository,
-                (groups zip managerPermissions).sortBy(_._1)
-              )
-            case _ => redirect(s"/${loginUserName}")
+            )
          }
-        } else BadRequest()
-    }
+          helper.html.forkrepository(
+            repository,
+            (groups zip managerPermissions).sortBy(_._1)
+          )
+        case _ => redirect(s"/${loginUserName}")
+      }
+    } else BadRequest()
  })

  post("/:owner/:repository/fork", accountForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (repository.repository.options.allowFork && (context.settings.basicBehavior.repositoryOperation.fork || loginAccount.isAdmin)) {
-          val loginUserName = loginAccount.userName
-          val accountName = form.accountName
+    val loginAccount = context.loginAccount.get
+    if (repository.repository.options.allowFork && (context.settings.repositoryOperation.fork || loginAccount.isAdmin)) {
+      val loginUserName = loginAccount.userName
+      val accountName = form.accountName

-          if (getRepository(accountName, repository.name).isDefined) {
-            // redirect to the repository if repository already exists
-            redirect(s"/${accountName}/${repository.name}")
-          } else if (!canCreateRepository(accountName, loginAccount)) {
-            // Permission error
-            Forbidden()
-          } else {
-            // fork repository asynchronously
-            forkRepository(accountName, repository, loginUserName)
-            // redirect to the repository
-            redirect(s"/${accountName}/${repository.name}")
-          }
-        } else Forbidden()
-    }
+      if (getRepository(accountName, repository.name).isDefined ||
+          (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))) {
+        // redirect to the repository if repository already exists
+        redirect(s"/${accountName}/${repository.name}")
+      } else {
+        // fork repository asynchronously
+        forkRepository(accountName, repository, loginUserName)
+        // redirect to the repository
+        redirect(s"/${accountName}/${repository.name}")
+      }
+    } else Forbidden()
  })

  private def existsAccount: Constraint = new Constraint() {
--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -13,7 +13,6 @@ class ApiController
    with ApiIssueCommentControllerBase
    with ApiIssueControllerBase
    with ApiIssueLabelControllerBase
-    with ApiIssueMilestoneControllerBase
    with ApiOrganizationControllerBase
    with ApiPullRequestControllerBase
    with ApiReleaseControllerBase
@@ -23,7 +22,6 @@ class ApiController
    with ApiRepositoryContentsControllerBase
    with ApiRepositoryControllerBase
    with ApiRepositoryStatusControllerBase
-    with ApiRepositoryWebhookControllerBase
    with ApiUserControllerBase
    with RepositoryService
    with AccountService
@@ -54,7 +52,6 @@ class ApiController
    with ReferrerAuthenticator
    with ReadableUsersAuthenticator
    with WritableUsersAuthenticator
-    with RequestCache

 trait ApiControllerBase extends ControllerBase {

--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -28,7 +28,6 @@ import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.treewalk._
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
-import org.json4s.Formats

 /**
 * Provides generic features for controller implementations.
@@ -44,7 +43,7 @@ abstract class ControllerBase

  private val logger = LoggerFactory.getLogger(getClass)

-  implicit val jsonFormats: Formats = gitbucket.core.api.JsonFormat.jsonFormats
+  implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats

  before("/api/v3/*") {
    contentType = formats("json")
@@ -158,8 +157,11 @@ abstract class ControllerBase
          org.scalatra.Unauthorized(
            redirect(
              "/signin?redirect=" + StringUtil.urlEncode(
-                request.getRequestURI
-                  .substring(request.getContextPath.length) + Option(request.getQueryString).map("?" + _).getOrElse("")
+                defining(request.getQueryString) { queryString =>
+                  request.getRequestURI.substring(request.getContextPath.length) + (if (queryString != null)
+                                                                                      "?" + queryString
+                                                                                    else "")
+                }
              )
            )
          )
@@ -253,7 +255,7 @@ abstract class ControllerBase
    repository: RepositoryService.RepositoryInfo
  ): Unit = {
    JGitUtil.getObjectLoaderFromId(git, objectId) { loader =>
-      contentType = FileUtil.getSafeMimeType(path, repository.repository.options.safeMode)
+      contentType = FileUtil.getSafeMimeType(path)

      if (loader.isLarge) {
        response.setContentLength(loader.getSize.toInt)
@@ -300,27 +302,20 @@ case class Context(
  }
  val sidebarCollapse = request.getSession.getAttribute("sidebar-collapse") != null

-  def withLoginAccount(f: Account => Any): Any = {
-    loginAccount match {
-      case Some(loginAccount) => f(loginAccount)
-      case None               => Unauthorized()
-    }
-  }
-
  /**
   * Get object from cache.
   *
   * If object has not been cached with the specified key then retrieves by given action.
   * Cached object are available during a request.
   */
-  def cache[A](key: String)(action: => A): A = {
-    val cacheKey = Keys.Request.Cache(key)
-    Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
-      val newObject = action
-      request.setAttribute(cacheKey, newObject)
-      newObject
+  def cache[A](key: String)(action: => A): A =
+    defining(Keys.Request.Cache(key)) { cacheKey =>
+      Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
+        val newObject = action
+        request.setAttribute(cacheKey, newObject)
+        newObject
+      }
    }
-  }

 }

@@ -426,7 +421,7 @@ trait AccountManagementControllerBase extends ControllerBase {
    "new"
  )

-  protected def reservedNames: Constraint = new Constraint() {
+  protected def reservedNames(): Constraint = new Constraint() {
    override def validate(name: String, value: String, messages: Messages): Option[String] =
      if (allReservedNames.contains(value.toLowerCase)) {
        Some(s"${value} is reserved")
--- a/src/main/scala/gitbucket/core/controller/DashboardController.scala
+++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala
@@ -1,7 +1,6 @@
 package gitbucket.core.controller

 import gitbucket.core.dashboard.html
-import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.{Keys, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
@@ -22,76 +21,51 @@ 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 CommitStatusService
-    with UsersAuthenticator =>
+  self: IssuesService with PullRequestService with RepositoryService with AccountService with UsersAuthenticator =>

  get("/dashboard/repos")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      val repos = getVisibleRepositories(
-        context.loginAccount,
-        None,
-        withoutPhysicalInfo = true,
-        limit = context.settings.basicBehavior.limitVisibleRepositories
-      )
-      html.repos(getGroupNames(loginAccount.userName), repos, repos)
-    }
+    val repos = getVisibleRepositories(
+      context.loginAccount,
+      None,
+      withoutPhysicalInfo = true,
+      limit = context.settings.limitVisibleRepositories
+    )
+    html.repos(getGroupNames(context.loginAccount.get.userName), repos, repos)
  })

  get("/dashboard/issues")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchIssues(loginAccount, "created_by")
-    }
+    searchIssues("created_by")
  })

  get("/dashboard/issues/assigned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchIssues(loginAccount, "assigned")
-    }
+    searchIssues("assigned")
  })

  get("/dashboard/issues/created_by")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchIssues(loginAccount, "created_by")
-    }
+    searchIssues("created_by")
  })

  get("/dashboard/issues/mentioned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchIssues(loginAccount, "mentioned")
-    }
+    searchIssues("mentioned")
  })

  get("/dashboard/pulls")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchPullRequests(loginAccount, "created_by")
-    }
+    searchPullRequests("created_by")
  })

  get("/dashboard/pulls/created_by")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchPullRequests(loginAccount, "created_by")
-    }
+    searchPullRequests("created_by")
  })

  get("/dashboard/pulls/assigned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchPullRequests(loginAccount, "assigned")
-    }
+    searchPullRequests("assigned")
  })

  get("/dashboard/pulls/mentioned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      searchPullRequests(loginAccount, "mentioned")
-    }
+    searchPullRequests("mentioned")
  })

  private def getOrCreateCondition(key: String, filter: String, userName: String) = {
@@ -104,20 +78,19 @@ trait DashboardControllerBase extends ControllerBase {
    }
  }

-  private def searchIssues(loginAccount: Account, filter: String) = {
+  private def searchIssues(filter: String) = {
    import IssuesService._

-    val userName = loginAccount.userName
+    val userName = context.loginAccount.get.userName
    val condition = getOrCreateCondition(Keys.Session.DashboardIssues, filter, userName)
    val userRepos = getUserRepositories(userName, true).map(repo => repo.owner -> repo.name)
    val page = IssueSearchCondition.page(request)
-    val issues = searchIssue(condition, IssueSearchOption.Issues, (page - 1) * IssueLimit, IssueLimit, userRepos: _*)

    html.issues(
-      issues.map(issue => (issue, None)),
+      searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
      page,
-      countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, userRepos: _*),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, userRepos: _*),
+      countIssue(condition.copy(state = "open"), false, userRepos: _*),
+      countIssue(condition.copy(state = "closed"), false, userRepos: _*),
      filter match {
        case "assigned"  => condition.copy(assigned = Some(Some(userName)))
        case "mentioned" => condition.copy(mentioned = Some(userName))
@@ -129,37 +102,25 @@ trait DashboardControllerBase extends ControllerBase {
        context.loginAccount,
        None,
        withoutPhysicalInfo = true,
-        limit = context.settings.basicBehavior.limitVisibleRepositories
+        limit = context.settings.limitVisibleRepositories
      )
    )
  }

-  private def searchPullRequests(loginAccount: Account, filter: String) = {
+  private def searchPullRequests(filter: String) = {
    import IssuesService._
    import PullRequestService._

-    val userName = loginAccount.userName
+    val userName = context.loginAccount.get.userName
    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(
-      issues.zip(status),
+      searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
      page,
-      countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, allRepos: _*),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, allRepos: _*),
+      countIssue(condition.copy(state = "open"), true, allRepos: _*),
+      countIssue(condition.copy(state = "closed"), true, allRepos: _*),
      filter match {
        case "assigned"  => condition.copy(assigned = Some(Some(userName)))
        case "mentioned" => condition.copy(mentioned = Some(userName))
@@ -171,7 +132,7 @@ trait DashboardControllerBase extends ControllerBase {
        context.loginAccount,
        None,
        withoutPhysicalInfo = true,
-        limit = context.settings.basicBehavior.limitVisibleRepositories
+        limit = context.settings.limitVisibleRepositories
      )
    )
  }
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -6,6 +6,7 @@ import gitbucket.core.model.Account
 import gitbucket.core.service.{AccountService, ReleaseService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import org.eclipse.jgit.api.Git
@@ -17,7 +18,6 @@ import org.apache.commons.io.{FileUtils, IOUtils}

 import scala.util.Using
 import gitbucket.core.service.SystemSettingsService
-import slick.jdbc.JdbcBackend.Session

 /**
 * Provides Ajax based file upload functionality.
@@ -37,10 +37,10 @@ class FileUploadController
    execute(
      { (file, fileId) =>
        FileUtils
-          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get())
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get)
        session += Keys.Session.Upload(fileId) -> file.name
      },
-      FileUtil.isImage(_)
+      FileUtil.isImage
    )
  }

@@ -49,7 +49,7 @@ class FileUploadController
    execute(
      { (file, fileId) =>
        FileUtils
-          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get())
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get)
        session += Keys.Session.Upload(fileId) -> file.name
      },
      _ => true
@@ -65,7 +65,7 @@ class FileUploadController
            getAttachedDir(params("owner"), params("repository")),
            FileUtil.checkFilename(fileId + "." + FileUtil.getExtension(file.getName))
          ),
-          file.get()
+          file.get
        )
      },
      _ => true
@@ -131,7 +131,7 @@ class FileUploadController
    } getOrElse BadRequest()
  }

-  post("/release/:owner/:repository/*") {
+  post("/release/:owner/:repository/:tag") {
    setMultipartConfigForLargeFile()
    session
      .get(Keys.Session.LoginAccount)
@@ -139,12 +139,12 @@ class FileUploadController
        case _: Account =>
          val owner = params("owner")
          val repository = params("repository")
-          val tag = multiParams("splat").head
+          val tag = params("tag")
          execute(
            { (file, fileId) =>
              FileUtils.writeByteArrayToFile(
                new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)),
-                file.get()
+                file.get
              )
            },
            _ => true
@@ -178,7 +178,7 @@ class FileUploadController
  }

  private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
-    implicit val session: Session = Database.getSession(request)
+    implicit val session = Database.getSession(request)
    getRepository(owner, repository) match {
      case Some(x) =>
        x.repository.options.wikiOption match {
@@ -191,13 +191,14 @@ class FileUploadController
    }
  }

-  private def execute(f: (FileItem, String) => Unit, mimeTypeChecker: (String) => Boolean) =
+  private def execute(f: (FileItem, String) => Unit, mimeTypeChcker: (String) => Boolean) =
    fileParams.get("file") match {
-      case Some(file) if mimeTypeChecker(file.name) =>
-        val fileId = FileUtil.generateFileId
-        f(file, fileId)
-        contentType = "text/plain"
-        Ok(fileId)
+      case Some(file) if (mimeTypeChcker(file.name)) =>
+        defining(FileUtil.generateFileId) { fileId =>
+          f(file, fileId)
+          contentType = "text/plain"
+          Ok(fileId)
+        }
      case _ => BadRequest()
    }

--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -8,6 +8,7 @@ import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
 import gitbucket.core.view.helpers._
 import org.scalatra.Ok
@@ -28,7 +29,6 @@ class IndexController
    with AccessTokenService
    with AccountFederationService
    with OpenIDConnectService
-    with RequestCache

 trait IndexControllerBase extends ControllerBase {
  self: RepositoryService
@@ -69,7 +69,7 @@ trait IndexControllerBase extends ControllerBase {
            Some(account),
            None,
            withoutPhysicalInfo = true,
-            limit = context.settings.basicBehavior.limitVisibleRepositories
+            limit = context.settings.limitVisibleRepositories
          ),
          showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
            account.userName
@@ -78,7 +78,7 @@ trait IndexControllerBase extends ControllerBase {
      }
      .getOrElse {
        gitbucket.core.html.index(
-          getRecentPublicActivities(),
+          getRecentActivities(),
          getVisibleRepositories(None, withoutPhysicalInfo = true),
          showBannerToCreatePersonalAccessToken = false
        )
@@ -161,7 +161,7 @@ trait IndexControllerBase extends ControllerBase {

  get("/activities.atom") {
    contentType = "application/atom+xml; type=feed"
-    xml.feed(getRecentPublicActivities())
+    xml.feed(getRecentActivities())
  }

  post("/sidebar-collapse") {
@@ -212,10 +212,8 @@ trait IndexControllerBase extends ControllerBase {
            }
            .map { t =>
              Map(
-                "label" -> s"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(
-                  StringUtil.cutTail(t.userName, 25, "...")
-                )}</b> ${StringUtil
-                  .escapeHtml(StringUtil.cutTail(t.fullName, 25, "..."))}",
+                "label" -> s"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(t.userName)}</b> ${StringUtil
+                  .escapeHtml(t.fullName)}",
                "value" -> t.userName
              )
            }
@@ -236,49 +234,50 @@ trait IndexControllerBase extends ControllerBase {

  // TODO Move to RepositoryViewrController?
  get("/:owner/:repository/search")(referrersOnly { repository =>
-    val query = params.getOrElse("q", "").trim
-    val target = params.getOrElse("type", "code")
-    val page = try {
-      val i = params.getOrElse("page", "1").toInt
-      if (i <= 0) 1 else i
-    } catch {
-      case _: NumberFormatException => 1
-    }
+    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")) {
+      case (query, target) =>
+        val page = try {
+          val i = params.getOrElse("page", "1").toInt
+          if (i <= 0) 1 else i
+        } catch {
+          case e: NumberFormatException => 1
+        }

-    target.toLowerCase match {
-      case "issues" =>
-        gitbucket.core.search.html.issues(
-          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
-          false,
-          query,
-          page,
-          repository
-        )
+        target.toLowerCase match {
+          case "issues" =>
+            gitbucket.core.search.html.issues(
+              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
+              false,
+              query,
+              page,
+              repository
+            )

-      case "pulls" =>
-        gitbucket.core.search.html.issues(
-          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
-          true,
-          query,
-          page,
-          repository
-        )
+          case "pulls" =>
+            gitbucket.core.search.html.issues(
+              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
+              true,
+              query,
+              page,
+              repository
+            )

-      case "wiki" =>
-        gitbucket.core.search.html.wiki(
-          if (query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
-          query,
-          page,
-          repository
-        )
+          case "wiki" =>
+            gitbucket.core.search.html.wiki(
+              if (query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
+              query,
+              page,
+              repository
+            )

-      case _ =>
-        gitbucket.core.search.html.code(
-          if (query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
-          query,
-          page,
-          repository
-        )
+          case _ =>
+            gitbucket.core.search.html.code(
+              if (query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
+              query,
+              page,
+              repository
+            )
+        }
    }
  })

@@ -289,11 +288,11 @@ trait IndexControllerBase extends ControllerBase {
        context.loginAccount,
        None,
        withoutPhysicalInfo = true,
-        limit = context.settings.basicBehavior.limitVisibleRepositories
+        limit = context.settings.limitVisibleRepositories
      )

    val repositories = {
-      context.settings.basicBehavior.limitVisibleRepositories match {
+      context.settings.limitVisibleRepositories match {
        case true =>
          getVisibleRepositories(
            context.loginAccount,
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -1,9 +1,9 @@
 package gitbucket.core.controller

 import gitbucket.core.issues.html
-import gitbucket.core.model.{Account, CustomFieldBehavior}
 import gitbucket.core.service.IssuesService._
 import gitbucket.core.service._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import gitbucket.core.view
@@ -21,7 +21,6 @@ class IssuesController
    with ActivityService
    with HandleCommentService
    with IssueCreationService
-    with CustomFieldsService
    with ReadableUsersAuthenticator
    with ReferrerAuthenticator
    with WritableUsersAuthenticator
@@ -31,7 +30,6 @@ class IssuesController
    with WebHookPullRequestReviewCommentService
    with CommitsService
    with PrioritiesService
-    with RequestCache

 trait IssuesControllerBase extends ControllerBase {
  self: IssuesService
@@ -42,7 +40,6 @@ trait IssuesControllerBase extends ControllerBase {
    with ActivityService
    with HandleCommentService
    with IssueCreationService
-    with CustomFieldsService
    with ReadableUsersAuthenticator
    with ReferrerAuthenticator
    with WritableUsersAuthenticator
@@ -53,7 +50,7 @@ trait IssuesControllerBase extends ControllerBase {
  case class IssueCreateForm(
    title: String,
    content: Option[String],
-    assigneeUserNames: Option[String],
+    assignedUserName: Option[String],
    milestoneId: Option[Int],
    priorityId: Option[Int],
    labelNames: Option[String]
@@ -64,7 +61,7 @@ trait IssuesControllerBase extends ControllerBase {
  val issueCreateForm = mapping(
    "title" -> trim(label("Title", text(required))),
    "content" -> trim(optional(text())),
-    "assigneeUserNames" -> trim(optional(text())),
+    "assignedUserName" -> trim(optional(text())),
    "milestoneId" -> trim(optional(number())),
    "priorityId" -> trim(optional(number())),
    "labelNames" -> trim(optional(text()))
@@ -97,246 +94,211 @@ trait IssuesControllerBase extends ControllerBase {
  })

  get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    val issueId = params("id")
-    getIssue(repository.owner, repository.name, issueId) map {
-      issue =>
-        if (issue.isPullRequest) {
-          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-        } else {
-          html.issue(
-            issue,
-            getComments(repository.owner, repository.name, issueId.toInt),
-            getIssueLabels(repository.owner, repository.name, issueId.toInt),
-            getIssueAssignees(repository.owner, repository.name, issueId.toInt),
-            getAssignableUserNames(repository.owner, repository.name),
-            getMilestonesWithIssueCount(repository.owner, repository.name),
-            getPriorities(repository.owner, repository.name),
-            getLabels(repository.owner, repository.name),
-            getCustomFieldsWithValue(repository.owner, repository.name, issueId.toInt).filter(_._1.enableForIssues),
-            isIssueEditable(repository),
-            isIssueManageable(repository),
-            isIssueCommentManageable(repository),
-            repository
-          )
-        }
-    } getOrElse NotFound()
+    defining(repository.owner, repository.name, params("id")) {
+      case (owner, name, issueId) =>
+        getIssue(owner, name, issueId) map {
+          issue =>
+            if (issue.isPullRequest) {
+              redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+            } else {
+              html.issue(
+                issue,
+                getComments(owner, name, issueId.toInt),
+                getIssueLabels(owner, name, issueId.toInt),
+                getAssignableUserNames(owner, name),
+                getMilestonesWithIssueCount(owner, name),
+                getPriorities(owner, name),
+                getLabels(owner, name),
+                isIssueEditable(repository),
+                isIssueManageable(repository),
+                repository
+              )
+            }
+        } getOrElse NotFound()
+    }
  })

  get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-      html.create(
-        getAssignableUserNames(repository.owner, repository.name),
-        getMilestones(repository.owner, repository.name),
-        getPriorities(repository.owner, repository.name),
-        getDefaultPriority(repository.owner, repository.name),
-        getLabels(repository.owner, repository.name),
-        getCustomFields(repository.owner, repository.name).filter(_.enableForIssues),
-        isIssueManageable(repository),
-        getContentTemplate(repository, "ISSUE_TEMPLATE"),
-        repository
-      )
+      defining(repository.owner, repository.name) {
+        case (owner, name) =>
+          html.create(
+            getAssignableUserNames(owner, name),
+            getMilestones(owner, name),
+            getPriorities(owner, name),
+            getDefaultPriority(owner, name),
+            getLabels(owner, name),
+            isIssueManageable(repository),
+            getContentTemplate(repository, "ISSUE_TEMPLATE"),
+            repository
+          )
+      }
    } else Unauthorized()
  })

  post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-          val issue = createIssue(
-            repository,
-            form.title,
-            form.content,
-            form.assigneeUserNames.toSeq.flatMap(_.split(",")),
-            form.milestoneId,
-            form.priorityId,
-            form.labelNames.toSeq.flatMap(_.split(",")),
-            loginAccount
-          )
+    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
+      val issue = createIssue(
+        repository,
+        form.title,
+        form.content,
+        form.assignedUserName,
+        form.milestoneId,
+        form.priorityId,
+        form.labelNames.toSeq.flatMap(_.split(",")),
+        context.loginAccount.get
+      )

-          // Insert custom field values
-          params.toMap.foreach {
-            case (key, value) =>
-              if (key.startsWith("custom-field-")) {
-                getCustomField(
-                  repository.owner,
-                  repository.name,
-                  key.replaceFirst("^custom-field-", "").toInt
-                ).foreach { field =>
-                  CustomFieldBehavior.validate(field, value, messages) match {
-                    case None =>
-                      insertOrUpdateCustomFieldValue(field, repository.owner, repository.name, issue.issueId, value)
-                    case Some(_) => halt(400)
-                  }
-                }
-              }
-          }
-
-          redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
-        } else Unauthorized()
-    }
+      redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
+    } else Unauthorized()
  })

  ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        getIssue(repository.owner, repository.name, params("id")).map {
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
+        getIssue(owner, name, params("id")).map {
          issue =>
-            if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
+            if (isEditableContent(owner, name, issue.openedUserName)) {
              if (issue.title != title) {
                // update issue
-                updateIssue(repository.owner, repository.name, issue.issueId, title, issue.content)
+                updateIssue(owner, name, issue.issueId, title, issue.content)
                // extract references and create refer comment
-                createReferComment(repository.owner, repository.name, issue.copy(title = title), title, loginAccount)
+                createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
                createComment(
-                  repository.owner,
-                  repository.name,
-                  loginAccount.userName,
+                  owner,
+                  name,
+                  context.loginAccount.get.userName,
                  issue.issueId,
                  issue.title + "\r\n" + title,
                  "change_title"
                )
              }
-              redirect(s"/${repository.owner}/${repository.name}/issues/_data/${issue.issueId}")
+              redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
            } else Unauthorized()
        } getOrElse NotFound()
    }
  })

  ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (content, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        getIssue(repository.owner, repository.name, params("id")).map { issue =>
-          if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
+        getIssue(owner, name, params("id")).map { issue =>
+          if (isEditableContent(owner, name, issue.openedUserName)) {
            // update issue
-            updateIssue(repository.owner, repository.name, issue.issueId, issue.title, content)
+            updateIssue(owner, name, issue.issueId, issue.title, content)
            // extract references and create refer comment
-            createReferComment(repository.owner, repository.name, issue, content.getOrElse(""), loginAccount)
+            createReferComment(owner, name, issue, content.getOrElse(""), context.loginAccount.get)

-            redirect(s"/${repository.owner}/${repository.name}/issues/_data/${issue.issueId}")
+            redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
          } else Unauthorized()
        } getOrElse NotFound()
    }
  })

  post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-          val actionOpt =
-            params
-              .get("action")
-              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
-          handleComment(issue, Some(form.content), repository, actionOpt) map {
-            case (issue, id) =>
-              redirect(
-                s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
-              )
-          }
-        } getOrElse NotFound()
-    }
+    getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
+      val actionOpt =
+        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      handleComment(issue, Some(form.content), repository, actionOpt) map {
+        case (issue, id) =>
+          redirect(
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+          )
+      }
+    } getOrElse NotFound()
  })

  post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-          val actionOpt =
-            params
-              .get("action")
-              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
-          handleComment(issue, form.content, repository, actionOpt) map {
-            case (issue, id) =>
-              redirect(
-                s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
-              )
-          }
-        } getOrElse NotFound()
-    }
+    getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
+      val actionOpt =
+        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      handleComment(issue, form.content, repository, actionOpt) map {
+        case (issue, id) =>
+          redirect(
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+          )
+      }
+    } getOrElse NotFound()
  })

  ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        getComment(repository.owner, repository.name, params("id")).map { comment =>
-          if (isEditableContent(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
-            updateComment(repository.owner, repository.name, comment.issueId, comment.commentId, form.content)
-            redirect(s"/${repository.owner}/${repository.name}/issue_comments/_data/${comment.commentId}")
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
+        getComment(owner, name, params("id")).map { comment =>
+          if (isEditableContent(owner, name, comment.commentedUserName)) {
+            updateComment(comment.issueId, comment.commentId, form.content)
+            redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
          } else Unauthorized()
        } getOrElse NotFound()
    }
  })

  ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
-    context.withLoginAccount { loginAccount =>
-      getComment(repository.owner, repository.name, params("id")).map { comment =>
-        if (isDeletableComment(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
-          Ok(deleteComment(repository.owner, repository.name, comment.issueId, comment.commentId))
-        } else Unauthorized()
-      } getOrElse NotFound()
+    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))
+          } else Unauthorized()
+        } getOrElse NotFound()
    }
  })

  ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
-    context.withLoginAccount {
-      loginAccount =>
-        getIssue(repository.owner, repository.name, params("id")) map {
-          x =>
-            if (isEditableContent(x.userName, x.repositoryName, x.openedUserName, loginAccount)) {
-              params.get("dataType") collect {
-                case t if t == "html" => html.editissue(x.content, x.issueId, repository)
-              } getOrElse {
-                contentType = formats("json")
-                org.json4s.jackson.Serialization.write(
-                  Map(
-                    "title" -> x.title,
-                    "content" -> Markdown.toHtml(
-                      markdown = x.content getOrElse "No description given.",
-                      repository = repository,
-                      branch = repository.repository.defaultBranch,
-                      enableWikiLink = false,
-                      enableRefsLink = true,
-                      enableAnchor = true,
-                      enableLineBreaks = true,
-                      enableTaskList = true,
-                      hasWritePermission = true
-                    )
-                  )
+    getIssue(repository.owner, repository.name, params("id")) map {
+      x =>
+        if (isEditableContent(x.userName, x.repositoryName, x.openedUserName)) {
+          params.get("dataType") collect {
+            case t if t == "html" => html.editissue(x.content, x.issueId, repository)
+          } getOrElse {
+            contentType = formats("json")
+            org.json4s.jackson.Serialization.write(
+              Map(
+                "title" -> x.title,
+                "content" -> Markdown.toHtml(
+                  markdown = x.content getOrElse "No description given.",
+                  repository = repository,
+                  branch = repository.repository.defaultBranch,
+                  enableWikiLink = false,
+                  enableRefsLink = true,
+                  enableAnchor = true,
+                  enableLineBreaks = true,
+                  enableTaskList = true,
+                  hasWritePermission = true
                )
-              }
-            } else Unauthorized()
-        } getOrElse NotFound()
-    }
+              )
+            )
+          }
+        } else Unauthorized()
+    } getOrElse NotFound()
  })

  ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
-    context.withLoginAccount {
-      loginAccount =>
-        getComment(repository.owner, repository.name, params("id")) map {
-          x =>
-            if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName, loginAccount)) {
-              params.get("dataType") collect {
-                case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
-              } getOrElse {
-                contentType = formats("json")
-                org.json4s.jackson.Serialization.write(
-                  Map(
-                    "content" -> view.Markdown.toHtml(
-                      markdown = x.content,
-                      repository = repository,
-                      branch = repository.repository.defaultBranch,
-                      enableWikiLink = false,
-                      enableRefsLink = true,
-                      enableAnchor = true,
-                      enableLineBreaks = true,
-                      enableTaskList = true,
-                      hasWritePermission = true
-                    )
-                  )
+    getComment(repository.owner, repository.name, params("id")) map {
+      x =>
+        if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName)) {
+          params.get("dataType") collect {
+            case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+          } getOrElse {
+            contentType = formats("json")
+            org.json4s.jackson.Serialization.write(
+              Map(
+                "content" -> view.Markdown.toHtml(
+                  markdown = x.content,
+                  repository = repository,
+                  branch = repository.repository.defaultBranch,
+                  enableWikiLink = false,
+                  enableRefsLink = true,
+                  enableAnchor = true,
+                  enableLineBreaks = true,
+                  enableTaskList = true,
+                  hasWritePermission = true
                )
-              }
-            } else Unauthorized()
-        } getOrElse NotFound()
-    }
+              )
+            )
+          }
+        } else Unauthorized()
+    } getOrElse NotFound()
  })

  ajaxPost("/:owner/:repository/issues/new/label")(writableUsersOnly { repository =>
@@ -346,27 +308,28 @@ trait IssuesControllerBase extends ControllerBase {
  })

  ajaxPost("/:owner/:repository/issues/:id/label/new")(writableUsersOnly { repository =>
-    val issueId = params("id").toInt
-    registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
-    html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    defining(params("id").toInt) { issueId =>
+      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+      html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
  })

  ajaxPost("/:owner/:repository/issues/:id/label/delete")(writableUsersOnly { repository =>
-    val issueId = params("id").toInt
-    deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
-    html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    defining(params("id").toInt) { issueId =>
+      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+      html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
  })

-  ajaxPost("/:owner/:repository/issues/:id/assignee/new")(writableUsersOnly { repository =>
-    val issueId = params("id").toInt
-    registerIssueAssignee(repository.owner, repository.name, issueId, params("assigneeUserName"), true)
-    Ok()
-  })
-
-  ajaxPost("/:owner/:repository/issues/:id/assignee/delete")(writableUsersOnly { repository =>
-    val issueId = params("id").toInt
-    deleteIssueAssignee(repository.owner, repository.name, issueId, params("assigneeUserName"), true)
-    Ok()
+  ajaxPost("/:owner/:repository/issues/:id/assign")(writableUsersOnly { repository =>
+    updateAssignedUserName(
+      repository.owner,
+      repository.name,
+      params("id").toInt,
+      assignedUserName("assignedUserName"),
+      true
+    )
+    Ok("updated")
  })

  ajaxPost("/:owner/:repository/issues/:id/milestone")(writableUsersOnly { repository =>
@@ -387,57 +350,24 @@ trait IssuesControllerBase extends ControllerBase {
    Ok("updated")
  })

-  ajaxPost("/:owner/:repository/issues/customfield_validation/:fieldId")(writableUsersOnly { repository =>
-    val fieldId = params("fieldId").toInt
-    val value = params("value")
-    getCustomField(repository.owner, repository.name, fieldId)
-      .flatMap { field =>
-        CustomFieldBehavior.validate(field, value, messages).map { error =>
-          Ok(error)
-        }
-      }
-      .getOrElse(Ok())
-  })
-
-  ajaxPost("/:owner/:repository/issues/:id/customfield/:fieldId")(writableUsersOnly { repository =>
-    val issueId = params("id").toInt
-    val fieldId = params("fieldId").toInt
-    val value = params("value")
-
-    for {
-      _ <- getIssue(repository.owner, repository.name, issueId.toString)
-      field <- getCustomField(repository.owner, repository.name, fieldId)
-    } {
-      CustomFieldBehavior.validate(field, value, messages) match {
-        case None    => insertOrUpdateCustomFieldValue(field, repository.owner, repository.name, issueId, value)
-        case Some(_) => halt(400)
-      }
-    }
-    Ok(value)
-  })
-
  post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
-    val action = params.get("value")
-    action match {
-      case Some("open") =>
-        executeBatch(repository) { issueId =>
-          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-            handleComment(issue, None, repository, Some("reopen"))
-          }
+    defining(params.get("value")) {
+      action =>
+        action match {
+          case Some("open") =>
+            executeBatch(repository) { issueId =>
+              getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                handleComment(issue, None, repository, Some("reopen"))
+              }
+            }
+          case Some("close") =>
+            executeBatch(repository) { issueId =>
+              getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+                handleComment(issue, None, repository, Some("close"))
+              }
+            }
+          case _ => BadRequest()
        }
-        if (params("uri").nonEmpty) {
-          redirect(params("uri"))
-        }
-      case Some("close") =>
-        executeBatch(repository) { issueId =>
-          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-            handleComment(issue, None, repository, Some("close"))
-          }
-        }
-        if (params("uri").nonEmpty) {
-          redirect(params("uri"))
-        }
-      case _ => BadRequest()
    }
  })

@@ -446,41 +376,32 @@ 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()
  })

  post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
-    val value = assignedUserName("value")
-    executeBatch(repository) {
-      //updateAssignedUserName(repository.owner, repository.name, _, value, true)
-      value match {
-        case Some(assignedUserName) =>
-          registerIssueAssignee(repository.owner, repository.name, _, assignedUserName, true)
-        case None =>
-          deleteAllIssueAssignees(repository.owner, repository.name, _, true)
+    defining(assignedUserName("value")) { value =>
+      executeBatch(repository) {
+        updateAssignedUserName(repository.owner, repository.name, _, value, true)
      }
    }
-    if (params("uri").nonEmpty) {
-      redirect(params("uri"))
-    }
  })

  post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
-    val value = milestoneId("value")
-    executeBatch(repository) {
-      updateMilestoneId(repository.owner, repository.name, _, value, true)
+    defining(milestoneId("value")) { value =>
+      executeBatch(repository) {
+        updateMilestoneId(repository.owner, repository.name, _, value, true)
+      }
    }
  })

  post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
-    val value = priorityId("value")
-    executeBatch(repository) {
-      updatePriorityId(repository.owner, repository.name, _, value, true)
+    defining(priorityId("value")) { value =>
+      executeBatch(repository) {
+        updatePriorityId(repository.owner, repository.name, _, value, true)
+      }
    }
  })

@@ -495,29 +416,6 @@ 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)
@@ -527,56 +425,41 @@ 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 _        =>
    }
  }

  private def searchIssues(repository: RepositoryService.RepositoryInfo) = {
-    val page = IssueSearchCondition.page(request)
-    // retrieve search condition
-    val condition = IssueSearchCondition(request)
-    // search issues
-    val issues =
-      searchIssue(
-        condition,
-        IssueSearchOption.Issues,
-        (page - 1) * IssueLimit,
-        IssueLimit,
-        repository.owner -> repository.name
-      )
+    defining(repository.owner, repository.name) {
+      case (owner, repoName) =>
+        val page = IssueSearchCondition.page(request)

-    html.list(
-      "issues",
-      issues.map(issue => (issue, None)),
-      page,
-      getAssignableUserNames(repository.owner, repository.name),
-      getMilestones(repository.owner, repository.name),
-      getPriorities(repository.owner, repository.name),
-      getLabels(repository.owner, repository.name),
-      countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, repository.owner -> repository.name),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, repository.owner -> repository.name),
-      condition,
-      repository,
-      isIssueEditable(repository),
-      isIssueManageable(repository)
-    )
+        // retrieve search condition
+        val condition = IssueSearchCondition(request)
+
+        html.list(
+          "issues",
+          searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
+          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),
+          condition,
+          repository,
+          isIssueEditable(repository),
+          isIssueManageable(repository)
+        )
+    }
  }

  /**
   * Tests whether an issue or a comment is editable by a logged-in user.
   */
-  private def isEditableContent(owner: String, repository: String, author: String, loginAccount: Account)(
+  private def isEditableContent(owner: String, repository: String, author: String)(
    implicit context: Context
  ): Boolean = {
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == loginAccount.userName
-  }
-
-  /**
-   * Tests whether an issue comment is deletable by a logged-in user.
-   */
-  private def isDeletableComment(owner: String, repository: String, author: String, loginAccount: Account)(
-    implicit context: Context
-  ): Boolean = {
-    hasOwnerRole(owner, repository, context.loginAccount) || author == loginAccount.userName
+    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
  }
 }
--- a/src/main/scala/gitbucket/core/controller/LabelsController.scala
+++ b/src/main/scala/gitbucket/core/controller/LabelsController.scala
@@ -44,7 +44,7 @@ trait LabelsControllerBase extends ControllerBase {
  get("/:owner/:repository/issues/labels")(referrersOnly { repository =>
    html.list(
      getLabels(repository.owner, repository.name),
-      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
+      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
      repository,
      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
    )
@@ -59,7 +59,7 @@ trait LabelsControllerBase extends ControllerBase {
    html.label(
      getLabel(repository.owner, repository.name, labelId).get,
      // TODO futility
-      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
+      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
      repository,
      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
    )
@@ -76,7 +76,7 @@ trait LabelsControllerBase extends ControllerBase {
    html.label(
      getLabel(repository.owner, repository.name, params("labelId").toInt).get,
      // TODO futility
-      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition()),
+      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
      repository,
      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
    )
--- a/src/main/scala/gitbucket/core/controller/MilestonesController.scala
+++ b/src/main/scala/gitbucket/core/controller/MilestonesController.scala
@@ -1,18 +1,10 @@
 package gitbucket.core.controller

 import gitbucket.core.issues.milestones.html
-import gitbucket.core.service.IssuesService.{IssueLimit, IssueSearchCondition}
-import gitbucket.core.service.{
-  AccountService,
-  CommitStatusService,
-  IssueSearchOption,
-  MilestonesService,
-  RepositoryService
-}
+import gitbucket.core.service.{AccountService, 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

@@ -21,16 +13,11 @@ class MilestonesController
    with MilestonesService
    with RepositoryService
    with AccountService
-    with CommitStatusService
    with ReferrerAuthenticator
    with WritableUsersAuthenticator

 trait MilestonesControllerBase extends ControllerBase {
-  self: MilestonesService
-    with RepositoryService
-    with CommitStatusService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
+  self: MilestonesService with RepositoryService with ReferrerAuthenticator with WritableUsersAuthenticator =>

  case class MilestoneForm(title: String, description: Option[String], dueDate: Option[java.util.Date])

@@ -49,41 +36,6 @@ 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, _)
  })
--- a/src/main/scala/gitbucket/core/controller/PreProcessController.scala
+++ b/src/main/scala/gitbucket/core/controller/PreProcessController.scala
@@ -29,10 +29,9 @@ trait PreProcessControllerBase extends ControllerBase {
   * If anonymous access is allowed, pass all requests.
   * But if it's not allowed, demands authentication except some paths.
   */
-  get(!context.settings.basicBehavior.allowAnonymousAccess, context.loginAccount.isEmpty) {
+  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
    if (!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
        !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs") &&
-        !context.currentPath.startsWith("/plugin-assets") &&
        !PluginRegistry().getAnonymousAccessiblePaths().exists { path =>
          context.currentPath.startsWith(path)
        }) {
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -1,6 +1,5 @@
 package gitbucket.core.controller

-import gitbucket.core.model.activity.DeleteBranchInfo
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.MergeService
@@ -8,6 +7,7 @@ import gitbucket.core.service.IssuesService._
 import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
@@ -25,7 +25,6 @@ class PullRequestsController
    with PullRequestService
    with MilestonesService
    with LabelsService
-    with CustomFieldsService
    with CommitsService
    with ActivityService
    with WebHookPullRequestService
@@ -37,7 +36,6 @@ class PullRequestsController
    with MergeService
    with ProtectedBranchService
    with PrioritiesService
-    with RequestCache

 trait PullRequestsControllerBase extends ControllerBase {
  self: RepositoryService
@@ -45,7 +43,6 @@ trait PullRequestsControllerBase extends ControllerBase {
    with IssuesService
    with MilestonesService
    with LabelsService
-    with CustomFieldsService
    with CommitsService
    with ActivityService
    with PullRequestService
@@ -59,7 +56,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    with PrioritiesService =>

  val pullRequestForm = mapping(
-    "title" -> trim(label("Title", text(required))),
+    "title" -> trim(label("Title", text(required, maxlength(100)))),
    "content" -> trim(label("Content", optional(text()))),
    "targetUserName" -> trim(text(required, maxlength(100))),
    "targetBranch" -> trim(text(required, maxlength(100))),
@@ -92,7 +89,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    commitIdFrom: String,
    commitIdTo: String,
    isDraft: Boolean,
-    assignedUserNames: Option[String],
+    assignedUserName: Option[String],
    milestoneId: Option[Int],
    priorityId: Option[Int],
    labelNames: Option[String]
@@ -112,31 +109,24 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/pull/:id")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        getPullRequest(repository.owner, repository.name, issueId) map {
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
          case (issue, pullreq) =>
            val (commits, diffs) =
-              getRequestCompareInfo(
-                repository.owner,
-                repository.name,
-                pullreq.commitIdFrom,
-                repository.owner,
-                repository.name,
-                pullreq.commitIdTo
-              )
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)

            html.conversation(
              issue,
              pullreq,
              commits.flatten,
-              getPullRequestComments(repository.owner, repository.name, issue.issueId, commits.flatten),
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
              diffs.size,
-              getIssueLabels(repository.owner, repository.name, issueId),
-              getIssueAssignees(repository.owner, repository.name, issueId),
-              getAssignableUserNames(repository.owner, repository.name),
-              getMilestonesWithIssueCount(repository.owner, repository.name),
-              getPriorities(repository.owner, repository.name),
-              getLabels(repository.owner, repository.name),
-              getCustomFieldsWithValue(repository.owner, repository.name, issueId).filter(_._1.enableForPullRequests),
+              getIssueLabels(owner, name, issueId),
+              getAssignableUserNames(owner, name),
+              getMilestonesWithIssueCount(owner, name),
+              getPriorities(owner, name),
+              getLabels(owner, name),
              isEditable(repository),
              isManageable(repository),
              hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
@@ -170,29 +160,18 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/pull/:id/commits")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        getPullRequest(repository.owner, repository.name, issueId) map {
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
          case (issue, pullreq) =>
            val (commits, diffs) =
-              getRequestCompareInfo(
-                repository.owner,
-                repository.name,
-                pullreq.commitIdFrom,
-                repository.owner,
-                repository.name,
-                pullreq.commitIdTo
-              )
-
-            val commitsWithStatus = commits.map { day =>
-              day.map { commit =>
-                (commit, getCommitStatusWithSummary(repository.owner, repository.name, commit.id))
-              }
-            }
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)

            html.commits(
              issue,
              pullreq,
-              commitsWithStatus,
-              getPullRequestComments(repository.owner, repository.name, issue.issueId, commits.flatten),
+              commits,
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
              diffs.size,
              isManageable(repository),
              repository
@@ -204,24 +183,19 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/pull/:id/files")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        getPullRequest(repository.owner, repository.name, issueId) map {
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
          case (issue, pullreq) =>
            val (commits, diffs) =
-              getRequestCompareInfo(
-                repository.owner,
-                repository.name,
-                pullreq.commitIdFrom,
-                repository.owner,
-                repository.name,
-                pullreq.commitIdTo
-              )
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)

            html.files(
              issue,
              pullreq,
              diffs,
              commits.flatten,
-              getPullRequestComments(repository.owner, repository.name, issue.issueId, commits.flatten),
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
              isManageable(repository),
              repository
            )
@@ -232,35 +206,39 @@ trait PullRequestsControllerBase extends ControllerBase {
  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        getPullRequest(repository.owner, repository.name, issueId) map {
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
          case (issue, pullreq) =>
-            val conflictMessage = LockUtil.lock(s"${repository.owner}/${repository.name}") {
-              checkConflict(repository.owner, repository.name, pullreq.branch, issueId)
+            val conflictMessage = LockUtil.lock(s"${owner}/${name}") {
+              checkConflict(owner, name, pullreq.branch, issueId)
            }
-            val hasMergePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-            val branchProtection = getProtectedBranchInfo(repository.owner, repository.name, pullreq.branch)
+            val hasMergePermission = hasDeveloperRole(owner, name, context.loginAccount)
+            val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
            val mergeStatus = PullRequestService.MergeStatus(
              conflictMessage = conflictMessage,
-              commitStatuses = getCommitStatuses(repository.owner, repository.name, pullreq.commitIdTo),
+              commitStatues = getCommitStatues(owner, name, pullreq.commitIdTo),
              branchProtection = branchProtection,
-              branchIsOutOfDate = JGitUtil.getShaByRef(repository.owner, repository.name, pullreq.branch) != Some(
-                pullreq.commitIdFrom
-              ),
-              needStatusCheck = context.loginAccount.forall { u =>
-                branchProtection.needStatusCheck(u.userName)
-              },
+              branchIsOutOfDate = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
+              needStatusCheck = context.loginAccount
+                .map { u =>
+                  branchProtection.needStatusCheck(u.userName)
+                }
+                .getOrElse(true),
              hasUpdatePermission = hasDeveloperRole(
                pullreq.requestUserName,
                pullreq.requestRepositoryName,
                context.loginAccount
              ) &&
-                context.loginAccount.exists { u =>
-                  !getProtectedBranchInfo(
-                    pullreq.requestUserName,
-                    pullreq.requestRepositoryName,
-                    pullreq.requestBranch
-                  ).needStatusCheck(u.userName)
-                },
+                context.loginAccount
+                  .map { u =>
+                    !getProtectedBranchInfo(
+                      pullreq.requestUserName,
+                      pullreq.requestRepositoryName,
+                      pullreq.requestBranch
+                    ).needStatusCheck(u.userName)
+                  }
+                  .getOrElse(false),
              hasMergePermission = hasMergePermission,
              commitIdTo = pullreq.commitIdTo
            )
@@ -293,8 +271,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          val userName = context.loginAccount.get.userName
          Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
            git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call()
-            val deleteBranchInfo = DeleteBranchInfo(repository.owner, repository.name, userName, pullreq.requestBranch)
-            recordActivity(deleteBranchInfo)
+            recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch)
          }
          createComment(
            baseRepository.owner,
@@ -377,22 +354,23 @@ trait PullRequestsControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/pull/:id/merge", mergeForm)(writableUsersOnly { (form, repository) =>
-    context.withLoginAccount { loginAccount =>
-      params("id").toIntOpt.flatMap { issueId =>
-        mergePullRequest(
-          repository,
-          issueId,
-          loginAccount,
-          form.message,
-          form.strategy,
-          form.isDraft,
-          context.settings
-        ) match {
-          case Right(objectId) => redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-          case Left(message)   => Some(BadRequest(message))
-        }
-      } getOrElse NotFound()
-    }
+    params("id").toIntOpt.flatMap { issueId =>
+      val owner = repository.owner
+      val name = repository.name
+
+      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(message))
+      }
+    } getOrElse NotFound()
  })

  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
@@ -494,7 +472,8 @@ trait PullRequestsControllerBase extends ControllerBase {
              (repository.userName, repository.repositoryName, repository.defaultBranch)
            },
            commits.flatten
-              .flatMap(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false))
+              .map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false))
+              .flatten
              .toList,
            originId,
            forkedId,
@@ -509,8 +488,7 @@ trait PullRequestsControllerBase extends ControllerBase {
            getMilestones(originRepository.owner, originRepository.name),
            getPriorities(originRepository.owner, originRepository.name),
            getDefaultPriority(originRepository.owner, originRepository.name),
-            getLabels(originRepository.owner, originRepository.name),
-            getCustomFields(originRepository.owner, originRepository.name).filter(_.enableForPullRequests)
+            getLabels(originRepository.owner, originRepository.name)
          )
        }
        case (oldId, newId) =>
@@ -562,16 +540,18 @@ trait PullRequestsControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/pulls/new", pullRequestForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
        val manageable = isManageable(repository)
+        val loginUserName = context.loginAccount.get.userName

        val issueId = insertIssue(
          owner = repository.owner,
          repository = repository.name,
-          loginUser = loginAccount.userName,
+          loginUser = loginUserName,
          title = form.title,
          content = form.content,
+          assignedUserName = if (manageable) form.assignedUserName else None,
          milestoneId = if (manageable) form.milestoneId else None,
          priorityId = if (manageable) form.priorityId else None,
          isPullRequest = true
@@ -587,20 +567,14 @@ trait PullRequestsControllerBase extends ControllerBase {
          commitIdFrom = form.commitIdFrom,
          commitIdTo = form.commitIdTo,
          isDraft = form.isDraft,
-          loginAccount = loginAccount,
+          loginAccount = context.loginAccount.get,
          settings = context.settings
        )

+        // insert labels
        if (manageable) {
-          // insert assignees
-          form.assignedUserNames.foreach { value =>
-            value.split(",").foreach { userName =>
-              registerIssueAssignee(repository.owner, repository.name, issueId, userName)
-            }
-          }
-          // insert labels
          form.labelNames.foreach { value =>
-            val labels = getLabels(repository.owner, repository.name)
+            val labels = getLabels(owner, name)
            value.split(",").foreach { labelName =>
              labels.find(_.labelName == labelName).map { label =>
                registerIssueLabel(repository.owner, repository.name, issueId, label.labelId)
@@ -609,7 +583,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          }
        }

-        redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        redirect(s"/${owner}/${name}/pull/${issueId}")
    }
  })

@@ -656,41 +630,30 @@ trait PullRequestsControllerBase extends ControllerBase {
    html.proposals(proposedBranches, targetRepository, repository)
  })

-  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) = {
-    val page = IssueSearchCondition.page(request)
-    // retrieve search condition
-    val condition = IssueSearchCondition(request)
-    // search issues
-    val issues = searchIssue(
-      condition,
-      IssueSearchOption.PullRequests,
-      (page - 1) * PullRequestLimit,
-      PullRequestLimit,
-      repository.owner -> repository.name
-    )
-    // commit status
-    val status = issues.map { issue =>
-      issue.commitId.flatMap { commitId =>
-        getCommitStatusWithSummary(repository.owner, repository.name, commitId)
-      }
-    }
+  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
+    defining(repository.owner, repository.name) {
+      case (owner, repoName) =>
+        val page = IssueSearchCondition.page(request)

-    gitbucket.core.issues.html.list(
-      "pulls",
-      issues.zip(status),
-      page,
-      getAssignableUserNames(repository.owner, repository.name),
-      getMilestones(repository.owner, repository.name),
-      getPriorities(repository.owner, repository.name),
-      getLabels(repository.owner, repository.name),
-      countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, repository.owner -> repository.name),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, repository.owner -> repository.name),
-      condition,
-      repository,
-      isEditable(repository),
-      isManageable(repository)
-    )
-  }
+        // retrieve search condition
+        val condition = IssueSearchCondition(request)
+
+        gitbucket.core.issues.html.list(
+          "pulls",
+          searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
+          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),
+          condition,
+          repository,
+          isEditable(repository),
+          isManageable(repository)
+        )
+    }

  /**
   * Tests whether an logged-in user can manage pull requests.
--- a/src/main/scala/gitbucket/core/controller/ReleasesController.scala
+++ b/src/main/scala/gitbucket/core/controller/ReleasesController.scala
@@ -2,15 +2,7 @@ package gitbucket.core.controller

 import java.io.File

-import gitbucket.core.model.activity.ReleaseInfo
-import gitbucket.core.service.{
-  AccountService,
-  ActivityService,
-  PaginationHelper,
-  ReleaseService,
-  RepositoryService,
-  RequestCache
-}
+import gitbucket.core.service.{AccountService, ActivityService, PaginationHelper, ReleaseService, RepositoryService}
 import gitbucket.core.util._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
@@ -30,7 +22,6 @@ class ReleaseController
    with ReadableUsersAuthenticator
    with ReferrerAuthenticator
    with WritableUsersAuthenticator
-    with RequestCache

 trait ReleaseControllerBase extends ControllerBase {
  self: RepositoryService
@@ -63,8 +54,8 @@ trait ReleaseControllerBase extends ControllerBase {
    )
  })

-  get("/:owner/:repository/releases/*")(referrersOnly { repository =>
-    val tagName = multiParams("splat").head
+  get("/:owner/:repository/releases/:tag")(referrersOnly { repository =>
+    val tagName = params("tag")
    getRelease(repository.owner, repository.name, tagName)
      .map { release =>
        html.release(
@@ -77,8 +68,8 @@ trait ReleaseControllerBase extends ControllerBase {
      .getOrElse(NotFound())
  })

-  get("/:owner/:repository/releases/*/assets/:fileId")(referrersOnly { repository =>
-    val tagName = multiParams("splat").head
+  get("/:owner/:repository/releases/:tag/assets/:fileId")(referrersOnly { repository =>
+    val tagName = params("tag")
    val fileId = params("fileId")
    (for {
      _ <- repository.tags.find(_.name == tagName)
@@ -93,8 +84,8 @@ trait ReleaseControllerBase extends ControllerBase {
    }).getOrElse(NotFound())
  })

-  get("/:owner/:repository/releases/*/create")(writableUsersOnly { repository =>
-    val tagName = multiParams("splat").head
+  get("/:owner/:repository/releases/:tag/create")(writableUsersOnly { repository =>
+    val tagName = params("tag")
    val previousTags = repository.tags.takeWhile(_.name != tagName).reverse

    repository.tags
@@ -105,40 +96,37 @@ trait ReleaseControllerBase extends ControllerBase {
      .getOrElse(NotFound())
  })

-  post("/:owner/:repository/releases/*/create", releaseForm)(writableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        val tagName = multiParams("splat").head
+  post("/:owner/:repository/releases/:tag/create", releaseForm)(writableUsersOnly { (form, repository) =>
+    val tagName = params("tag")
+    val loginAccount = context.loginAccount.get

-        // Insert into RELEASE
-        createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
+    // Insert into RELEASE
+    createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)

-        // Insert into RELEASE_ASSET
-        val files = params.toMap.collect {
-          case (name, value) if name.startsWith("file:") =>
-            val Array(_, fileId) = name.split(":")
-            (fileId, value)
-        }
-        files.foreach {
-          case (fileId, fileName) =>
-            val size =
-              new File(
-                getReleaseFilesDir(repository.owner, repository.name),
-                FileUtil.checkFilename(tagName + "/" + fileId)
-              ).length
-            createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
-        }
-
-        val releaseInfo = ReleaseInfo(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
-        recordActivity(releaseInfo)
-
-        redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
+    // Insert into RELEASE_ASSET
+    val files = params.toMap.collect {
+      case (name, value) if name.startsWith("file:") =>
+        val Array(_, fileId) = name.split(":")
+        (fileId, value)
    }
+    files.foreach {
+      case (fileId, fileName) =>
+        val size =
+          new File(
+            getReleaseFilesDir(repository.owner, repository.name),
+            FileUtil.checkFilename(tagName + "/" + fileId)
+          ).length
+        createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+    }
+
+    recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
+
+    redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
  })

  get("/:owner/:repository/changelog/*...*")(writableUsersOnly { repository =>
    val Seq(previousTag, currentTag) = multiParams("splat")
-    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.commitId }.getOrElse("")
+    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")

    val commitLog = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
      val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
@@ -152,8 +140,8 @@ trait ReleaseControllerBase extends ControllerBase {
    commitLog
  })

-  get("/:owner/:repository/releases/*/edit")(writableUsersOnly { repository =>
-    val tagName = multiParams("splat").head
+  get("/:owner/:repository/releases/:tag/edit")(writableUsersOnly { repository =>
+    val tagName = params("tag")
    val previousTags = repository.tags.takeWhile(_.name != tagName).reverse

    (for {
@@ -170,54 +158,52 @@ trait ReleaseControllerBase extends ControllerBase {
    }).getOrElse(NotFound())
  })

-  post("/:owner/:repository/releases/*/edit", releaseForm)(writableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        val tagName = multiParams("splat").head
+  post("/:owner/:repository/releases/:tag/edit", releaseForm)(writableUsersOnly {
+    (form, repository) =>
+      val tagName = params("tag")
+      val loginAccount = context.loginAccount.get

-        getRelease(repository.owner, repository.name, tagName)
-          .map {
-            release =>
-              // Update RELEASE
-              updateRelease(repository.owner, repository.name, tagName, form.name, form.content)
+      getRelease(repository.owner, repository.name, tagName)
+        .map { release =>
+          // Update RELEASE
+          updateRelease(repository.owner, repository.name, tagName, form.name, form.content)

-              // Delete and Insert RELEASE_ASSET
-              val assets = getReleaseAssets(repository.owner, repository.name, tagName)
-              deleteReleaseAssets(repository.owner, repository.name, tagName)
+          // Delete and Insert RELEASE_ASSET
+          val assets = getReleaseAssets(repository.owner, repository.name, tagName)
+          deleteReleaseAssets(repository.owner, repository.name, tagName)

-              val files = params.toMap.collect {
-                case (name, value) if name.startsWith("file:") =>
-                  val Array(_, fileId) = name.split(":")
-                  (fileId, value)
-              }
-              files.foreach {
-                case (fileId, fileName) =>
-                  val size =
-                    new File(
-                      getReleaseFilesDir(repository.owner, repository.name),
-                      FileUtil.checkFilename(tagName + "/" + fileId)
-                    ).length
-                  createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
-              }
-
-              assets.foreach { asset =>
-                if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
-                  val file = new File(
-                    getReleaseFilesDir(repository.owner, repository.name),
-                    FileUtil.checkFilename(release.tag + "/" + asset.fileName)
-                  )
-                  FileUtils.forceDelete(file)
-                }
-              }
-
-              redirect(s"/${release.userName}/${release.repositoryName}/releases/${tagName}")
+          val files = params.toMap.collect {
+            case (name, value) if name.startsWith("file:") =>
+              val Array(_, fileId) = name.split(":")
+              (fileId, value)
          }
-          .getOrElse(NotFound())
-    }
+          files.foreach {
+            case (fileId, fileName) =>
+              val size =
+                new File(
+                  getReleaseFilesDir(repository.owner, repository.name),
+                  FileUtil.checkFilename(tagName + "/" + fileId)
+                ).length
+              createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+          }
+
+          assets.foreach { asset =>
+            if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
+              val file = new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(release.tag + "/" + asset.fileName)
+              )
+              FileUtils.forceDelete(file)
+            }
+          }
+
+          redirect(s"/${release.userName}/${release.repositoryName}/releases/${tagName}")
+        }
+        .getOrElse(NotFound())
  })

-  post("/:owner/:repository/releases/*/delete")(writableUsersOnly { repository =>
-    val tagName = multiParams("splat").head
+  post("/:owner/:repository/releases/:tag/delete")(writableUsersOnly { repository =>
+    val tagName = params("tag")
    getRelease(repository.owner, repository.name, tagName).foreach { release =>
      FileUtils.deleteDirectory(
        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(release.tag))
@@ -228,6 +214,7 @@ trait ReleaseControllerBase extends ControllerBase {
  })

  private def fetchReleases(repository: RepositoryService.RepositoryInfo, page: Int) = {
+
    import gitbucket.core.service.ReleaseService._

    val (offset, limit) = ((page - 1) * ReleaseLimit, ReleaseLimit)
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -1,7 +1,8 @@
 package gitbucket.core.controller

-import java.time.{LocalDateTime, ZoneOffset}
+import java.time.{LocalDateTime, ZoneId, ZoneOffset}
 import java.util.Date
+
 import gitbucket.core.settings.html
 import gitbucket.core.model.{RepositoryWebHook, WebHook}
 import gitbucket.core.service._
@@ -12,7 +13,6 @@ 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
@@ -20,7 +20,7 @@ import org.eclipse.jgit.lib.Constants
 import org.eclipse.jgit.lib.ObjectId

 import scala.util.Using
-import org.scalatra.{Forbidden, Ok}
+import org.scalatra.Forbidden

 class RepositorySettingsController
    extends RepositorySettingsControllerBase
@@ -30,11 +30,8 @@ class RepositorySettingsController
    with ProtectedBranchService
    with CommitStatusService
    with DeployKeyService
-    with CustomFieldsService
-    with ActivityService
    with OwnerAuthenticator
    with UsersAuthenticator
-    with RequestCache

 trait RepositorySettingsControllerBase extends ControllerBase {
  self: RepositoryService
@@ -43,8 +40,6 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    with ProtectedBranchService
    with CommitStatusService
    with DeployKeyService
-    with CustomFieldsService
-    with ActivityService
    with OwnerAuthenticator
    with UsersAuthenticator =>

@@ -58,8 +53,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    externalWikiUrl: Option[String],
    allowFork: Boolean,
    mergeOptions: Seq[String],
-    defaultMergeOption: String,
-    safeMode: Boolean
+    defaultMergeOption: String
  )

  val optionsForm = mapping(
@@ -71,8 +65,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    "externalWikiUrl" -> trim(label("External Wiki URL", optional(text(maxlength(200))))),
    "allowFork" -> trim(label("Allow Forking", boolean())),
    "mergeOptions" -> mergeOptions,
-    "defaultMergeOption" -> trim(label("Default merge strategy", text(required))),
-    "safeMode" -> trim(label("XSS protection", boolean()))
+    "defaultMergeOption" -> trim(label("Default merge strategy", text(required)))
  )(OptionsForm.apply).verifying { form =>
    if (!form.mergeOptions.contains(form.defaultMergeOption)) {
      Seq("defaultMergeOption" -> s"This merge strategy isn't enabled.")
@@ -104,7 +97,9 @@ 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)
@@ -122,21 +117,6 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    "newOwner" -> trim(label("New owner", text(required, transferUser)))
  )(TransferOwnerShipForm.apply)

-  // for custom field
-  case class CustomFieldForm(
-    fieldName: String,
-    fieldType: String,
-    enableForIssues: Boolean,
-    enableForPullRequests: Boolean
-  )
-
-  val customFieldForm = mapping(
-    "fieldName" -> trim(label("Field name", text(required, maxlength(100)))),
-    "fieldType" -> trim(label("Field type", text(required))),
-    "enableForIssues" -> trim(label("Enable for issues", boolean(required))),
-    "enableForPullRequests" -> trim(label("Enable for pull requests", boolean(required))),
-  )(CustomFieldForm.apply)
-
  /**
   * Redirect to the Options page.
   */
@@ -168,8 +148,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      form.externalWikiUrl,
      form.allowFork,
      form.mergeOptions,
-      form.defaultMergeOption,
-      form.safeMode
+      form.defaultMergeOption
    )
    flash.update("info", "Repository settings has been updated.")
    redirect(s"/${repository.owner}/${repository.name}/settings/options")
@@ -197,15 +176,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  })

  /** Branch protection for branch */
-  get("/:owner/:repository/settings/branches/*")(ownerOnly { repository =>
+  get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository =>
    import gitbucket.core.api._
-    val branch = params("splat")
-
+    val branch = params("branch")
    if (!repository.branchList.contains(branch)) {
      redirect(s"/${repository.owner}/${repository.name}/settings/branches")
    } else {
      val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch))
-      val lastWeeks = getRecentStatusContexts(
+      val lastWeeks = getRecentStatuesContexts(
        repository.owner,
        repository.name,
        Date.from(LocalDateTime.now.minusWeeks(1).toInstant(ZoneOffset.UTC))
@@ -247,13 +225,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Display the web hook edit page.
   */
  get("/:owner/:repository/settings/hooks/new")(ownerOnly { repository =>
-    val webhook = RepositoryWebHook(
-      userName = repository.owner,
-      repositoryName = repository.name,
-      url = "",
-      ctype = WebHookContentType.FORM,
-      token = None
-    )
+    val webhook = RepositoryWebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
    html.edithook(webhook, Set(WebHook.Push), repository, true)
  })

@@ -279,10 +251,9 @@ 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.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
      git =>
@@ -296,13 +267,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
        val url = params("url")
        val token = Some(params("token"))
        val ctype = WebHookContentType.valueOf(params("ctype"))
-        val dummyWebHookInfo = RepositoryWebHook(
-          userName = repository.owner,
-          repositoryName = repository.name,
-          url = url,
-          ctype = ctype,
-          token = token
-        )
+        val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
        val dummyPayload = {
          val ownerAccount = getAccountByUserName(repository.owner).get
          val commits =
@@ -361,7 +326,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
                .map(
                  res =>
                    Map(
-                      "status" -> res.getStatusLine.getStatusCode,
+                      "status" -> res.getStatusLine(),
                      "body" -> EntityUtils.toString(res.getEntity()),
                      "headers" -> _headers(res.getAllHeaders())
                  )
@@ -404,62 +369,36 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Rename repository.
   */
  post("/:owner/:repository/settings/rename", renameForm)(ownerOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (context.settings.basicBehavior.repositoryOperation.rename || loginAccount.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,
-              loginAccount.userName,
-              repository.name
-            )
-            recordActivity(renameInfo)
-          }
-          redirect(s"/${repository.owner}/${form.repositoryName}")
-        } else Forbidden()
-    }
+    if (context.settings.repositoryOperation.rename || context.loginAccount.get.isAdmin) {
+      if (repository.name != form.repositoryName) {
+        renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+      }
+      redirect(s"/${repository.owner}/${form.repositoryName}")
+    } else Forbidden()
  })

  /**
   * Transfer repository ownership.
   */
  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (context.settings.basicBehavior.repositoryOperation.transfer || loginAccount.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,
-              loginAccount.userName,
-              repository.owner
-            )
-            recordActivity(renameInfo)
-          }
-          redirect(s"/${form.newOwner}/${repository.name}")
-        } else Forbidden()
-    }
+    if (context.settings.repositoryOperation.transfer || context.loginAccount.get.isAdmin) {
+      // Change repository owner
+      if (repository.owner != form.newOwner) {
+        renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+      }
+      redirect(s"/${form.newOwner}/${repository.name}")
+    } else Forbidden()
  })

  /**
   * Delete the repository.
   */
  post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
-    context.withLoginAccount { loginAccount =>
-      if (context.settings.basicBehavior.repositoryOperation.delete || loginAccount.isAdmin) {
-        // Delete the repository and related files
-        deleteRepository(repository.repository)
-        redirect(s"/${repository.owner}")
-      } else Forbidden()
-    }
+    if (context.settings.repositoryOperation.delete || context.loginAccount.get.isAdmin) {
+      // Delete the repository and related files
+      deleteRepository(repository.repository)
+      redirect(s"/${repository.owner}")
+    } else Forbidden()
  })

  /**
@@ -493,89 +432,35 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    redirect(s"/${repository.owner}/${repository.name}/settings/deploykey")
  })

-  /** Custom fields for issues and pull requests */
-  get("/:owner/:repository/settings/issues")(ownerOnly { repository =>
-    val customFields = getCustomFields(repository.owner, repository.name)
-    html.issues(customFields, repository)
-  })
-
-  /** New custom field form */
-  get("/:owner/:repository/settings/issues/fields/new")(ownerOnly { repository =>
-    html.issuesfieldform(None, repository)
-  })
-
-  /** Add custom field */
-  ajaxPost("/:owner/:repository/settings/issues/fields/new", customFieldForm)(ownerOnly { (form, repository) =>
-    val fieldId = createCustomField(
-      repository.owner,
-      repository.name,
-      form.fieldName,
-      form.fieldType,
-      form.enableForIssues,
-      form.enableForPullRequests
-    )
-    html.issuesfield(getCustomField(repository.owner, repository.name, fieldId).get)
-  })
-
-  /** Edit custom field form */
-  ajaxGet("/:owner/:repository/settings/issues/fields/:fieldId/edit")(ownerOnly { repository =>
-    getCustomField(repository.owner, repository.name, params("fieldId").toInt).map { customField =>
-      html.issuesfieldform(Some(customField), repository)
-    } getOrElse NotFound()
-  })
-
-  /** Update custom field */
-  ajaxPost("/:owner/:repository/settings/issues/fields/:fieldId/edit", customFieldForm)(ownerOnly {
-    (form, repository) =>
-      updateCustomField(
-        repository.owner,
-        repository.name,
-        params("fieldId").toInt,
-        form.fieldName,
-        form.fieldType,
-        form.enableForIssues,
-        form.enableForPullRequests
-      )
-      html.issuesfield(getCustomField(repository.owner, repository.name, params("fieldId").toInt).get)
-  })
-
-  /** Delete custom field */
-  ajaxPost("/:owner/:repository/settings/issues/fields/:fieldId/delete")(ownerOnly { repository =>
-    deleteCustomField(repository.owner, repository.name, params("fieldId").toInt)
-    Ok()
-  })
-
  /**
   * Provides duplication check for web hook url.
   */
-  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."
-          })
+  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 {
-          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
+          "URL had been registered already."
+        })
+      } else {
+        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.
@@ -595,77 +480,70 @@ 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
      }
    }
+  }

 }
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -1,6 +1,7 @@
 package gitbucket.core.controller

 import java.io.FileInputStream
+
 import gitbucket.core.admin.html
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService._
@@ -8,6 +9,7 @@ import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.ssh.SshServer
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.StringUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.{AdminAuthenticator, Mailer}
 import org.apache.commons.io.IOUtils
 import org.apache.commons.mail.EmailException
@@ -34,38 +36,24 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  private val form = mapping(
    "baseUrl" -> trim(label("Base URL", optional(text()))),
    "information" -> trim(label("Information", optional(text()))),
-    "basicBehavior" -> mapping(
-      "allowAccountRegistration" -> trim(label("Account registration", boolean())),
-      "allowResetPassword" -> trim(label("Reset password", boolean())),
-      "allowAnonymousAccess" -> trim(label("Anonymous access", 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())),
-      "limitVisibleRepositories" -> trim(label("limitVisibleRepositories", boolean())),
-    )(BasicBehavior.apply),
+    "allowAccountRegistration" -> trim(label("Account registration", boolean())),
+    "allowAnonymousAccess" -> trim(label("Anonymous access", 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())),
-      "bindAddress" -> mapping(
-        "host" -> trim(label("Bind SSH host", optional(text()))),
-        "port" -> trim(label("Bind SSH port", optional(number()))),
-      )(
-        (hostOption, portOption) =>
-          hostOption.map(h => SshAddress(h, portOption.getOrElse(DefaultSshPort), GenericSshUser))
-      ),
-      "publicAddress" -> mapping(
-        "host" -> trim(label("Public SSH host", optional(text()))),
-        "port" -> trim(label("Public SSH port", optional(number()))),
-      )(
-        (hostOption, portOption) =>
-          hostOption.map(h => SshAddress(h, portOption.getOrElse(PublicSshPort), GenericSshUser))
-      ),
+      "host" -> trim(label("SSH host", optional(text()))),
+      "port" -> trim(label("SSH port", optional(number())))
    )(Ssh.apply),
    "useSMTP" -> trim(label("SMTP", boolean())),
    "smtp" -> optionalIfNotChecked(
@@ -121,17 +109,14 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
      "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)
+    )(Upload.apply)
  )(SystemSettings.apply).verifying { settings =>
    Vector(
      if (settings.ssh.enabled && settings.baseUrl.isEmpty) {
        Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
      } else None,
-      if (settings.ssh.enabled && settings.ssh.bindAddress.isEmpty) {
-        Some("ssh.bindAddress.host" -> "SSH bind host is required if SSH access is enabled.")
+      if (settings.ssh.enabled && settings.ssh.sshHost.isEmpty) {
+        Some("sshHost" -> "SSH host is required if SSH access is enabled.")
      } else None
    ).flatten
  }
@@ -200,7 +185,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(40)))),
+    "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(
@@ -214,7 +199,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {

  val editUserForm = mapping(
    "userName" -> trim(label("Username", text(required, maxlength(100), identifier))),
-    "password" -> trim(label("Password", optional(text(maxlength(40))))),
+    "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(
@@ -322,13 +307,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  post("/admin/system", form)(adminOnly { form =>
    saveSystemSettings(form)

-    if (form.ssh.bindAddress != context.settings.sshBindAddress || form.ssh.publicAddress != context.settings.sshPublicAddress) {
+    if (form.sshAddress != context.settings.sshAddress) {
      SshServer.stop()
      for {
-        bindAddress <- form.ssh.bindAddress
-        publicAddress <- form.ssh.publicAddress.orElse(form.ssh.bindAddress)
+        sshAddress <- form.sshAddress
        baseUrl <- form.baseUrl
-      } SshServer.start(bindAddress, publicAddress, baseUrl)
+      } SshServer.start(sshAddress, baseUrl)
    }

    flash.update("info", "System settings has been updated.")
@@ -337,12 +321,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {

  post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
    try {
-      new Mailer(
-        context.settings.copy(
-          smtp = Some(form.smtp),
-          basicBehavior = context.settings.basicBehavior.copy(notification = true)
-        )
-      ).send(
+      new Mailer(context.settings.copy(smtp = Some(form.smtp), notification = true)).send(
        to = form.testAddress,
        subject = "Test message from GitBucket",
        textMsg = "This is a test message from GitBucket.",
@@ -381,8 +360,8 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  })

  get("/admin/users")(adminOnly {
-    val includeRemoved = params.get("includeRemoved").exists(_.toBoolean)
-    val includeGroups = params.get("includeGroups").exists(_.toBoolean)
+    val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
+    val includeGroups = params.get("includeGroups").map(_.toBoolean).getOrElse(false)
    val users = getAllUsers(includeRemoved, includeGroups)
    val members = users.collect {
      case account if (account.isGroupAccount) =>
@@ -482,28 +461,31 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  })

  get("/admin/users/:groupName/_editgroup")(adminOnly {
-    val groupName = params("groupName")
-    html.usergroup(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+    defining(params("groupName")) { groupName =>
+      html.usergroup(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+    }
  })

  post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    val groupName = params("groupName")
-    val members = form.members
-      .split(",")
-      .map {
-        _.split(":") match {
-          case Array(userName, isManager) => (userName, isManager.toBoolean)
+    defining(
+      params("groupName"),
+      form.members
+        .split(",")
+        .map {
+          _.split(":") match {
+            case Array(userName, isManager) => (userName, isManager.toBoolean)
+          }
        }
-      }
-      .toList
+        .toList
+    ) {
+      case (groupName, members) =>
+        getAccountByUserName(groupName, true).map {
+          account =>
+            updateGroup(groupName, form.description, form.url, form.isRemoved)

-    getAccountByUserName(groupName, true).map {
-      account =>
-        updateGroup(groupName, form.description, form.url, form.isRemoved)
-
-        if (form.isRemoved) {
-          // Remove from GROUP_MEMBER
-          updateGroupMembers(form.groupName, Nil)
+            if (form.isRemoved) {
+              // Remove from GROUP_MEMBER
+              updateGroupMembers(form.groupName, Nil)
 //          // Remove repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            deleteRepository(groupName, repositoryName)
@@ -511,9 +493,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
 //            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
 //          }
-        } else {
-          // Update GROUP_MEMBER
-          updateGroupMembers(form.groupName, members)
+            } else {
+              // Update GROUP_MEMBER
+              updateGroupMembers(form.groupName, members)
 //          // Update COLLABORATOR for group repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            removeCollaborators(form.groupName, repositoryName)
@@ -521,12 +503,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //              addCollaborator(form.groupName, repositoryName, userName)
 //            }
 //          }
-        }
+            }

-        updateImage(form.groupName, form.fileId, form.clearImage)
-        redirect("/admin/users")
+            updateImage(form.groupName, form.fileId, form.clearImage)
+            redirect("/admin/users")

-    } getOrElse NotFound()
+        } getOrElse NotFound()
+    }
  })

  get("/admin/data")(adminOnly {
@@ -574,11 +557,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  protected def disableByNotYourself(paramName: String): Constraint =
    new Constraint() {
      override def validate(name: String, value: String, messages: Messages): Option[String] = {
-        for {
-          userName <- params.get(paramName)
-          loginAccount <- context.loginAccount
-          if userName == loginAccount.userName && params.get("removed") == Some("true")
-        } yield "You can't disable your account yourself"
+        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
+        }
      }
    }

--- a/src/main/scala/gitbucket/core/controller/WikiController.scala
+++ b/src/main/scala/gitbucket/core/controller/WikiController.scala
@@ -1,7 +1,6 @@
 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,7 +13,6 @@ import gitbucket.core.util.Directory._
 import org.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
-
 import scala.util.Using

 class WikiController
@@ -26,7 +24,6 @@ class WikiController
    with WebHookService
    with ReadableUsersAuthenticator
    with ReferrerAuthenticator
-    with RequestCache

 trait WikiControllerBase extends ControllerBase {
  self: WikiService
@@ -136,38 +133,32 @@ trait WikiControllerBase extends ControllerBase {
  })

  get("/:owner/:repository/wiki/:page/_revert/:commitId")(readableUsersOnly { repository =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (isEditable(repository)) {
-          val pageName = StringUtil.urlDecode(params("page"))
-          val Array(from, to) = params("commitId").split("\\.\\.\\.")
+    if (isEditable(repository)) {
+      val pageName = StringUtil.urlDecode(params("page"))
+      val Array(from, to) = params("commitId").split("\\.\\.\\.")

-          if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, Some(pageName))) {
-            redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
-          } else {
-            flash.update("info", "This patch was not able to be reversed.")
-            redirect(
-              s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
-            )
-          }
-        } else Unauthorized()
-    }
+      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.update("info", "This patch was not able to be reversed.")
+        redirect(
+          s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
+        )
+      }
+    } else Unauthorized()
  })

  get("/:owner/:repository/wiki/_revert/:commitId")(readableUsersOnly { repository =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (isEditable(repository)) {
-          val Array(from, to) = params("commitId").split("\\.\\.\\.")
+    if (isEditable(repository)) {
+      val Array(from, to) = params("commitId").split("\\.\\.\\.")

-          if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, None)) {
-            redirect(s"/${repository.owner}/${repository.name}/wiki")
-          } else {
-            flash.update("info", "This patch was not able to be reversed.")
-            redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
-          }
-        } else Unauthorized()
-    }
+      if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)) {
+        redirect(s"/${repository.owner}/${repository.name}/wiki")
+      } else {
+        flash.update("info", "This patch was not able to be reversed.")
+        redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
+      }
+    } else Unauthorized()
  })

  get("/:owner/:repository/wiki/:page/_edit")(readableUsersOnly { repository =>
@@ -178,9 +169,9 @@ trait WikiControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/wiki/_edit", editForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (isEditable(repository)) {
+    if (isEditable(repository)) {
+      defining(context.loginAccount.get) {
+        loginAccount =>
          saveWikiPage(
            repository.owner,
            repository.name,
@@ -193,9 +184,13 @@ trait WikiControllerBase extends ControllerBase {
          ).foreach {
            commitId =>
              updateLastActivityDate(repository.owner, repository.name)
-              val wikiEditInfo =
-                EditWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
-              recordActivity(wikiEditInfo)
+              recordEditWikiPageActivity(
+                repository.owner,
+                repository.name,
+                loginAccount.userName,
+                form.pageName,
+                commitId
+              )
              callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
                getAccountByUserName(repository.owner).map { repositoryUser =>
                  WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
@@ -207,8 +202,8 @@ trait WikiControllerBase extends ControllerBase {
          } else {
            redirect(s"/${repository.owner}/${repository.name}/wiki")
          }
-        } else Unauthorized()
-    }
+      }
+    } else Unauthorized()
  })

  get("/:owner/:repository/wiki/_new")(readableUsersOnly { repository =>
@@ -218,9 +213,9 @@ trait WikiControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (isEditable(repository)) {
+    if (isEditable(repository)) {
+      defining(context.loginAccount.get) {
+        loginAccount =>
          saveWikiPage(
            repository.owner,
            repository.name,
@@ -233,9 +228,7 @@ trait WikiControllerBase extends ControllerBase {
          ).foreach {
            commitId =>
              updateLastActivityDate(repository.owner, repository.name)
-              val createWikiPageInfo =
-                CreateWikiPageInfo(repository.owner, repository.name, loginAccount.userName, form.pageName)
-              recordActivity(createWikiPageInfo)
+              recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
              callWebHookOf(repository.owner, repository.name, WebHook.Gollum, context.settings) {
                getAccountByUserName(repository.owner).map { repositoryUser =>
                  WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
@@ -248,35 +241,28 @@ trait WikiControllerBase extends ControllerBase {
          } else {
            redirect(s"/${repository.owner}/${repository.name}/wiki")
          }
-        } else Unauthorized()
-    }
+      }
+    } else Unauthorized()
  })

  get("/:owner/:repository/wiki/:page/_delete")(readableUsersOnly { repository =>
-    context.withLoginAccount {
-      loginAccount =>
-        if (isEditable(repository)) {
-          val pageName = StringUtil.urlDecode(params("page"))
-          deleteWikiPage(
-            repository.owner,
-            repository.name,
-            pageName,
-            loginAccount.fullName,
-            loginAccount.mailAddress,
-            s"Destroyed ${pageName}"
-          )
-          val deleteWikiInfo = DeleteWikiInfo(
-            repository.owner,
-            repository.name,
-            loginAccount.userName,
-            pageName
-          )
-          recordActivity(deleteWikiInfo)
-          updateLastActivityDate(repository.owner, repository.name)
+    if (isEditable(repository)) {
+      val pageName = StringUtil.urlDecode(params("page"))

-          redirect(s"/${repository.owner}/${repository.name}/wiki")
-        } else Unauthorized()
-    }
+      defining(context.loginAccount.get) { loginAccount =>
+        deleteWikiPage(
+          repository.owner,
+          repository.name,
+          pageName,
+          loginAccount.fullName,
+          loginAccount.mailAddress,
+          s"Destroyed ${pageName}"
+        )
+        updateLastActivityDate(repository.owner, repository.name)
+
+        redirect(s"/${repository.owner}/${repository.name}/wiki")
+      }
+    } else Unauthorized()
  })

  get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
--- a/src/main/scala/gitbucket/core/controller/api/ApiGitReferenceControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiGitReferenceControllerBase.scala
@@ -1,158 +1,75 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiError, ApiRef, CreateARef, JsonFormat, UpdateARef}
+import gitbucket.core.api.{ApiObject, ApiRef, JsonFormat}
 import gitbucket.core.controller.ControllerBase
-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util.ReferrerAuthenticator
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.{ReferrerAuthenticator, RepositoryName, WritableUsersAuthenticator}
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.lib.ObjectId
-import org.eclipse.jgit.lib.RefUpdate.Result
-import org.scalatra.{BadRequest, NoContent, UnprocessableEntity}
 import org.slf4j.LoggerFactory

 import scala.jdk.CollectionConverters._
 import scala.util.Using

 trait ApiGitReferenceControllerBase extends ControllerBase {
-  self: ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: ReferrerAuthenticator =>

  private val logger = LoggerFactory.getLogger(classOf[ApiGitReferenceControllerBase])

-  get("/api/v3/repos/:owner/:repository/git/refs")(referrersOnly { repository =>
-    val result = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      val refs = git
-        .getRepository()
-        .getRefDatabase()
-        .getRefsByPrefix("refs")
-        .asScala
-
-      refs.map(ApiRef.fromRef(RepositoryName(s"${repository.owner}/${repository.name}"), _))
-    }
-    JsonFormat(result)
-  })
-
  /*
   * i. Get a reference
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#get-a-reference
+   * https://developer.github.com/v3/git/refs/#get-a-reference
   */
  get("/api/v3/repos/:owner/:repository/git/ref/*")(referrersOnly { repository =>
-    val revstr = multiParams("splat").head
-    getRef(revstr, 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")
-    val revstr = multiParams("splat").head
-    getRef(revstr, repository)
+    getRef()
  })

+  private def getRef() = {
+    val revstr = multiParams("splat").head
+    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
+      val ref = git.getRepository().findRef(revstr)
+
+      if (ref != null) {
+        val sha = ref.getObjectId().name()
+        JsonFormat(ApiRef(revstr, ApiObject(sha)))
+
+      } else {
+        val refs = git
+          .getRepository()
+          .getRefDatabase()
+          .getRefsByPrefix("refs/")
+          .asScala
+
+        JsonFormat(refs.map { ref =>
+          val sha = ref.getObjectId().name()
+          ApiRef(revstr, ApiObject(sha))
+        })
+      }
+    }
+  }
+
  /*
   * ii. Get all references
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#list-matching-references
+   * https://developer.github.com/v3/git/refs/#get-all-references
   */

  /*
   * iii. Create a reference
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#create-a-reference
+   * https://developer.github.com/v3/git/refs/#create-a-reference
   */
-  post("/api/v3/repos/:owner/:repository/git/refs")(referrersOnly { repository =>
-    extractFromJsonBody[CreateARef].map {
-      data =>
-        Using.resource(Git.open(getRepositoryDir(repository.owner, repository.owner))) { 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.fromRef(RepositoryName(repository.owner, repository.name), ref))
-              case _          => UnprocessableEntity(result.name())
-            }
-          } else {
-            UnprocessableEntity("Ref already exists.")
-          }
-        }
-    } getOrElse BadRequest()
-  })

  /*
   * iv. Update a reference
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/git#update-a-reference
+   * https://developer.github.com/v3/git/refs/#update-a-reference
   */
-  patch("/api/v3/repos/:owner/:repository/git/refs/*")(writableUsersOnly { repository =>
-    val refName = multiParams("splat").mkString("/")
-    extractFromJsonBody[UpdateARef].map {
-      data =>
-        Using.resource(Git.open(getRepositoryDir(repository.owner, repository.owner))) { 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.fromRef(RepositoryName(repository), update.getRef))
-              case _ => UnprocessableEntity(result.name())
-            }
-          }
-        }
-    } getOrElse BadRequest()
-  })

  /*
-   * 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/*")(writableUsersOnly { _ =>
-    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())
-        }
-      }
-    }
-  })
-
-  private def notFound(): ApiError = {
-    response.setStatus(404)
-    ApiError("Not Found")
-  }
-
-  protected def getRef(revstr: String, repository: RepositoryInfo): AnyRef = {
-    logger.debug(s"getRef: path '${revstr}'")
-
-    val name = RepositoryName(repository)
-    val result = JsonFormat(revstr match {
-      case "tags" => repository.tags.map(ApiRef.fromTag(name, _))
-      case x if x.startsWith("tags/") =>
-        val tagName = x.substring("tags/".length)
-        repository.tags.find(_.name == tagName) match {
-          case Some(tagInfo) => ApiRef.fromTag(name, tagInfo)
-          case None          => notFound()
-        }
-      case other =>
-        Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-          git.getRepository().findRef(other) match {
-            case null => notFound()
-            case ref  => ApiRef.fromRef(name, ref)
-          }
-        }
-    })
-
-    logger.debug(s"json result: $result")
-    result
-  }
+ * v. Delete a reference
+ * https://developer.github.com/v3/git/refs/#delete-a-reference
+ */
 }
--- a/src/main/scala/gitbucket/core/controller/api/ApiIssueCommentControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiIssueCommentControllerBase.scala
@@ -4,7 +4,6 @@ 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

 trait ApiIssueCommentControllerBase extends ControllerBase {
  self: AccountService
@@ -15,8 +14,8 @@ trait ApiIssueCommentControllerBase extends ControllerBase {
    with ReadableUsersAuthenticator
    with ReferrerAuthenticator =>
  /*
-   * i. List issue comments for a repository
-   * https://docs.github.com/en/rest/reference/issues#list-issue-comments-for-a-repository
+   * i. List comments on an issue
+   * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
   */
  get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
    (for {
@@ -31,90 +30,18 @@ trait ApiIssueCommentControllerBase extends ControllerBase {
  })

  /*
-   * 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
+   * ii. List comments in a repository
+   * https://developer.github.com/v3/issues/comments/#list-comments-in-a-repository
   */

  /*
-   * vi. Create an issue comment
-   * https://docs.github.com/en/rest/reference/issues#create-an-issue-comment
+   * iii. Get a single comment
+   * https://developer.github.com/v3/issues/comments/#get-a-single-comment
+   */
+
+  /*
+   * iv. Create a comment
+   * https://developer.github.com/v3/issues/comments/#create-a-comment
   */
  post("/api/v3/repos/:owner/:repository/issues/:id/comments")(readableUsersOnly { repository =>
    (for {
@@ -137,6 +64,16 @@ 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
 }
--- a/src/main/scala/gitbucket/core/controller/api/ApiIssueControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiIssueControllerBase.scala
@@ -5,7 +5,7 @@ import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.{AccountService, IssueCreationService, IssuesService, MilestonesService}
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.PullRequestService.PullRequestLimit
-import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName}
+import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName, UsersAuthenticator}
 import gitbucket.core.util.Implicits._

 trait ApiIssueControllerBase extends ControllerBase {
@@ -29,9 +29,9 @@ trait ApiIssueControllerBase extends ControllerBase {
    val page = IssueSearchCondition.page(request)
    // TODO: more api spec condition
    val condition = IssueSearchCondition(request)
-    //val baseOwner = getAccountByUserName(repository.owner).get
+    val baseOwner = getAccountByUserName(repository.owner).get

-    val issues: List[(Issue, Account, List[Account])] =
+    val issues: List[(Issue, Account, Option[Account])] =
      searchIssueByApi(
        condition = condition,
        offset = (page - 1) * PullRequestLimit,
@@ -40,15 +40,14 @@ trait ApiIssueControllerBase extends ControllerBase {
      )

    JsonFormat(issues.map {
-      case (issue, issueUser, assigneeUsers) =>
+      case (issue, issueUser, assignedUser) =>
        ApiIssue(
          issue = issue,
          repositoryName = RepositoryName(repository),
          user = ApiUser(issueUser),
-          assignees = assigneeUsers.map(ApiUser(_)),
+          assignee = assignedUser.map(ApiUser(_)),
          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
-            .map(ApiLabel(_, RepositoryName(repository))),
-          issue.milestoneId.flatMap { getApiMilestone(repository, _) }
+            .map(ApiLabel(_, RepositoryName(repository)))
        )
    })
  })
@@ -61,8 +60,7 @@ trait ApiIssueControllerBase extends ControllerBase {
    (for {
      issueId <- params("id").toIntOpt
      issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      assigneeUsers = getIssueAssignees(repository.owner, repository.name, issueId)
-      users = getAccountsByUserNames(Set(issue.openedUserName) ++ assigneeUsers.map(_.assigneeUserName), Set())
+      users = getAccountsByUserNames(Set(issue.openedUserName) ++ issue.assignedUserName, Set())
      openedUser <- users.get(issue.openedUserName)
    } yield {
      JsonFormat(
@@ -70,9 +68,8 @@ trait ApiIssueControllerBase extends ControllerBase {
          issue,
          RepositoryName(repository),
          ApiUser(openedUser),
-          assigneeUsers.flatMap(x => users.get(x.assigneeUserName)).map(ApiUser(_)),
-          getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository))),
-          issue.milestoneId.flatMap { getApiMilestone(repository, _) }
+          issue.assignedUserName.flatMap(users.get(_)).map(ApiUser(_)),
+          getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository)))
        )
      )
    }) getOrElse NotFound()
@@ -93,7 +90,7 @@ trait ApiIssueControllerBase extends ControllerBase {
          repository,
          data.title,
          data.body,
-          data.assignees,
+          data.assignees.headOption,
          milestone.map(_.milestoneId),
          None,
          data.labels,
@@ -104,12 +101,9 @@ trait ApiIssueControllerBase extends ControllerBase {
            issue,
            RepositoryName(repository),
            ApiUser(loginAccount),
-            getIssueAssignees(repository.owner, repository.name, issue.issueId)
-              .flatMap(x => getAccountByUserName(x.assigneeUserName, false))
-              .map(ApiUser.apply),
+            issue.assignedUserName.flatMap(getAccountByUserName(_)).map(ApiUser(_)),
            getIssueLabels(repository.owner, repository.name, issue.issueId)
-              .map(ApiLabel(_, RepositoryName(repository))),
-            issue.milestoneId.flatMap { getApiMilestone(repository, _) }
+              .map(ApiLabel(_, RepositoryName(repository)))
          )
        )
      }) getOrElse NotFound()
--- a/src/main/scala/gitbucket/core/controller/api/ApiIssueLabelControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiIssueLabelControllerBase.scala
@@ -121,7 +121,7 @@ trait ApiIssueLabelControllerBase extends ControllerBase {
   */
  post("/api/v3/repos/:owner/:repository/issues/:id/labels")(writableUsersOnly { repository =>
    JsonFormat(for {
-      data <- extractFromJsonBody[Seq[String]]
+      data <- extractFromJsonBody[Seq[String]];
      issueId <- params("id").toIntOpt
    } yield {
      data.map { labelName =>
@@ -160,7 +160,7 @@ trait ApiIssueLabelControllerBase extends ControllerBase {
   */
  put("/api/v3/repos/:owner/:repository/issues/:id/labels")(writableUsersOnly { repository =>
    JsonFormat(for {
-      data <- extractFromJsonBody[Seq[String]]
+      data <- extractFromJsonBody[Seq[String]];
      issueId <- params("id").toIntOpt
    } yield {
      deleteAllIssueLabels(repository.owner, repository.name, issueId, true)
--- a/src/main/scala/gitbucket/core/controller/api/ApiIssueMilestoneControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiIssueMilestoneControllerBase.scala
@@ -1,104 +0,0 @@
-package gitbucket.core.controller.api
-import gitbucket.core.api._
-import gitbucket.core.controller.ControllerBase
-import gitbucket.core.service.MilestonesService
-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()
-  })
-
-}
--- a/src/main/scala/gitbucket/core/controller/api/ApiOrganizationControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiOrganizationControllerBase.scala
@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiGroup, CreateAGroup, JsonFormat}
+import gitbucket.core.api.{ApiGroup, CreateAGroup, ApiRepository, ApiUser, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.Implicits._
--- a/src/main/scala/gitbucket/core/controller/api/ApiPullRequestControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiPullRequestControllerBase.scala
@@ -10,7 +10,7 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util._
 import org.eclipse.jgit.api.Git
-import org.scalatra.{Conflict, MethodNotAllowed, NoContent, Ok}
+import org.scalatra.NoContent
 import scala.util.Using

 import scala.jdk.CollectionConverters._
@@ -40,7 +40,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
    val condition = IssueSearchCondition(request)
    val baseOwner = getAccountByUserName(repository.owner).get

-    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, List[Account])] =
+    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] =
      searchPullRequestByApi(
        condition = condition,
        offset = (page - 1) * PullRequestLimit,
@@ -49,7 +49,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
      )

    JsonFormat(issues.map {
-      case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignees) =>
+      case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
        ApiPullRequest(
          issue = issue,
          pullRequest = pullRequest,
@@ -58,7 +58,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
          user = ApiUser(issueUser),
          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
            .map(ApiLabel(_, RepositoryName(repository))),
-          assignees = assignees.map(ApiUser.apply),
+          assignee = assignee.map(ApiUser.apply),
          mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
        )
    })
@@ -99,6 +99,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
                      loginUser = context.loginAccount.get.userName,
                      title = createPullReq.title,
                      content = createPullReq.body,
+                      assignedUserName = None,
                      milestoneId = None,
                      priorityId = None,
                      isPullRequest = true
@@ -160,28 +161,8 @@ trait ApiPullRequestControllerBase extends ControllerBase {

  /*
   * v. Update a pull request
-   * https://docs.github.com/en/rest/reference/pulls#update-a-pull-request
+   * https://developer.github.com/v3/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
@@ -229,79 +210,15 @@ trait ApiPullRequestControllerBase extends ControllerBase {
      if (checkConflict(repository.owner, repository.name, pullReq.branch, issueId).isDefined) {
        NoContent
      } else {
-        NotFound()
+        NotFound
      }
-    }).getOrElse(NotFound())
+    }).getOrElse(NotFound)
  })

  /*
   * ix. Merge a pull request (Merge Button)
-   * https://docs.github.com/en/rest/reference/pulls#merge-a-pull-request
+   * https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
   */
-  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
@@ -318,8 +235,8 @@ trait ApiPullRequestControllerBase extends ControllerBase {
      baseOwner <- users.get(repository.owner)
      headOwner <- users.get(pullRequest.requestUserName)
      issueUser <- users.get(issue.openedUserName)
-      assignees = getIssueAssignees(repository.owner, repository.name, issueId).flatMap { assignedUser =>
-        getAccountByUserName(assignedUser.assigneeUserName, false)
+      assignee = issue.assignedUserName.flatMap { userName =>
+        getAccountByUserName(userName, false)
      }
      headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
    } yield {
@@ -331,7 +248,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
        user = ApiUser(issueUser),
        labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
          .map(ApiLabel(_, RepositoryName(repository))),
-        assignees = assignees.map(ApiUser.apply),
+        assignee = assignee.map(ApiUser.apply),
        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
      )
    }
--- a/src/main/scala/gitbucket/core/controller/api/ApiReleaseControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiReleaseControllerBase.scala
@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import java.io.File
+import java.io.{ByteArrayInputStream, File}

 import gitbucket.core.api._
 import gitbucket.core.controller.ControllerBase
@@ -7,8 +7,9 @@ import gitbucket.core.service.{AccountService, ReleaseService}
 import gitbucket.core.util.Directory.getReleaseFilesDir
 import gitbucket.core.util.{FileUtil, ReferrerAuthenticator, RepositoryName, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.SyntaxSugars.defining
 import org.apache.commons.io.FileUtils
-import org.scalatra.NoContent
+import org.scalatra.{Created, NoContent}

 trait ApiReleaseControllerBase extends ControllerBase {
  self: AccountService with ReleaseService with ReferrerAuthenticator with WritableUsersAuthenticator =>
@@ -86,7 +87,7 @@ trait ApiReleaseControllerBase extends ControllerBase {
  /**
   * vi. Edit a release
   * https://developer.github.com/v3/repos/releases/#edit-a-release
-   * Incompatibility info: GitHub API requires :release_id, but GitBucket API requires :tag_name
+   * Incompatiblity info: GitHub API requires :release_id, but GitBucket API requires :tag_name
   */
  patch("/api/v3/repos/:owner/:repository/releases/:tag")(writableUsersOnly { repository =>
    (for {
@@ -103,7 +104,7 @@ trait ApiReleaseControllerBase extends ControllerBase {
  /**
   * vii. Delete a release
   * https://developer.github.com/v3/repos/releases/#delete-a-release
-   * Incompatibility info: GitHub API requires :release_id, but GitBucket API requires :tag_name
+   * Incompatiblity info: GitHub API requires :release_id, but GitBucket API requires :tag_name
   */
  delete("/api/v3/repos/:owner/:repository/releases/:tag")(writableUsersOnly { repository =>
    val tag = params("tag")
@@ -119,40 +120,41 @@ trait ApiReleaseControllerBase extends ControllerBase {
   * ix. Upload a release asset
   * https://developer.github.com/v3/repos/releases/#upload-a-release-asset
   */
-  post("/api/v3/repos/:owner/:repository/releases/:tag/assets")(writableUsersOnly {
-    repository =>
-      val name = params("name")
-      val tag = params("tag")
-      getRelease(repository.owner, repository.name, tag)
-        .map { release =>
-          val fileId = FileUtil.generateFileId
-          val buf = new Array[Byte](request.inputStream.available())
-          request.inputStream.read(buf)
-          FileUtils.writeByteArrayToFile(
-            new File(
-              getReleaseFilesDir(repository.owner, repository.name),
-              FileUtil.checkFilename(tag + "/" + fileId)
-            ),
-            buf
-          )
-          createReleaseAsset(
-            repository.owner,
-            repository.name,
-            tag,
-            fileId,
-            name,
-            request.contentLength.getOrElse(0),
-            context.loginAccount.get
-          )
-          getReleaseAsset(repository.owner, repository.name, tag, fileId)
-            .map { asset =>
-              JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
-            }
-            .getOrElse {
-              ApiError("Unknown error")
-            }
-        }
-        .getOrElse(NotFound())
+  post("/api/v3/repos/:owner/:repository/releases/:tag/assets")(writableUsersOnly { repository =>
+    val name = params("name")
+    val tag = params("tag")
+    getRelease(repository.owner, repository.name, tag)
+      .map {
+        release =>
+          defining(FileUtil.generateFileId) { fileId =>
+            val buf = new Array[Byte](request.inputStream.available())
+            request.inputStream.read(buf)
+            FileUtils.writeByteArrayToFile(
+              new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(tag + "/" + fileId)
+              ),
+              buf
+            )
+            createReleaseAsset(
+              repository.owner,
+              repository.name,
+              tag,
+              fileId,
+              name,
+              request.contentLength.getOrElse(0),
+              context.loginAccount.get
+            )
+            getReleaseAsset(repository.owner, repository.name, tag, fileId)
+              .map { asset =>
+                JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
+              }
+              .getOrElse {
+                ApiError("Unknown error")
+              }
+          }
+      }
+      .getOrElse(NotFound())
  })

  /**
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryBranchControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryBranchControllerBase.scala
@@ -7,8 +7,6 @@ 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 {
@@ -24,7 +22,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {

  /**
   * i. List branches
-   * https://docs.github.com/en/rest/reference/repos#list-branches
+   * https://developer.github.com/v3/repos/branches/#list-branches
   */
  get("/api/v3/repos/:owner/:repository/branches")(referrersOnly { repository =>
    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
@@ -43,8 +41,8 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
  })

  /**
-   * ii. Get a branch
-   * https://docs.github.com/en/rest/reference/repos#get-a-branch
+   * ii. Get branch
+   * https://developer.github.com/v3/repos/branches/#get-branch
   */
  get("/api/v3/repos/:owner/:repository/branches/*")(referrersOnly { repository =>
    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
@@ -67,206 +65,147 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {

  /*
   * iii. Get branch protection
-   * https://docs.github.com/en/rest/reference/repos#get-branch-protection
+   * https://developer.github.com/v3/repos/branches/#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://docs.github.com/en/rest/reference/repos#update-branch-protection
+   * https://developer.github.com/v3/repos/branches/#update-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
+   * v. Remove branch protection
+   * https://developer.github.com/v3/repos/branches/#remove-branch-protection
   */

  /*
-   * vii. Set admin branch protection
-   * https://docs.github.com/en/rest/reference/repos#set-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
   */

  /*
-   * viii. Delete admin branch protection
-   * https://docs.github.com/en/rest/reference/repos#delete-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
   */

  /*
-   * ix. Get pull request review protection
-   * https://docs.github.com/en/rest/reference/repos#get-pull-request-review-protection
+   * viii. Remove required status checks of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-required-status-checks-of-protected-branch
   */

  /*
-   * x. Update pull request review protection
-   * https://docs.github.com/en/rest/reference/repos#update-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
   */

  /*
-   * xi. Delete pull request review protection
-   * https://docs.github.com/en/rest/reference/repos#delete-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
   */

  /*
-   * xii. Get commit signature protection
-   * https://docs.github.com/en/rest/reference/repos#get-commit-signature-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
   */

  /*
-   * xiii. Create commit signature protection
-   * https://docs.github.com/en/rest/reference/repos#create-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
   */

  /*
-   * xiv. Delete commit signature protection
-   * https://docs.github.com/en/rest/reference/repos#delete-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
   */

  /*
-   * 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
+   * xiv. Update pull request review enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#update-pull-request-review-enforcement-of-protected-branch
   */

  /*
-   * xvii. Remove status check protection
-   * https://docs.github.com/en/rest/reference/repos#remove-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
   */

  /*
-   * 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
+   * xvi. Get required signatures of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-required-signatures-of-protected-branch
   */

  /*
-   * xx. Set status check contexts
-   * https://docs.github.com/en/rest/reference/repos#set-status-check-contexts
+   * xvii. Add required signatures of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-required-signatures-of-protected-branch
   */

  /*
-   * xxi. Remove status check contexts
-   * https://docs.github.com/en/rest/reference/repos#remove-status-check-contexts
+   * xviii. Remove required signatures of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-required-signatures-of-protected-branch
   */

  /*
-   * xxii. Get access restrictions
-   * https://docs.github.com/en/rest/reference/repos#get-access-restrictions
+   * xix. Get admin enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-admin-enforcement-of-protected-branch
   */

  /*
-   * xxiii. Delete access restrictions
-   * https://docs.github.com/en/rest/reference/repos#delete-access-restrictions
+   * xx. Add admin enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-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
+   * xxi. Remove admin enforcement of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-admin-enforcement-of-protected-branch
   */

  /*
-   * xxv. Add app access restrictions
-   * https://docs.github.com/en/rest/reference/repos#add-app-access-restrictions
+   * xxii. Get restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#get-restrictions-of-protected-branch
   */

  /*
-   * xxvi. Set app access restrictions
-   * https://docs.github.com/en/rest/reference/repos#set-app-access-restrictions
+   * xxiii. Remove restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-restrictions-of-protected-branch
   */

  /*
-   * xxvii. Remove app access restrictions
-   * https://docs.github.com/en/rest/reference/repos#remove-app-access-restrictions
+   * xxiv. List team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#list-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
+   * xxv. Replace team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#replace-team-restrictions-of-protected-branch
   */

  /*
-   * xxix. Add team access restrictions
-   * https://docs.github.com/en/rest/reference/repos#add-team-access-restrictions
+   * xxvi. Add team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-team-restrictions-of-protected-branch
   */

  /*
-   * xxx. Set team access restrictions
-   * https://docs.github.com/en/rest/reference/repos#set-team-access-restrictions
+   * xxvii. Remove team restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-team-restrictions-of-protected-branch
   */

  /*
-   * xxxi. Remove team access restrictions
-   * https://docs.github.com/en/rest/reference/repos#remove-team-access-restrictions
+   * xxviii. List user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#list-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
+   * xxix. Replace user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#replace-user-restrictions-of-protected-branch
   */

  /*
-   * xxxiii. Add user access restrictions
-   * https://docs.github.com/en/rest/reference/repos#add-user-access-restrictions
+   * xxx. Add user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#add-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
+   * xxxi. Remove user restrictions of protected branch
+   * https://developer.github.com/v3/repos/branches/#remove-user-restrictions-of-protected-branch
   */

  /**
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryCollaboratorControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryCollaboratorControllerBase.scala
@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{AddACollaborator, ApiRepositoryCollaborator, ApiUser, JsonFormat}
+import gitbucket.core.api.{AddACollaborator, 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 repository collaborators
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#list-repository-collaborators
+   * i. List collaborators
+   * https://developer.github.com/v3/repos/collaborators/#list-collaborators
   */
  get("/api/v3/repos/:owner/:repository/collaborators")(referrersOnly { repository =>
    // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
@@ -19,40 +19,19 @@ trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
      getCollaboratorUserNames(params("owner"), params("repository")).map(u => ApiUser(getAccountByUserName(u).get))
    )
  })
-
  /*
   * ii. 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
+   * https://developer.github.com/v3/repos/collaborators/#check-if-a-user-is-a-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. Get repository permissions for a user
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#get-repository-permissions-for-a-user
+   * iii. Review a user's permission level
+   * https://developer.github.com/v3/repos/collaborators/#review-a-users-permission-level
   */
-  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 a repository collaborator
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#add-a-repository-collaborator
+   * iv. Add user as a collaborator
+   * https://developer.github.com/v3/repos/collaborators/#add-user-as-a-collaborator
   * requested #1586
   */
  put("/api/v3/repos/:owner/:repository/collaborators/:userName")(ownerOnly { repository =>
@@ -65,8 +44,8 @@ trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
  })

  /*
-   * v. Remove a repository collaborator
-   * https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#remove-a-repository-collaborator
+   * v. Remove user as a collaborator
+   * https://developer.github.com/v3/repos/collaborators/#remove-user-as-a-collaborator
   * requested #1586
   */
  delete("/api/v3/repos/:owner/:repository/collaborators/:userName")(ownerOnly { repository =>
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryCommitControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryCommitControllerBase.scala
@@ -1,34 +1,19 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiBranchCommit, ApiBranchForHeadCommit, ApiCommits, JsonFormat}
+import gitbucket.core.api.{ApiCommits, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, CommitsService, ProtectedBranchService}
+import gitbucket.core.service.{AccountService, CommitsService}
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.JGitUtil.{CommitInfo, getBranches, getBranchesOfCommit}
+import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.{JGitUtil, ReferrerAuthenticator, RepositoryName}
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.revwalk.filter.{
-  AndRevFilter,
-  AuthorRevFilter,
-  CommitTimeRevFilter,
-  MaxCountRevFilter,
-  RevFilter,
-  SkipRevFilter
-}
-import org.eclipse.jgit.treewalk.filter.{AndTreeFilter, PathFilterGroup, TreeFilter}
-import scala.collection.mutable.ListBuffer
 import scala.jdk.CollectionConverters._
 import scala.util.Using
-import math.min
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter._
-import java.util.Date
-import java.time.ZoneOffset

 trait ApiRepositoryCommitControllerBase extends ControllerBase {
-  self: AccountService with CommitsService with ProtectedBranchService with ReferrerAuthenticator =>
+  self: AccountService with CommitsService with ReferrerAuthenticator =>
  /*
   * i. List commits on a repository
   * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository
@@ -36,13 +21,8 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
  get("/api/v3/repos/:owner/:repository/commits")(referrersOnly { repository =>
    val owner = repository.owner
    val name = repository.name
-    val sha = params.get("sha").filter(_.nonEmpty).getOrElse("HEAD")
-    val page = params.get("page").filter(_.nonEmpty).getOrElse("1").toInt
-    val per_page = min(params.get("per_page").filter(_.nonEmpty).getOrElse("30").toInt, 100)
-    val author = params.get("author").filter(_.nonEmpty)
-    val path = params.get("path").filter(_.nonEmpty)
-    val since = params.get("since").filter(_.nonEmpty)
-    val until = params.get("until").filter(_.nonEmpty)
+    // TODO: The following parameters need to be implemented. [:path, :author, :since, :until]
+    val sha = if (request.body.nonEmpty) (parse(request.body) \ "sha").extract[String] else "refs/heads/master";
    Using.resource(Git.open(getRepositoryDir(owner, name))) {
      git =>
        val repo = git.getRepository
@@ -50,37 +30,7 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
          revWalk =>
            val objectId = repo.resolve(sha)
            revWalk.markStart(revWalk.parseCommit(objectId))
-            if (path.nonEmpty) {
-              revWalk.setTreeFilter(
-                AndTreeFilter.create(PathFilterGroup.createFromStrings(path.get), TreeFilter.ANY_DIFF)
-              )
-            }
-            val revfilters = new ListBuffer[(RevFilter)]()
-            if (author.nonEmpty) {
-              revfilters += AuthorRevFilter.create(author.get)
-            }
-            if (since.nonEmpty) {
-              revfilters += CommitTimeRevFilter.after(
-                Date.from(LocalDateTime.parse(since.get, ISO_DATE_TIME).toInstant(ZoneOffset.UTC))
-              )
-            }
-            if (until.nonEmpty) {
-              revfilters += CommitTimeRevFilter.before(
-                Date.from(LocalDateTime.parse(until.get, ISO_DATE_TIME).toInstant(ZoneOffset.UTC))
-              )
-            }
-            if (page > 1) {
-              revfilters += SkipRevFilter.create(page * per_page - 2)
-            }
-            revfilters += MaxCountRevFilter.create(per_page);
-            revWalk.setRevFilter(
-              if (revfilters.size > 1) {
-                AndRevFilter.create(revfilters.toArray)
-              } else {
-                revfilters(0)
-              }
-            )
-            JsonFormat(revWalk.asScala.map {
+            JsonFormat(revWalk.asScala.take(30).map {
              commit =>
                val commitInfo = new CommitInfo(commit)
                ApiCommits(
@@ -89,7 +39,7 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
                  diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true),
                  author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
                  committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
-                  commentCount = getCommitComment(repository.owner, repository.name, commitInfo.id).size
+                  commentCount = getCommitComment(repository.owner, repository.name, commitInfo.id.toString).size
                )
            })
        }
@@ -157,25 +107,7 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
   */

  /*
-   * 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)
-    }
-  })
+ * v. Commit signature verification
+ * https://developer.github.com/v3/repos/commits/#commit-signature-verification
+ */
 }
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryContentsControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryContentsControllerBase.scala
@@ -1,41 +1,26 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiCommit, ApiContents, ApiError, CreateAFile, JsonFormat}
+import gitbucket.core.api.{ApiContents, ApiError, CreateAFile, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{RepositoryCommitFileService, RepositoryService}
 import gitbucket.core.util.Directory.getRepositoryDir
-import gitbucket.core.util.JGitUtil.{CommitInfo, FileInfo, getContentFromId, getFileList}
+import gitbucket.core.util.JGitUtil.{FileInfo, getContentFromId, getFileList}
 import gitbucket.core.util._
 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 a repository README
-   * https://docs.github.com/en/rest/reference/repos#get-a-repository-readme
+  /*
+   * i. Get the README
+   * https://developer.github.com/v3/repos/contents/#get-the-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
-   * https://docs.github.com/en/rest/reference/repos#get-repository-content
+   * https://developer.github.com/v3/repos/contents/#get-contents
   */
  get("/api/v3/repos/:owner/:repository/contents")(referrersOnly { repository =>
    getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch))
@@ -43,38 +28,27 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {

  /**
   * ii. Get contents
-   * https://docs.github.com/en/rest/reference/repos#get-repository-content
+   * https://developer.github.com/v3/repos/contents/#get-contents
   */
  get("/api/v3/repos/:owner/:repository/contents/*")(referrersOnly { repository =>
    getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
  })

-  private def 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))
+  private def getContents(repository: RepositoryService.RepositoryInfo, path: String, refStr: String) = {
+    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
+      val (dirName, fileName) = pathStr.lastIndexOf('/') match {
+        case -1 =>
+          (".", pathStr)
+        case n =>
+          (pathStr.take(n), pathStr.drop(n + 1))
+      }
+      getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
    }
-    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))
-    }
-  }

-  private def getContents(
-    repository: RepositoryService.RepositoryInfo,
-    path: String,
-    refStr: String,
-    ignoreCase: Boolean = false
-  ) = {
    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
-      val fileList = getFileList(git, refStr, path, maxFiles = context.settings.repositoryViewer.maxFiles)
+      val fileList = getFileList(git, refStr, path)
      if (fileList.isEmpty) { // file or NotFound
-        getFileInfo(git, refStr, path, ignoreCase)
+        getFileInfo(git, refStr, path)
          .flatMap { f =>
            val largeFile = params.get("large_file").exists(s => s.equals("true"))
            val content = getContentFromId(git, f.id, largeFile)
@@ -126,88 +100,56 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
      }
    }
  }
-
-  /**
+  /*
   * iii. Create a file or iv. Update a file
-   * https://docs.github.com/en/rest/reference/repos#create-or-update-file-contents
+   * https://developer.github.com/v3/repos/contents/#create-a-file
+   * https://developer.github.com/v3/repos/contents/#update-a-file
   * if sha is presented, update a file else create a file.
   * requested #2112
   */
-  put("/api/v3/repos/:owner/:repository/contents/*")(writableUsersOnly { repository =>
-    context.withLoginAccount {
-      loginAccount =>
-        JsonFormat(for {
-          data <- extractFromJsonBody[CreateAFile]
-        } yield {
-          val branch = data.branch.getOrElse(repository.repository.defaultBranch)
-          val commit = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-            val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
-            revCommit.name
-          }
-          val paths = multiParams("splat").head.split("/")
-          val path = paths.take(paths.size - 1).toList.mkString("/")
-          Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) {
-            git =>
-              val fileInfo = getFileInfo(git, commit, path, false)

-              fileInfo match {
-                case Some(f) if !data.sha.contains(f.id.getName) =>
-                  ApiError(
-                    "The blob SHA is not matched.",
-                    Some("https://docs.github.com/en/rest/reference/repos#create-or-update-file-contents")
-                  )
-                case _ =>
-                  commitFile(
-                    repository,
-                    branch,
-                    path,
-                    Some(paths.last),
-                    data.sha.map(_ => paths.last),
-                    StringUtil.base64Decode(data.content),
-                    data.message,
-                    commit,
-                    loginAccount,
-                    data.committer.map(_.name).getOrElse(loginAccount.fullName),
-                    data.committer.map(_.email).getOrElse(loginAccount.mailAddress),
-                    context.settings
-                  ) match {
-                    case Left(error) =>
-                      ApiError(s"Failed to commit a file: ${error}", None)
-                    case Right((_, None)) =>
-                      ApiError("Failed to commit a file.", None)
-                    case Right((commitId, Some(blobId))) =>
-                      Map(
-                        "content" -> ApiContents(
-                          "file",
-                          paths.last,
-                          path,
-                          blobId.name,
-                          Some(data.content),
-                          Some("base64")
-                        )(RepositoryName(repository)),
-                        "commit" -> ApiCommit(
-                          git,
-                          RepositoryName(repository),
-                          new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-                        )
-                      )
-                  }
-              }
-          }
-        })
-    }
+  put("/api/v3/repos/:owner/:repository/contents/*")(writableUsersOnly { repository =>
+    JsonFormat(for {
+      data <- extractFromJsonBody[CreateAFile]
+    } yield {
+      val branch = data.branch.getOrElse(repository.repository.defaultBranch)
+      val commit = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+        revCommit.name
+      }
+      val paths = multiParams("splat").head.split("/")
+      val path = paths.take(paths.size - 1).toList.mkString("/")
+      if (data.sha.isDefined && data.sha.get != commit) {
+        ApiError("The blob SHA is not matched.", Some("https://developer.github.com/v3/repos/contents/#update-a-file"))
+      } else {
+        val objectId = commitFile(
+          repository,
+          branch,
+          path,
+          Some(paths.last),
+          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),
+          context.settings
+        )
+        ApiContents("file", paths.last, path, objectId.name, None, None)(RepositoryName(repository))
+      }
+    })
  })

  /*
   * v. Delete a file
-   * https://docs.github.com/en/rest/reference/repos#delete-a-file
+   * https://developer.github.com/v3/repos/contents/#delete-a-file
   * should be implemented
   */

  /*
- * vi. Download a repository archive (tar/zip)
- * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-tar
- * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-zip
+ * vi. Get archive link
+ * https://developer.github.com/v3/repos/contents/#get-archive-link
 */

 }
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryControllerBase.scala
@@ -8,7 +8,6 @@ import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.eclipse.jgit.api.Git
-import org.scalatra.Forbidden

 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
@@ -16,7 +15,6 @@ import scala.util.Using

 trait ApiRepositoryControllerBase extends ControllerBase {
  self: RepositoryService
-    with ApiGitReferenceControllerBase
    with RepositoryCreationService
    with AccountService
    with OwnerAuthenticator
@@ -28,7 +26,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * i. List your repositories
-   * https://docs.github.com/en/rest/reference/repos#list-repositories-for-the-authenticated-user
+   * https://developer.github.com/v3/repos/#list-your-repositories
   */
  get("/api/v3/user/repos")(usersOnly {
    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map { r =>
@@ -38,7 +36,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * ii. List user repositories
-   * https://docs.github.com/en/rest/reference/repos#list-repositories-for-a-user
+   * https://developer.github.com/v3/repos/#list-user-repositories
   */
  get("/api/v3/users/:userName/repos") {
    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("userName"))).map { r =>
@@ -48,7 +46,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * iii. List organization repositories
-   * https://docs.github.com/en/rest/reference/repos#list-organization-repositories
+   * https://developer.github.com/v3/repos/#list-organization-repositories
   */
  get("/api/v3/orgs/:orgName/repos") {
    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("orgName"))).map { r =>
@@ -56,24 +54,21 @@ trait ApiRepositoryControllerBase extends ControllerBase {
    })
  }

-  /**
+  /*
   * iv. List all public repositories
-   * https://docs.github.com/en/rest/reference/repos#list-public-repositories
+   * https://developer.github.com/v3/repos/#list-all-public-repositories
+   * Not implemented
   */
-  get("/api/v3/repositories") {
-    JsonFormat(getPublicRepositories().map { r =>
-      ApiRepository(r, getAccountByUserName(r.owner).get)
-    })
-  }

  /*
   * v. Create
+   * https://developer.github.com/v3/repos/#create
   * Implemented with two methods (user/orgs)
   */

  /**
   * Create user repository
-   * https://docs.github.com/en/rest/reference/repos#create-a-repository-for-the-authenticated-user
+   * https://developer.github.com/v3/repos/#create
   */
  post("/api/v3/user/repos")(usersOnly {
    val owner = context.loginAccount.get.userName
@@ -81,12 +76,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {
      data <- extractFromJsonBody[CreateARepository] if data.isValid
    } yield {
      LockUtil.lock(s"${owner}/${data.name}") {
-        if (getRepository(owner, data.name).isDefined) {
-          ApiError(
-            "A repository with this name already exists on this account",
-            Some("https://developer.github.com/v3/repos/#create")
-          )
-        } else {
+        if (getRepository(owner, data.name).isEmpty) {
          val f = createRepository(
            context.loginAccount.get,
            owner,
@@ -101,6 +91,11 @@ trait ApiRepositoryControllerBase extends ControllerBase {
            getRepository(owner, data.name)(session).get
          }
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
+        } else {
+          ApiError(
+            "A repository with this name already exists on this account",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
        }
      }
    }) getOrElse NotFound()
@@ -108,22 +103,15 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * Create group repository
-   * https://docs.github.com/en/rest/reference/repos#create-an-organization-repository
+   * https://developer.github.com/v3/repos/#create
   */
-  post("/api/v3/orgs/:org/repos")(usersOnly {
+  post("/api/v3/orgs/:org/repos")(managersOnly {
    val groupName = params("org")
    (for {
      data <- extractFromJsonBody[CreateARepository] if data.isValid
    } yield {
      LockUtil.lock(s"${groupName}/${data.name}") {
-        if (getRepository(groupName, data.name).isDefined) {
-          ApiError(
-            "A repository with this name already exists for this group",
-            Some("https://developer.github.com/v3/repos/#create")
-          )
-        } else if (!canCreateRepository(groupName, context.loginAccount.get)) {
-          Forbidden()
-        } else {
+        if (getRepository(groupName, data.name).isEmpty) {
          val f = createRepository(
            context.loginAccount.get,
            groupName,
@@ -137,6 +125,11 @@ trait ApiRepositoryControllerBase extends ControllerBase {
            getRepository(groupName, data.name).get
          }
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
+        } else {
+          ApiError(
+            "A repository with this name already exists for this group",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
        }
      }
    }) getOrElse NotFound()
@@ -144,7 +137,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /*
   * vi. Get
-   * https://docs.github.com/en/rest/reference/repos#get-a-repository
+   * https://developer.github.com/v3/repos/#get
   */
  get("/api/v3/repos/:owner/:repository")(referrersOnly { repository =>
    JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(repository.owner).get)))
@@ -152,54 +145,47 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /*
   * vii. Edit
-   * https://docs.github.com/en/rest/reference/repos#update-a-repository
+   * https://developer.github.com/v3/repos/#edit
   */

  /*
   * viii. List all topics for a repository
-   * https://docs.github.com/en/rest/reference/repos#get-all-repository-topics
+   * https://developer.github.com/v3/repos/#list-all-topics-for-a-repository
   */

  /*
   * ix. Replace all topics for a repository
-   * https://docs.github.com/en/rest/reference/repos#replace-all-repository-topics
+   * https://developer.github.com/v3/repos/#replace-all-topics-for-a-repository
   */

  /*
   * x. List contributors
-   * https://docs.github.com/en/rest/reference/repos#list-repository-contributors
+   * https://developer.github.com/v3/repos/#list-contributors
   */

  /*
   * xi. List languages
-   * https://docs.github.com/en/rest/reference/repos#list-repository-languages
+   * https://developer.github.com/v3/repos/#list-languages
   */

  /*
   * xii. List teams
-   * https://docs.github.com/en/rest/reference/repos#list-repository-teams
+   * https://developer.github.com/v3/repos/#list-teams
   */

  /*
-   * xiii. List repository tags
-   * https://docs.github.com/en/rest/reference/repos#list-repository-tags
+   * xiii. List tags
+   * https://developer.github.com/v3/repos/#list-tags
   */
-  get("/api/v3/repos/:owner/:repository/tags")(referrersOnly { repository =>
-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      JsonFormat(
-        self.getRef("tags", repository)
-      )
-    }
-  })

  /*
   * xiv. Delete a repository
-   * https://docs.github.com/en/rest/reference/repos#delete-a-repository
+   * https://developer.github.com/v3/repos/#delete-a-repository
   */

  /*
   * xv. Transfer a repository
-   * https://docs.github.com/en/rest/reference/repos#transfer-a-repository
+   * https://developer.github.com/v3/repos/#transfer-a-repository
   */

  /**
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryStatusControllerBase.scala
+++ b/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(getCommitStatusesWithCreator(repository.owner, repository.name, sha).map {
+      JsonFormat(getCommitStatuesWithCreator(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 = getCommitStatusesWithCreator(repository.owner, repository.name, sha)
+      val statuses = getCommitStatuesWithCreator(repository.owner, repository.name, sha)
      JsonFormat(ApiCombinedCommitStatus(sha, statuses, ApiRepository(repository, owner)))
    }) getOrElse NotFound()
  })
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryWebhookControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryWebhookControllerBase.scala
@@ -1,120 +0,0 @@
-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
- */
-
-}
--- a/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
@@ -104,7 +104,7 @@ trait ApiUserControllerBase extends ControllerBase {
   */
  delete("/api/v3/users/:userName/suspended")(adminOnly {
    val userName = params("userName")
-    getAccountByUserName(userName, true) match {
+    getAccountByUserName(userName) match {
      case Some(targetAccount) =>
        updateAccount(targetAccount.copy(isRemoved = false))
        NoContent()
--- a/src/main/scala/gitbucket/core/model/AccessToken.scala
+++ b/src/main/scala/gitbucket/core/model/AccessToken.scala
@@ -10,7 +10,7 @@ trait AccessTokenComponent { self: Profile =>
    val userName = column[String]("USER_NAME")
    val tokenHash = column[String]("TOKEN_HASH")
    val note = column[String]("NOTE")
-    def * = (accessTokenId, userName, tokenHash, note).<>(AccessToken.tupled, AccessToken.unapply)
+    def * = (accessTokenId, userName, tokenHash, note) <> (AccessToken.tupled, AccessToken.unapply)
  }
 }
 case class AccessToken(
--- a/src/main/scala/gitbucket/core/model/Account.scala
+++ b/src/main/scala/gitbucket/core/model/Account.scala
@@ -35,7 +35,7 @@ trait AccountComponent { self: Profile =>
        groupAccount,
        removed,
        description.?
-      ).<>(Account.tupled, Account.unapply)
+      ) <> (Account.tupled, Account.unapply)
  }
 }

--- a/src/main/scala/gitbucket/core/model/AccountExtraMailAddress.scala
+++ b/src/main/scala/gitbucket/core/model/AccountExtraMailAddress.scala
@@ -9,7 +9,7 @@ trait AccountExtraMailAddressComponent { self: Profile =>
    val userName = column[String]("USER_NAME", O PrimaryKey)
    val extraMailAddress = column[String]("EXTRA_MAIL_ADDRESS", O PrimaryKey)
    def * =
-      (userName, extraMailAddress).<>(AccountExtraMailAddress.tupled, AccountExtraMailAddress.unapply)
+      (userName, extraMailAddress) <> (AccountExtraMailAddress.tupled, AccountExtraMailAddress.unapply)
  }
 }

--- a/src/main/scala/gitbucket/core/model/AccountFederation.scala
+++ b/src/main/scala/gitbucket/core/model/AccountFederation.scala
@@ -9,7 +9,7 @@ trait AccountFederationComponent { self: Profile =>
    val issuer = column[String]("ISSUER")
    val subject = column[String]("SUBJECT")
    val userName = column[String]("USER_NAME")
-    def * = (issuer, subject, userName).<>(AccountFederation.tupled, AccountFederation.unapply)
+    def * = (issuer, subject, userName) <> (AccountFederation.tupled, AccountFederation.unapply)

    def byPrimaryKey(issuer: String, subject: String): Rep[Boolean] =
      (this.issuer === issuer.bind) && (this.subject === subject.bind)
--- a/src/main/scala/gitbucket/core/model/AccountPreference.scala
+++ b/src/main/scala/gitbucket/core/model/AccountPreference.scala
@@ -1,21 +0,0 @@
-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"
-)
--- a/src/main/scala/gitbucket/core/model/AccountWebHook.scala
+++ b/src/main/scala/gitbucket/core/model/AccountWebHook.scala
@@ -3,7 +3,7 @@ package gitbucket.core.model
 trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
  import profile.api._

-  private implicit val whContentTypeColumnType: BaseColumnType[WebHookContentType] =
+  private implicit val whContentTypeColumnType =
    MappedColumnType.base[WebHookContentType, String](whct => whct.code, code => WebHookContentType.valueOf(code))

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

    def byPrimaryKey(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
  }
--- a/src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala
+++ b/src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala
@@ -1,6 +1,8 @@
 package gitbucket.core.model

-trait AccountWebHookEventComponent extends TemplateComponent { self: Profile =>
+trait AccountWebHookEventComponent extends TemplateComponent {
+  self: Profile =>
+
  import profile.api._
  import gitbucket.core.model.Profile.AccountWebHooks

@@ -12,7 +14,7 @@ trait AccountWebHookEventComponent extends TemplateComponent { self: Profile =>
    val url = column[String]("URL")
    val event = column[WebHook.Event]("EVENT")

-    def * = (userName, url, event).<>((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)
+    def * = (userName, url, event) <> ((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)

    def byAccountWebHook(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)

--- a/src/main/scala/gitbucket/core/model/Activity.scala
+++ b/src/main/scala/gitbucket/core/model/Activity.scala
@@ -1,9 +1,5 @@
 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._
@@ -11,7 +7,14 @@ trait ActivityComponent extends TemplateComponent { self: Profile =>
  lazy val Activities = TableQuery[Activities]

  class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
-    def * = ???
+    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)
  }
 }

@@ -23,5 +26,5 @@ case class Activity(
  message: String,
  additionalInfo: Option[String],
  activityDate: java.util.Date,
-  activityId: String
+  activityId: Int = 0
 )
--- a/src/main/scala/gitbucket/core/model/Collaborator.scala
+++ b/src/main/scala/gitbucket/core/model/Collaborator.scala
@@ -8,7 +8,7 @@ trait CollaboratorComponent extends TemplateComponent { self: Profile =>
  class Collaborators(tag: Tag) extends Table[Collaborator](tag, "COLLABORATOR") with BasicTemplate {
    val collaboratorName = column[String]("COLLABORATOR_NAME")
    val role = column[String]("ROLE")
-    def * = (userName, repositoryName, collaboratorName, role).<>(Collaborator.tupled, Collaborator.unapply)
+    def * = (userName, repositoryName, collaboratorName, role) <> (Collaborator.tupled, Collaborator.unapply)

    def byPrimaryKey(owner: String, repository: String, collaborator: String) =
      byRepository(owner, repository) && (collaboratorName === collaborator.bind)
--- a/src/main/scala/gitbucket/core/model/Comment.scala
+++ b/src/main/scala/gitbucket/core/model/Comment.scala
@@ -20,8 +20,7 @@ trait IssueCommentComponent extends TemplateComponent { self: Profile =>
    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
    val updatedDate = column[java.util.Date]("UPDATED_DATE")
    def * =
-      (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate)
-        .<>(IssueComment.tupled, IssueComment.unapply)
+      (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)

    def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
  }
@@ -75,7 +74,7 @@ trait CommitCommentComponent extends TemplateComponent { self: Profile =>
        originalCommitId,
        originalOldLine,
        originalNewLine
-      ).<>(CommitComment.tupled, CommitComment.unapply)
+      ) <> (CommitComment.tupled, CommitComment.unapply)

    def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
  }
--- a/src/main/scala/gitbucket/core/model/CommitStatus.scala
+++ b/src/main/scala/gitbucket/core/model/CommitStatus.scala
@@ -4,8 +4,7 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
  import profile.api._
  import self._

-  implicit val commitStateColumnType: BaseColumnType[CommitState] =
-    MappedColumnType.base[CommitState, String](b => b.name, i => CommitState(i))
+  implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name, i => CommitState(i))

  lazy val CommitStatuses = TableQuery[CommitStatuses]
  class CommitStatuses(tag: Tag) extends Table[CommitStatus](tag, "COMMIT_STATUS") with CommitTemplate {
@@ -30,7 +29,7 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
        creator,
        registeredDate,
        updatedDate
-      ).<>((CommitStatus.apply _).tupled, CommitStatus.unapply)
+      ) <> ((CommitStatus.apply _).tupled, CommitStatus.unapply)
    def byPrimaryKey(id: Int) = commitStatusId === id.bind
  }
 }
@@ -78,7 +77,7 @@ object CommitState {

  val values: Vector[CommitState] = Vector(PENDING, SUCCESS, ERROR, FAILURE)

-  private val map: Map[String, CommitState] = values.map(e => e.name -> e).toMap
+  private val map: Map[String, CommitState] = values.map(enum => enum.name -> enum).toMap

  def apply(name: String): CommitState = map(name)

--- a/src/main/scala/gitbucket/core/model/CustomField.scala
+++ b/src/main/scala/gitbucket/core/model/CustomField.scala
@@ -1,191 +0,0 @@
-package gitbucket.core.model
-
-import gitbucket.core.controller.Context
-import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.util.StringUtil
-import gitbucket.core.view.helpers
-import org.scalatra.i18n.Messages
-
-trait CustomFieldComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
-
-  lazy val CustomFields = TableQuery[CustomFields]
-
-  class CustomFields(tag: Tag) extends Table[CustomField](tag, "CUSTOM_FIELD") with BasicTemplate {
-    val fieldId = column[Int]("FIELD_ID", O AutoInc)
-    val fieldName = column[String]("FIELD_NAME")
-    val fieldType = column[String]("FIELD_TYPE")
-    val enableForIssues = column[Boolean]("ENABLE_FOR_ISSUES")
-    val enableForPullRequests = column[Boolean]("ENABLE_FOR_PULL_REQUESTS")
-    def * =
-      (userName, repositoryName, fieldId, fieldName, fieldType, enableForIssues, enableForPullRequests)
-        .<>(CustomField.tupled, CustomField.unapply)
-
-    def byPrimaryKey(userName: String, repositoryName: String, fieldId: Int) =
-      (this.userName === userName.bind) && (this.repositoryName === repositoryName.bind) && (this.fieldId === fieldId.bind)
-  }
-}
-
-case class CustomField(
-  userName: String,
-  repositoryName: String,
-  fieldId: Int = 0,
-  fieldName: String,
-  fieldType: String, // long, double, string, or date
-  enableForIssues: Boolean,
-  enableForPullRequests: Boolean
-)
-
-trait CustomFieldBehavior {
-  def createHtml(repository: RepositoryInfo, fieldId: Int)(implicit conext: Context): String
-  def fieldHtml(repository: RepositoryInfo, issueId: Int, fieldId: Int, value: String, editable: Boolean)(
-    implicit context: Context
-  ): String
-  def validate(name: String, value: String, messages: Messages): Option[String]
-}
-
-object CustomFieldBehavior {
-  def validate(field: CustomField, value: String, messages: Messages): Option[String] = {
-    if (value.isEmpty) None
-    else {
-      CustomFieldBehavior(field.fieldType).flatMap { behavior =>
-        behavior.validate(field.fieldName, value, messages)
-      }
-    }
-  }
-
-  def apply(fieldType: String): Option[CustomFieldBehavior] = {
-    fieldType match {
-      case "long"   => Some(LongFieldBehavior)
-      case "double" => Some(DoubleFieldBehavior)
-      case "string" => Some(StringFieldBehavior)
-      case "date"   => Some(DateFieldBehavior)
-      case _        => None
-    }
-  }
-
-  case object LongFieldBehavior extends TextFieldBehavior {
-    override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      try {
-        value.toLong
-        None
-      } catch {
-        case _: NumberFormatException => Some(messages("error.number").format(name))
-      }
-    }
-  }
-  case object DoubleFieldBehavior extends TextFieldBehavior {
-    override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      try {
-        value.toDouble
-        None
-      } catch {
-        case _: NumberFormatException => Some(messages("error.number").format(name))
-      }
-    }
-  }
-  case object StringFieldBehavior extends TextFieldBehavior
-  case object DateFieldBehavior extends TextFieldBehavior {
-    private val pattern = "yyyy-MM-dd"
-    override protected val fieldType: String = "date"
-
-    override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      try {
-        new java.text.SimpleDateFormat(pattern).parse(value)
-        None
-      } catch {
-        case _: java.text.ParseException =>
-          Some(messages("error.datePattern").format(name, pattern))
-      }
-    }
-  }
-
-  trait TextFieldBehavior extends CustomFieldBehavior {
-    protected val fieldType = "text"
-
-    def createHtml(repository: RepositoryInfo, fieldId: Int)(implicit context: Context): String = {
-      val sb = new StringBuilder
-      sb.append(
-        s"""<input type="$fieldType" class="form-control input-sm" id="custom-field-$fieldId" name="custom-field-$fieldId" data-field-id="$fieldId" style="width: 120px;"/>"""
-      )
-      sb.append(s"""<script>
-                   |$$('#custom-field-$fieldId').focusout(function(){
-                   |  const $$this = $$(this);
-                   |  const fieldId = $$this.data('field-id');
-                   |  $$.post('${helpers.url(repository)}/issues/customfield_validation/' + fieldId,
-                   |    { value: $$this.val() },
-                   |    function(data){
-                   |      if (data != '') {
-                   |        $$('#custom-field-$fieldId-error').text(data);
-                   |      } else {
-                   |        $$('#custom-field-$fieldId-error').text('');
-                   |      }
-                   |    }
-                   |  );
-                   |});
-                   |</script>
-                   |""".stripMargin)
-      sb.toString()
-    }
-
-    def fieldHtml(repository: RepositoryInfo, issueId: Int, fieldId: Int, value: String, editable: Boolean)(
-      implicit context: Context
-    ): String = {
-      val sb = new StringBuilder
-      sb.append(
-        s"""<span id="custom-field-$fieldId-label" class="custom-field-label">${StringUtil
-             .escapeHtml(value)}</span>""".stripMargin
-      )
-      if (editable) {
-        sb.append(
-          s"""<input type="$fieldType" id="custom-field-$fieldId-editor" class="form-control input-sm custom-field-editor" data-field-id="$fieldId" style="width: 120px; display: none;"/>"""
-        )
-        sb.append(s"""<script>
-            |$$('#custom-field-$fieldId-label').click(function(){
-            |  const $$this = $$(this);
-            |  $$this.hide();
-            |  $$this.next().val($$this.text()).show().focus();
-            |});
-            |
-            |$$('#custom-field-$fieldId-editor').focusout(function(){
-            |  const $$this = $$(this);
-            |  const fieldId = $$this.data('field-id');
-            |  $$.post('${helpers.url(repository)}/issues/customfield_validation/' + fieldId,
-            |    { value: $$this.val() },
-            |    function(data){
-            |      if (data != '') {
-            |        $$('#custom-field-$fieldId-error').text(data);
-            |      } else {
-            |        $$('#custom-field-$fieldId-error').text('');
-            |        $$.post('${helpers.url(repository)}/issues/$issueId/customfield/' + fieldId,
-            |          { value: $$this.val() },
-            |          function(data){
-            |            $$this.hide();
-            |            $$this.prev().text(data).show();
-            |          }
-            |        );
-            |      }
-            |    }
-            |  );
-            |});
-            |
-            |// ESC key handling in text field
-            |$$('#custom-field-$fieldId-editor').keyup(function(e){
-            |  if (e.keyCode == 27) {
-            |    const $$this = $$(this);
-            |    $$this.hide();
-            |    $$this.prev().show();
-            |  }
-            |  if (e.keyCode == 13) {
-            |    $$('#custom-field-$fieldId-editor').blur();
-            |  }
-            |});
-            |</script>
-            |""".stripMargin)
-      }
-      sb.toString()
-    }
-
-    def validate(name: String, value: String, messages: Messages): Option[String] = None
-  }
-}
--- a/src/main/scala/gitbucket/core/model/DeployKey.scala
+++ b/src/main/scala/gitbucket/core/model/DeployKey.scala
@@ -11,7 +11,7 @@ trait DeployKeyComponent extends TemplateComponent { self: Profile =>
    val publicKey = column[String]("PUBLIC_KEY")
    val allowWrite = column[Boolean]("ALLOW_WRITE")
    def * =
-      (userName, repositoryName, deployKeyId, title, publicKey, allowWrite).<>(DeployKey.tupled, DeployKey.unapply)
+      (userName, repositoryName, deployKeyId, title, publicKey, allowWrite) <> (DeployKey.tupled, DeployKey.unapply)

    def byPrimaryKey(userName: String, repositoryName: String, deployKeyId: Int) =
      (this.userName === userName.bind) && (this.repositoryName === repositoryName.bind) && (this.deployKeyId === deployKeyId.bind)
--- a/src/main/scala/gitbucket/core/model/GpgKey.scala
+++ b/src/main/scala/gitbucket/core/model/GpgKey.scala
@@ -11,7 +11,7 @@ trait GpgKeyComponent { self: Profile =>
    val gpgKeyId = column[Long]("GPG_KEY_ID")
    val title = column[String]("TITLE")
    val publicKey = column[String]("PUBLIC_KEY")
-    def * = (userName, keyId, gpgKeyId, title, publicKey).<>(GpgKey.tupled, GpgKey.unapply)
+    def * = (userName, keyId, gpgKeyId, title, publicKey) <> (GpgKey.tupled, GpgKey.unapply)

    def byPrimaryKey(userName: String, keyId: Int) =
      (this.userName === userName.bind) && (this.keyId === keyId.bind)
--- a/src/main/scala/gitbucket/core/model/GroupMembers.scala
+++ b/src/main/scala/gitbucket/core/model/GroupMembers.scala
@@ -9,7 +9,7 @@ trait GroupMemberComponent { self: Profile =>
    val groupName = column[String]("GROUP_NAME", O PrimaryKey)
    val userName = column[String]("USER_NAME", O PrimaryKey)
    val isManager = column[Boolean]("MANAGER")
-    def * = (groupName, userName, isManager).<>(GroupMember.tupled, GroupMember.unapply)
+    def * = (groupName, userName, isManager) <> (GroupMember.tupled, GroupMember.unapply)
  }
 }

--- a/src/main/scala/gitbucket/core/model/Issue.scala
+++ b/src/main/scala/gitbucket/core/model/Issue.scala
@@ -27,6 +27,7 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
      with MilestoneTemplate
      with PriorityTemplate {
    val openedUserName = column[String]("OPENED_USER_NAME")
+    val assignedUserName = column[String]("ASSIGNED_USER_NAME")
    val title = column[String]("TITLE")
    val content = column[String]("CONTENT")
    val closed = column[Boolean]("CLOSED")
@@ -41,13 +42,14 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
        openedUserName,
        milestoneId.?,
        priorityId.?,
+        assignedUserName.?,
        title,
        content.?,
        closed,
        registeredDate,
        updatedDate,
        pullRequest
-      ).<>(Issue.tupled, Issue.unapply)
+      ) <> (Issue.tupled, Issue.unapply)

    def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
  }
@@ -60,6 +62,7 @@ case class Issue(
  openedUserName: String,
  milestoneId: Option[Int],
  priorityId: Option[Int],
+  assignedUserName: Option[String],
  title: String,
  content: Option[String],
  closed: Boolean,
--- a/src/main/scala/gitbucket/core/model/IssueAssignee.scala
+++ b/src/main/scala/gitbucket/core/model/IssueAssignee.scala
@@ -1,26 +0,0 @@
-package gitbucket.core.model
-
-trait IssueAssigneeComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
-  import self._
-
-  lazy val IssueAssignees = TableQuery[IssueAssignees]
-
-  class IssueAssignees(tag: Tag) extends Table[IssueAssignee](tag, "ISSUE_ASSIGNEE") with IssueTemplate {
-    val assigneeUserName = column[String]("ASSIGNEE_USER_NAME")
-    def * =
-      (userName, repositoryName, issueId, assigneeUserName)
-        .<>(IssueAssignee.tupled, IssueAssignee.unapply)
-
-    def byPrimaryKey(owner: String, repository: String, issueId: Int, assigneeUserName: String) = {
-      byIssue(owner, repository, issueId) && this.assigneeUserName === assigneeUserName.bind
-    }
-  }
-}
-
-case class IssueAssignee(
-  userName: String,
-  repositoryName: String,
-  issueId: Int,
-  assigneeUserName: String
-)
--- a/src/main/scala/gitbucket/core/model/IssueCustomFields.scala
+++ b/src/main/scala/gitbucket/core/model/IssueCustomFields.scala
@@ -1,31 +0,0 @@
-package gitbucket.core.model
-
-trait IssueCustomFieldComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
-  import self._
-
-  lazy val IssueCustomFields = TableQuery[IssueCustomFields]
-
-  class IssueCustomFields(tag: Tag) extends Table[IssueCustomField](tag, "ISSUE_CUSTOM_FIELD") {
-    val userName = column[String]("USER_NAME", O.PrimaryKey)
-    val repositoryName = column[String]("REPOSITORY_NAME", O.PrimaryKey)
-    val issueId = column[Int]("ISSUE_ID", O.PrimaryKey)
-    val fieldId = column[Int]("FIELD_ID", O.PrimaryKey)
-    val value = column[String]("VALUE")
-    def * =
-      (userName, repositoryName, issueId, fieldId, value)
-        .<>(IssueCustomField.tupled, IssueCustomField.unapply)
-
-    def byPrimaryKey(owner: String, repository: String, issueId: Int, fieldId: Int) = {
-      this.userName === owner.bind && this.repositoryName === repository.bind && this.issueId === issueId.bind && this.fieldId === fieldId.bind
-    }
-  }
-}
-
-case class IssueCustomField(
-  userName: String,
-  repositoryName: String,
-  issueId: Int,
-  fieldId: Int,
-  value: String
-)
--- a/Show More
+++ b/Show More