Update README.md

.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

.github/CODEOWNERS

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

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # The guidelines for contributing
 
 - At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
-- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before 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.

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,8 @@
 ### Before submitting an issue to GitBucket I have first:
 
-- [ ] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
+- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
-- [ ] searched for similar already existing issue
+- [] searched for similar already existing issue
-- [ ] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki)
+- [] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki) 
 
 *(if you have performed all the above, remove the paragraph and continue describing the issue with template below)*
 
@@ -12,7 +12,7 @@
 **Deployment mode**: *explain here how you use GitBucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
 
 **Problem description**:
-- *be as explicit 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)*

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

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

.github/workflows/build.yml

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

.gitignore

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

.scala-steward.conf

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

.scalafmt.conf

@@ -1,12 +0,0 @@
-version = "1.5.1"
-project.git = true
-
-maxColumn = 120
-docstrings = JavaDoc
-
-align.tokens = ["%", "%%", {code = "=>", owner = "Case"}]
-align.openParenCallSite = false
-align.openParenDefnSite = false
-continuationIndent.callSite = 2
-continuationIndent.defnSite = 2
-danglingParentheses = true

.travis.yml

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

CHANGELOG.md

@@ -1,191 +1,6 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-### 4.36.2 - 16 Aug 2021
-- Escape user name in avatar image tag
-
-### 4.36.1 - 22 Jul 2021
-- Bump gitbucket-gist-plugin to 4.21.0
-
-### 4.36.0 - 17 Jul 2021
-- Tag selector in the repository viewer
-- Link issues/pull requests of other repositories
-- Files and lines can be linked in the diff view
-- Option to disable XSS protection
-
-### 4.35.3 - 14 Jan 2021
-- Fix a bug that Wiki page cannot be deleted
-- Fix a deployment issue on Tomcat
-
-### 4.35.2 - 30 Dec 2020
-- Upgrade gitbucket-notifications-plugin to 1.10.0
-- Upgrade oauth2-oidc-sdk to 8.29.1 to solve dependency issue
-
-### 4.35.1 - 29 Dec 2020
-- Fix database migration issue which happens if webhook is configured
-- Call push webhook when pull request is merged
-- Show commit status at commits tab of pull request
-
-### 4.35.0 - 25 Dec 2020
-- Editor and source viewer color theme
-- Auto completion for issues and pull requests
-- Upload image from clipboard
-- Close multiple issues by commit comment
-- Create pull request from online editor
-- Milestone overview
-- Commit status at various places
-- WebAPI coverage improvements
-
-## 4.34.0 - 26 Jul 2020
-- Enhancement admin settings UI
-   - File upload settings
-   - Restrict repository operations
-   - User-defined CSS
-   - Limit the repository list in the sidebar
-- Improve MariaDB support
-- Improve activity logging
-- CLI option to persist session on disk in the standalone mode
-- Web API updates
-  - Add [list commits API](https://developer.github.com/v3/repos/commits/#list-commits)
-- Bundled plugins updates
-  - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin) 4.18.0 -> 4.19.0
-  - [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin) 1.8.0 -> 1.9.0
-
-## 4.33.0 - 31 Dec 2019
-- All CLI options are configurable by environment variables
-- Folding pull request files
-- WebHook security options
-- Add assignee and assignees properties to some Web APIs' response
-
-## 4.32.0 - 7 Aug 2019
-- Bump to Scala 2.13.0 and Scalatra 2.7.0
-- Draft pull request
-- Drop network installation of plugins
-- Compare view works for commit id
-- Apply default priority to pull requests
-- Focus title after clicking issue / pull request edit button
-
-## 4.31.2 - 7 Apr 2019
-- Bug and security fix
-
-## 4.31.1 - 17 Mar 2019
-- Bug fix
-
-## 4.31.0 - 17 Mar 2019
-- Docker support in CI plugin
-- Verify GPG key signed commit
-- OAuth2 Token (sent as a parameter) authentication support and new APIs in Web API
-- OGP (Open Graph protocol) support
-- Username completion with avatars
-
-## 4.30.1 - 22 Dec 2018
-- Bug fix for several WebHooks and Web API
-
-## 4.30.0 - 15 Dec 2018
-- Automatic ChangeLog Summary generation for new Releases
-- A lot of GitBucket Web API updates to increase compatibility with the GitHub API.
-- Display of checkboxes in Markdown files in Git repositories
-- A new extension point for plugins: anonymousAccessiblePaths
-- Group support in the Gist Plugin
-- Allow redirection to the Release Page from the Activity Timeline Page
-
-## 4.29.0 - 29 Sep 2018
-- Official Docker image has been available
-- Enhance file edit and delete buttons of the repository viewer
-- Fix Patch button to generate patches for all files in the commit
-- Display confirmation dialog for Transfer Ownership and Garbage collection
-- Fix wrong url encoding in "Compare & pull request"
-
-## 4.28.0 - 1 Sep 2018
-- Proxy support for plugin installation
-- Fix some bugs around pull requests
-
-## 4.27.0 - 29 Jul 2018
-- Create new tag on the browser
-- EditorConfig support
-- Improve issues / pull requests search
-- Some improvements and bug fixes for plugin installation via internet and pull request commenting
-
-## 4.26.0 - 30 Jun 2018
-- Installing plugins from the central registry
-- Repositories tab in the dashboard
-- Fork dialog enhancement
-- Adjust pull request creation suggestor
-- Keep showing incompleted task list
-- New notification hooks
-
-## 4.25.0 - 29 May 2018
-- Security improvements
-- Show mail address at the profile page
-- Task list on commit comments
-- More detailed editing history of issues and pull requests
-- Expose user public keys
-- Download repository improvements
-
-## 4.24.1 - 1 May 2018
-- Fix bug in Web API authentication
-
-## 4.24.0 - 30 Apr 2018
-- Diff for each review comment on pull requests
-- Extra mail addresses support
-- Show tags at the commit list
-- Keep wrap mode of the online editor
-- Renew layout of gitbucket-gist-plugin
-- Web API of gitbucket-ci-plugin
-
-## 4.23.1 - 10 Apr 2018
-- Fix bug that the contents API doesn't work for the repository root
-- Fix shutdown problem in Tomcat deployment
-- Render by plugins at the blob view even if it's a binary file
-
-## 4.23.0 - 31 Mar 2018
-- Allow tail slash in URL
-- Display commit message of tags at the releases page
-- Add labels property to issues and pull requests API response
-- Plugins list API
-- Git authentication with personal access token
-- Max parallel builds and max stored history in CI plugin became configurable
-
-## 4.22.0 - 3 Mar 2018
-- Pull request merge strategy settings
-- Create repository with an empty commit
-- Improve database viewer
-- Update maven-repository-plugin
-
-## 4.21.2 - 27 Jan 2018
-- Bugfix
-
-## 4.21.1 - 27 Jan 2018
-- Bugfix
-
-## 4.21.0 - 27 Jan 2018
-- Release page
-- OpenID Connect support
-- New database viewer
-- Submodule links to web page
-- Clarify close/reopen button
-
-## 4.20.0 - 23 Dec 2017
-- Squash and rebase merge strategy for pull requests
-- Quick pull request creation
-- Download patch from the diff view
-- Fork and create repository are proceeded asynchronously
-- Create new repository by copying existing git repository
-- Hide overflowed repository names in the sidebar
-- Support CreateEvent web hook
-- Display conflicting files if pull request can't be merged
-
-## 4.19.3 - 7 Dec 2017
-- Fix file uploading bug
-- Fix reply comment form behavior in the diff view
-
-## 4.19.2 - 3 Dec 2017
-- Fix routing bug in `CompositeScalatraFilter`
-- Resolve id attribute collision in the web hook editing form
-
-## 4.19.1 - 2 Dec 2017
-- Update gitbucket-notifications-plugin because it had a version compatibility issue
-
 ## 4.19.0 - 2 Dec 2017
 - [gitbucket-maven-repository-plugin](https://github.com/takezoe/gitbucket-maven-repository-plugin) is available
 - Upgrade to Scalatra 2.6

README.md

@@ -1,4 +1,4 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket/actions?query=workflow%3Abuild+branch%3Amaster) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
+GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket)
 =========
 
 GitBucket is a Git web platform powered by Scala offering:
@@ -8,8 +8,6 @@ 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
@@ -24,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/how_to_run.md).
+
 Installation
 --------
 GitBucket requires **Java8**. You have to install it, if it is not already installed.
@@ -31,6 +31,19 @@ GitBucket requires **Java8**. You have to install it, if it is not already insta
 1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
 2. Go to `http://[hostname]:8080/` and log in with ID: **root** / Pass: **root**.
 
+You can specify following options:
+
+- `--port=[NUMBER]`
+- `--prefix=[CONTEXTPATH]`
+- `--host=[HOSTNAME]`
+- `--gitbucket.home=[DATA_DIR]`
+- `--temp_dir=[TEMP_DIR]`
+- `--max_file_size=[MAX_FILE_SIZE]`
+
+`TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home.
+
+`MAX_FILE_SIZE` is the max file size for upload files.
+
 You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
 
 For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
@@ -48,31 +61,36 @@ 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.36.x
+What's New in 4.19.x
 -------------
-### 4.36.2 - 16 Aug 2021
-- Escape user name in avatar image tag
 
-### 4.36.1 - 22 Jul 2021
+### 4.19.3 - 7 Dec 2017
-- Bump gitbucket-gist-plugin to 4.21.0
 
-### 4.36.0 - 17 Jul 2021
+- Fix file uploading bug
-- Tag selector in the repository viewer
+- Fix reply comment form behavior in the diff view
-- Link issues/pull requests of other repositories
+
-- Files and lines can be linked in the diff view
+### 4.19.2 - 3 Dec 2017
-- Option to disable XSS protection
+
+- Fix routing bug in `CompositeScalatraFilter`
+- Resolve id attribute collision in the web hook editing form
+
+### 4.19.1 - 2 Dec 2017
+
+- Update gitbucket-notifications-plugin because it had a version compatibility issue
+
+### 4.19.0 - 2 Dec 2017
+
+- [gitbucket-maven-repository-plugin](https://github.com/takezoe/gitbucket-maven-repository-plugin) is available
+- Upgrade to Scalatra 2.6
+- Improve layout of the system settings page
+- New extension point (`sshCommandProvider`)
+- Dropped [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin) from bundled plugins temporary because we couldn't complete update for Scalatra 2.6 before this release.
 
 See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -1,123 +1,107 @@
-import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
+import com.typesafe.sbt.license.{LicenseInfo, DepModuleInfo}
-import com.jsuereth.sbtpgp.PgpKeys._
+import com.typesafe.sbt.pgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.36.2"
+val GitBucketVersion = "4.19.3"
-val ScalatraVersion = "2.8.2"
+val ScalatraVersion = "2.6.1"
-val JettyVersion = "9.4.44.v20210927"
+val JettyVersion = "9.4.7.v20170914"
-val JgitVersion = "5.13.0.202109080827-r"
 
-lazy val root = (project in file("."))
+lazy val root = (project in file(".")).enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin).settings(
-  .enablePlugins(SbtTwirl, ScalatraPlugin)
+
+)
 
 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.13.7"
+scalaVersion := "2.12.4"
-
-scalafmtOnCompile := true
-
-coverageExcludedPackages := ".*\\.html\\..*"
 
 // dependency settings
 resolvers ++= Seq(
   Classpaths.typesafeReleases,
   Resolver.jcenterRepo,
-  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
+  "amateras" at "http://amateras.sourceforge.jp/mvn/",
+  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/",
+  "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
 )
-
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.9.0.201710071750-r",
-  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.9.0.201710071750-r",
-  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-forms"               % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"              % "4.0.3" cross CrossVersion.for3Use2_13,
+  "org.json4s"                      %% "json4s-jackson"               % "3.5.1",
-  "commons-io"                      % "commons-io"                   % "2.11.0",
+  "commons-io"                      %  "commons-io"                   % "2.5",
-  "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
+  "io.github.gitbucket"             %  "solidbase"                    % "1.0.2",
-  "io.github.gitbucket"             % "markedj"                      % "1.0.16",
+  "io.github.gitbucket"             %  "markedj"                      % "1.0.15",
-  "org.apache.commons"              % "commons-compress"             % "1.21",
+  "org.apache.commons"              %  "commons-compress"             % "1.13",
-  "org.apache.commons"              % "commons-email"                % "1.5",
+  "org.apache.commons"              %  "commons-email"                % "1.4",
-  "commons-net"                     % "commons-net"                  % "3.8.0",
+  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.3",
-  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.13",
+  "org.apache.sshd"                 %  "apache-sshd"                  % "1.4.0" exclude("org.slf4j","slf4j-jdk14"),
-  "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.14",
-  "org.apache.tika"                 % "tika-core"                    % "2.1.0",
+  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.10",
-  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
   "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
-  "com.h2database"                  % "h2"                           % "1.4.199",
+  "com.h2database"                  %  "h2"                           % "1.4.195",
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.4",
+  "org.mariadb.jdbc"                %  "mariadb-java-client"          % "2.1.2",
-  "org.postgresql"                  % "postgresql"                   % "42.3.1",
+  "org.postgresql"                  %  "postgresql"                   % "42.0.0",
-  "ch.qos.logback"                  % "logback-classic"              % "1.2.6",
+  "ch.qos.logback"                  %  "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      % "HikariCP"                     % "4.0.3" exclude ("org.slf4j", "slf4j-api"),
+  "com.zaxxer"                      %  "HikariCP"                     % "2.6.1",
-  "com.typesafe"                    % "config"                       % "1.4.1",
+  "com.typesafe"                    %  "config"                       % "1.3.1",
-  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
+  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.0",
-  "io.github.java-diff-utils"       % "java-diff-utils"              % "4.11",
+  "fr.brouillard.oss.security.xhub" %  "xhub4j-core"                  % "1.0.0",
-  "org.cache2k"                     % "cache2k-all"                  % "1.6.0.Final",
+  "com.github.bkromhout"            %  "java-diff-utils"              % "2.1.1",
-  "net.coobird"                     % "thumbnailator"                % "0.4.14",
+  "org.cache2k"                     %  "cache2k-all"                  % "1.0.0.CR1",
+  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.0-akka-2.4.x" exclude("c3p0","c3p0"),
+  "net.coobird"                     %  "thumbnailator"                % "0.4.8",
   "com.github.zafarkhaja"           %  "java-semver"                  % "0.9.0",
-  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "9.19",
   "org.eclipse.jetty"               %  "jetty-webapp"                 % JettyVersion     % "provided",
   "javax.servlet"                   %  "javax.servlet-api"            % "3.1.0"          % "provided",
-  "junit"                           % "junit"                        % "4.13.2" % "test",
+  "junit"                           %  "junit"                        % "4.12"           % "test",
-  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.mockito"                     % "mockito-core"                 % "4.0.0" % "test",
+  "org.mockito"                     %  "mockito-core"                 % "2.7.22"         % "test",
-  "com.dimafeng"                    %% "testcontainers-scala"        % "0.39.11" % "test",
+  "com.wix"                         %  "wix-embedded-mysql"           % "2.1.4"          % "test",
-  "org.testcontainers"              % "mysql"                        % "1.16.2" % "test",
+  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.0"            % "test",
-  "org.testcontainers"              % "postgresql"                   % "1.16.2" % "test",
+  "net.i2p.crypto"                  % "eddsa"                         % "0.1.0"
-  "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
-  "is.tagomor.woothee"              % "woothee-java"                 % "1.11.0",
-  "org.ec4j.core"                   % "ec4j-core"                    % "0.3.0",
-  "org.kohsuke"                     % "github-api"                   % "1.135" % "test"
 )
 
-libraryDependencies ~= {
-  _.map {
-    case x if x.name == "twirl-api" =>
-      x cross CrossVersion.for3Use2_13
-    case x =>
-      x
-  }
-}
-
 // Compiler settings
-scalacOptions := Seq(
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
-  "-deprecation",
+javacOptions in compile ++= Seq("-target", "8", "-source", "8")
-  "-language:postfixOps",
+javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
-  "-opt:l:method",
-  "-feature",
-  "-Wunused:imports",
-  "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s"
-)
-compile / javacOptions ++= Seq("-target", "8", "-source", "8")
-Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml"
 
 // Test settings
 //testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
-Test / javaOptions += "-Dgitbucket.home=target/gitbucket_home_for_test"
+javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
-Test / testOptions += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
+testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
-Test / fork := true
+fork in Test := true
 
 // Packaging options
 packageOptions += Package.MainClass("JettyLauncher")
 
 // Assembly settings
-assembly / test := {}
+test in assembly := {}
-assembly / assemblyMergeStrategy := {
+assemblyMergeStrategy in assembly := {
   case PathList("META-INF", xs @ _*) =>
-    (xs map { _.toLowerCase }) match {
+    (xs map {_.toLowerCase}) match {
       case ("manifest.mf" :: Nil) => MergeStrategy.discard
       case _ => MergeStrategy.discard
     }
   case x => MergeStrategy.first
 }
 
+// JRebel
+//Seq(jrebelSettings: _*)
+
+//jrebel.webLinks += (target in webappPrepare).value
+//jrebel.enabled := System.getenv().get("JREBEL") != null
+javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
+ Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
+}
+
 // Exclude a war file from published artifacts
 signedArtifacts := {
-  signedArtifacts.value.filterNot {
+  signedArtifacts.value.filterNot { case (_, file) => file.getName.endsWith(".war") || file.getName.endsWith(".war.asc") }
-    case (_, file) => file.getName.endsWith(".war") || file.getName.endsWith(".war.asc")
-  }
 }
 
 // Create executable war file
@@ -135,16 +119,10 @@ libraryDependencies ++= Seq(
   "org.eclipse.jetty" % "jetty-util"         % JettyVersion % "executable"
 )
 
-// Run package task before test to generate target/webapp for integration test
-Test / test := {
-  _root_.sbt.Keys.`package`.value
-  (Test / test).value
-}
-
 val executableKey = TaskKey[File]("executable")
 executableKey := {
-  import java.util.jar.Attributes.{Name => AttrName}
+  import java.util.jar.{ Manifest => JarManifest }
-  import java.util.jar.{Manifest => JarManifest}
+  import java.util.jar.Attributes.{ Name => AttrName }
 
   val workDir   = Keys.target.value / "executable"
   val warName   = Keys.name.value + ".war"
@@ -159,9 +137,10 @@ executableKey := {
   // include jetty classes
   val jettyJars = Keys.update.value select configurationFilter(name = ExecutableConfig.name)
   jettyJars foreach { jar =>
-    IO unzip (jar, temp, (name: String) =>
+    IO unzip (jar, temp, (name:String) =>
       (name startsWith "javax/") ||
-        (name startsWith "org/"))
+      (name startsWith "org/")
+    )
   }
 
   // include original war file
@@ -169,8 +148,8 @@ 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" */ )
+  val launchClasses = Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */)
   launchClasses foreach { name =>
     IO copyFile (classDir / name, temp / name)
   }
@@ -178,37 +157,31 @@ executableKey := {
   // include plugins
   val pluginsDir = temp / "WEB-INF" / "classes" / "plugins"
   IO createDirectory (pluginsDir)
+  IO copyFile(Keys.baseDirectory.value / "plugins.json", pluginsDir / "plugins.json")
 
-  val plugins = IO readLines (Keys.baseDirectory.value / "src" / "main" / "resources" / "bundle-plugins.txt")
+  val json = IO read(Keys.baseDirectory.value / "plugins.json")
-  plugins.foreach { plugin =>
+  PluginsJson.parse(json).foreach { case (plugin, version, file) =>
-    plugin.trim.split(":") match {
+    val url = s"https://github.com/gitbucket/${plugin}/releases/download/${version}/${file}"
-      case Array(pluginId, pluginVersion) =>
-        val url = "https://github.com/" +
-          s"gitbucket/gitbucket-${pluginId}-plugin/releases/download/${pluginVersion}/gitbucket-${pluginId}-plugin-${pluginVersion}.jar"
     log info s"Download: ${url}"
-        IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
+    IO transfer(new java.net.URL(url).openStream, pluginsDir / file)
-      case _ => ()
-    }
   }
 
   // zip it up
   IO delete (temp / "META-INF" / "MANIFEST.MF")
-  val contentMappings = (temp.allPaths --- PathFinder(temp)).get pair { file =>
+  val contentMappings   = (temp.allPaths --- PathFinder(temp)).get pair { file => IO.relativizeFile(temp, file) }
-    IO.relativizeFile(temp, file)
-  }
   val manifest          = new JarManifest
   manifest.getMainAttributes put (AttrName.MANIFEST_VERSION, "1.0")
   manifest.getMainAttributes put (AttrName.MAIN_CLASS,       "JettyLauncher")
   val outputFile    = workDir / warName
-  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest, None)
+  IO jar (contentMappings.map { case (file, path) => (file, path.toString) } , outputFile, manifest)
 
   // generate checksums
   Seq(
     "md5"    -> "MD5",
     "sha1"   -> "SHA-1",
     "sha256" -> "SHA-256"
-  ).foreach {
+  )
-    case (extension, algorithm) =>
+  .foreach { case (extension, algorithm) =>
     val checksumFile = workDir / (warName + "." + extension)
     Checksums generate (outputFile, checksumFile, algorithm)
   }
@@ -223,9 +196,7 @@ publishTo := {
   else                                         Some("releases"  at nexus + "service/local/staging/deploy/maven2")
 }
 publishMavenStyle := true
-pomIncludeRepository := { _ =>
+pomIncludeRepository := { _ => false }
-  false
-}
 pomExtra := (
   <url>https://github.com/gitbucket/gitbucket</url>
   <licenses>
@@ -272,21 +243,7 @@ pomExtra := (
   </developers>
 )
 
-Test / testOptions ++= {
+licenseOverrides := {
-  if (scala.util.Properties.isWin) {
+  case DepModuleInfo("com.github.bkromhout", "java-diff-utils", _) =>
-    Seq(
+    LicenseInfo(LicenseCategory.Apache, "Apache-2.0", "http://www.apache.org/licenses/LICENSE-2.0")
-      Tests.Exclude(
-        Set(
-          "gitbucket.core.GitBucketCoreModuleSpec"
-        )
-      )
-    )
-  } else {
-    Nil
-  }
 }
-
-Jetty / javaOptions ++= Seq(
-  "-Xdebug",
-  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
-)

contrib/linux/redhat/selinux/gitbucket.te

@@ -1,21 +0,0 @@
-module gitbucket 1.0;
-
-require {
-	type smtp_port_t;
-	type tomcat_t;
-	type tomcat_var_lib_t;
-	type unreserved_port_t;
-
-	class file { execute };
-	class tcp_socket { name_bind };
-	class tcp_socket { name_connect };
-}
-
-# allow tomcat to send emails
-allow tomcat_t smtp_port_t:tcp_socket { name_connect };
-
-# allow file executes, required during repo creation
-allow tomcat_t tomcat_var_lib_t:file { execute };
-
-# allow tomcat to serve repositories via SSH
-allow tomcat_t unreserved_port_t:tcp_socket { name_bind };

contrib/linux/redhat/selinux/readme.md

@@ -1,32 +0,0 @@
-# Red Hat Enterprise Linux / CentOS SELinux policy module for GitBucket
-
-One way to run GitBucket on Enterprise Linux is under Tomcat. Since EL 7.4, Tomcat is no longer unconfined.
-Thus since 7.4, Enterprise Linux blocks certain operations that are required for GitBucket to work properly:
-
-* Tomcat is not allowed to connect to SMTP ports, which is required to send email notifications.
-* Tomcat is not allowed to execute files, which is required for creating repositories.
-* Tomcat is not allowed to act as a server on unreserved ports, which is required for serving repositories via SSH.
-
-To mitigate this, you can use the SELinux policy module provided as `gitbucket.te`. You can deploy the module with the
-attached script, e.g.:
-
-~~~
-./sedeploy.sh gitbucket
-~~~
-
-You most likely also need to fix file contexts on your system. Assuming a new, default Tomcat installation on 7.4, you
-can do so by issuing the following commands:
-
-~~~
-GITBUCKET_HOME='/usr/share/tomcat/.gitbucket'
-mkdir -p ${GITBUCKET_HOME}
-chown tomcat.tomcat ${GITBUCKET_HOME}
-semanage fcontext -a -t tomcat_var_lib_t "${GITBUCKET_HOME}(/.*)?"
-restorecon -rv ${GITBUCKET_HOME}
-
-JAVA_CONF='/usr/share/tomcat/.java'
-mkdir -p ${JAVA_CONF}
-chown tomcat.tomcat ${JAVA_CONF}
-semanage fcontext -a -t tomcat_cache_t "${JAVA_CONF}(/.*)?"
-restorecon -rv ${JAVA_CONF}
-~~~

contrib/linux/redhat/selinux/sedeploy.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MODULE=${1}
-
-# this will create a .mod file
-checkmodule -M -m -o ${MODULE}.mod ${MODULE}.te
-
-# this will create a compiled semodule
-semodule_package -m ${MODULE}.mod -o ${MODULE}.pp
-
-# this will install the module
-semodule -i ${MODULE}.pp

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.

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

doc/build.md

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

doc/comment_action.md

@@ -7,7 +7,7 @@ To determine if it was any operation, you see the `ACTION` column.
 And in the case of some actions, `CONTENT` column value contains additional information.
 
 |ACTION         |CONTENT          |
-|----------------|--------------------------|
+|---------------|-----------------|
 |comment        |comment          |
 |close_comment  |comment          |
 |reopen_comment |comment          |
@@ -17,15 +17,6 @@ And in the case of some actions, `CONTENT` column value contains additional info
 |merge          |comment          |
 |delete_branch  |branchName       |
 |refer          |issueId:title    |
-|add_label       |labelName                 |
-|delete_label    |labelName                 |
-|change_priority |oldPriority:priority      |
-|change_milestone|oldMilestone:milestone    |
-|assign          |oldAssigned:assigned      |
-|change_title    |oldTitle(CRLF)title \[1\] |
-
-\[1\]: (CRLF) is "\r\n"
-
 
 ### comment
 
@@ -63,27 +54,3 @@ Therefore, this comment is not displayed, and not counted as a comment.
 
 This value is saved when other issue or issue comment contains reference to the issue like `#issueId`.
 At the same time, store id and title of the referrer issue as `id:title`.
-
-### add_label
-
-This value is saved when users have added the label.
-
-### delete_label
-
-This value is saved when users have deleted the label.
-
-### change_priority
-
-This value is saved when users have changed the priority.
-
-### change_milestone
-
-This value is saved when users have changed the milestone.
-
-### assign
-
-This value is saved when users have assign issue/PR to user or remove the assign.
-
-### change_title
-
-This value is saved when users have changed the title.

doc/debug.md

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

doc/directory.md

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

doc/how_to_run.md

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

doc/jrebel.md

@@ -0,0 +1,120 @@
+JRebel integration (optional)
+=============================
+
+[JRebel](https://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
+JRebel is generally able to eliminate the need for the slow "app restart" per modification of codes. Alsp it's only used during development, and doesn't change your deployed app in any way.
+
+JRebel is not open source, but we can use it free for non-commercial use.
+
+----
+
+## 1. Get a JRebel license
+
+Sign up for a [myJRebel](https://my.jrebel.com/register). You will need to create an account.
+
+## 2. Download JRebel
+
+Download the most recent ["nosetup" JRebel zip](https://zeroturnaround.com/software/jrebel/download/prev-releases/).
+Next, unzip the downloaded file.
+
+## 3. Activate
+
+Follow `readme.txt` in the extracted directory to activate your downloaded JRebel.
+
+You don't need to integrate with your IDE, since we're using sbt to do the servlet deployment.
+
+## 4. Tell jvm where JRebel is
+
+Fortunately, the gitbucket project is already set up to use JRebel.
+You only need to tell jvm where to find the jrebel jar.
+
+To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux), and add the following line:
+
+```bash
+export JREBEL=/path/to/jrebel/legacy/jrebel.jar
+```
+
+For example, if you unzipped your JRebel download in your home directory, you whould use:
+
+```bash
+export JREBEL=~/jrebel/legacy/jrebel.jar
+```
+
+Now reload your shell:
+
+```
+$ source ~/.bash_profile # on Mac
+$ source ~/.bashrc       # on Linux
+```
+
+## 5. See it in action!
+
+Now you're ready to use JRebel with the gitbucket.
+When you run sbt as normal, you will see a long message from JRebel, indicating it has loaded.
+Here's an abbreviated version of what you will see:
+
+```
+$ ./sbt
+[info] Loading project definition from /git/gitbucket/project
+[info] Set current project to gitbucket (in build file:/git/gitbucket/)
+>
+```
+
+You will start the servlet container slightly differently now that you're using sbt.
+
+```
+> jetty:quickstart
+:
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  #############################################################
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  Legacy Agent 7.0.15 (201709080836)
+2017-09-21 15:46:35 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  Over the last 2 days JRebel prevented
+2017-09-21 15:46:35 JRebel:  at least 8 redeploys/restarts saving you about 0.3 hours.
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  Licensed to Naoki Takezoe (using myJRebel).
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  #############################################################
+2017-09-21 15:46:35 JRebel:
+:
+
+> ~compile
+[success] Total time: 2 s, completed 2017/09/21 15:50:06
+1. Waiting for source changes... (press enter to interrupt)
+```
+
+Finally, change your code.
+For example, you can change the title on `src/main/twirl/gitbucket/core/main.scala.html` like this:
+
+```html
+:
+  <a href="@context.path/" class="logo">
+    <img src="@helpers.assets("/common/images/gitbucket.svg")" style="width: 24px; height: 24px; display: inline;"/>
+    GitBucket
+    change code !!!!!!!!!!!!!!!!
+    <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span>
+  </a>
+:
+```
+
+If JRebel is doing is correctly installed you will see a notice for you:
+
+```
+1. Waiting for source changes... (press enter to interrupt)
+[info] Compiling 1 Scala source to /Users/naoki.takezoe/gitbucket/target/scala-2.12/classes...
+[success] Total time: 1 s, completed 2017/09/21 15:55:40
+```
+
+And you reload browser, JRebel give notice of that it has reloaded classes:
+
+```
+2. Waiting for source changes... (press enter to interrupt)
+2017-09-21 15:55:40 JRebel: Reloading class 'gitbucket.core.html.main$'.
+```
+
+## 6. Limitations
+
+JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routing patterns, there is nothing JRebel can do, you will have to restart by `jetty:quickstart`.

doc/licenses.md

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

doc/readme.md

@@ -1,7 +1,6 @@
 Developer's Guide
 ========
- * [Build from source tree](build.md)
+ * [How to run from source tree](how_to_run.md)
- * [Debug on IntelliJ](debug.md)
  * [Directory Structure](directory.md)
  * [Mapping and Validation](validation.md)
  * [Authentication in Controller](authenticator.md)
@@ -9,4 +8,5 @@ Developer's Guide
  * [Activity Types](activity.md)
  * [Automatic Schema Updating](auto_update.md)
  * [Release Operation](release.md)
+ * [JRebel integration (optional)](jrebel.md)
  * [Licenses](licenses.md)

doc/release.md

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

doc/validation.md

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

plugins.json

@@ -0,0 +1,41 @@
+[
+  {
+    "id": "notifications",
+    "name": "Notifications Plugin",
+    "description": "Provides notifications feature on GitBucket.",
+    "versions": [
+      {
+        "version": "1.4.0",
+        "range": ">=4.19.0",
+        "file": "gitbucket-notifications-plugin_2.12-1.4.0.jar"
+      }
+    ],
+    "default": true
+  },
+  {
+    "id": "emoji",
+    "name": "Emoji Plugin",
+    "description": "Provides Emoji support for GitBucket.",
+    "versions": [
+      {
+        "version": "4.5.0",
+        "range": ">=4.18.0",
+        "file": "gitbucket-emoji-plugin_2.12-4.5.0.jar"
+      }
+    ],
+    "default": false
+  },
+  {
+    "id": "gist",
+    "name": "Gist Plugin",
+    "description": "Provides Gist feature on GitBucket.",
+    "versions": [
+      {
+        "version": "4.11.0",
+        "range": ">=4.19.0",
+        "file": "gitbucket-gist-plugin-assembly-4.11.0.jar"
+      }
+    ],
+    "default": false
+  }
+]

project/Checksums.scala

@@ -6,19 +6,19 @@ import io._
 object Checksums {
   private val bufferSize = 2048
 
-  def generate(source: File, target: File, algorithm: String): Unit =
+  def generate(source:File, target:File, algorithm:String):Unit =
       sbt.IO write (target, compute(source, algorithm))
 
-  def compute(file: File, algorithm: String): String =
+  def compute(file:File, algorithm:String):String =
       hex(raw(file, algorithm))
 
-  def raw(file: File, algorithm: String): Array[Byte] =
+  def raw(file:File, algorithm:String):Array[Byte]    =
       (Using fileInputStream file) { is =>
         val md  = MessageDigest getInstance algorithm
         val buf = new Array[Byte](bufferSize)
         md.reset()
         @tailrec
-      def loop(): Unit = {
+        def loop() {
           val len = is read buf
           if (len != -1) {
             md update (buf, 0, len)
@@ -29,8 +29,6 @@ object Checksums {
         md.digest()
       }
 
-  def hex(bytes: Array[Byte]): String =
+  def hex(bytes:Array[Byte]):String =
-    bytes map { it =>
+      bytes map { it => "%02x" format (it.toInt & 0xff) } mkString ""
-      "%02x" format (it.toInt & 0xff)
-    } mkString ""
 }

project/PluginsJson.scala

@@ -3,13 +3,19 @@ import scala.collection.JavaConverters._
 
 object PluginsJson {
 
-  def getUrls(json: String): Seq[String] = {
+  def parse(json: String): Seq[(String, String, String)] = {
     val value = Json.parse(json)
     value.asArray.values.asScala.map { plugin =>
       val pluginObject = plugin.asObject
+      val pluginName = "gitbucket-" + pluginObject.get("id").asString + "-plugin"
+
       val latestVersionObject = pluginObject.get("versions").asArray.asScala.head.asObject
-      latestVersionObject.get("url").asString
+      val file = latestVersionObject.get("file").asString
+      val version = latestVersionObject.get("version").asString
+
+      (pluginName, version, file)
     }
   }
 
 }
+

project/build.properties

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

project/build.sbt

@@ -1 +1 @@
-libraryDependencies += "com.eclipsesource.minimal-json" % "minimal-json" % "0.9.5"
+libraryDependencies += "com.eclipsesource.minimal-json" % "minimal-json" % "0.9.4"

project/plugins.sbt

@@ -1,11 +1,10 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("org.scalameta"    % "sbt-scalafmt"       % "2.4.3")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.12")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"          % "1.5.1")
+addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.5")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly"       % "1.1.0")
+//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
-addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"       % "1.0.4")
+//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
-addSbtPlugin("com.github.sbt"   % "sbt-pgp"            % "2.1.2")
+addSbtPlugin("org.scalatra.sbt"     % "sbt-scalatra"      % "1.0.1")
+addSbtPlugin("com.jsuereth"         % "sbt-pgp"           % "1.1.0")
+addSbtPlugin("io.get-coursier"      % "sbt-coursier"      % "1.0.0-RC13")
 addSbtPlugin("com.typesafe.sbt"     % "sbt-license-report" % "1.2.0")
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"      % "1.9.2")
-
-addDependencyTreePlugin

project/project/plugins.sbt

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

src/main/java/JettyLauncher.java

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

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

@@ -20,15 +20,15 @@ public class PatchUtil {
     public static String apply(String source, String patch, FileHeader fh)
             throws IOException, PatchApplyException {
         RawText rt = new RawText(source.getBytes("UTF-8"));
-        List<String> oldLines = new ArrayList<>(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;

src/main/resources/bundle-plugins.txt

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

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

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

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

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <createTable tableName="RELEASE">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="TAG" type="varchar(100)" nullable="false"/>
-    <column name="NAME" type="varchar(100)" nullable="false"/>
-    <column name="AUTHOR" type="varchar(100)" nullable="false"/>
-    <column name="CONTENT" type="text" nullable="true"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_RELEASE_PK" tableName="RELEASE" columnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
-  <addForeignKeyConstraint constraintName="IDX_RELEASE_FK0" baseTableName="RELEASE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <createTable tableName="RELEASE_ASSET">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="TAG" type="varchar(100)" nullable="false"/>
-    <column name="RELEASE_ASSET_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="FILE_NAME" type="varchar(260)" nullable="false"/>
-    <column name="LABEL" type="varchar(100)" nullable="true"/>
-    <column name="SIZE" type="bigint" nullable="false"/>
-    <column name="UPLOADER" type="varchar(100)" nullable="false"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_RELEASE_ASSET_PK" tableName="RELEASE_ASSET" columnNames="USER_NAME, REPOSITORY_NAME, TAG, FILE_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_RELEASE_ASSET_FK1" baseTableName="RELEASE_ASSET" baseColumnNames="USER_NAME, REPOSITORY_NAME, TAG" referencedTableName="RELEASE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
-
-  <createTable tableName="ACCOUNT_FEDERATION">
-    <column name="ISSUER" type="varchar(100)" nullable="false"/>
-    <column name="SUBJECT" type="varchar(100)" nullable="false"/>
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_ACCOUNT_FEDERATION_PK" tableName="ACCOUNT_FEDERATION" columnNames="ISSUER, SUBJECT"/>
-  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_FEDERATION_FK0" baseTableName="ACCOUNT_FEDERATION" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-</changeSet>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <addColumn tableName="REPOSITORY">
-    <column name="MERGE_OPTIONS" type="varchar(200)" nullable="false" defaultValue="merge-commit,squash,rebase"/>
-    <column name="DEFAULT_MERGE_OPTION" type="varchar(100)" nullable="false" defaultValue="merge-commit"/>
-  </addColumn>
-</changeSet>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <dropForeignKeyConstraint baseTableName="RELEASE_ASSET" constraintName="IDX_RELEASE_ASSET_FK1"/>
-
-  <dropForeignKeyConstraint baseTableName="RELEASE" constraintName="IDX_RELEASE_FK0"/>
-  <dropPrimaryKey tableName="RELEASE" constraintName="IDX_RELEASE_PK"/>
-
-  <renameTable newTableName="RELEASE_TAG" oldTableName="RELEASE" />
-
-  <addPrimaryKey constraintName="IDX_RELEASE_TAG_PK" tableName="RELEASE_TAG" columnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
-  <addForeignKeyConstraint constraintName="IDX_RELEASE_TAG_FK0" baseTableName="RELEASE_TAG" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <addForeignKeyConstraint constraintName="IDX_RELEASE_ASSET_FK0" baseTableName="RELEASE_ASSET" baseColumnNames="USER_NAME, REPOSITORY_NAME, TAG" referencedTableName="RELEASE_TAG" referencedColumnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
-</changeSet>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <createTable tableName="ACCOUNT_EXTRA_MAIL_ADDRESS">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="EXTRA_MAIL_ADDRESS" type="varchar(100)" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ACCOUNT_EXTRA_MAIL_ADDRESS_PK" tableName="ACCOUNT_EXTRA_MAIL_ADDRESS" columnNames="USER_NAME, EXTRA_MAIL_ADDRESS"/>
-  <addUniqueConstraint constraintName="IDX_ACCOUNT_EXTRA_MAIL_ADDRESS_1" tableName="ACCOUNT_EXTRA_MAIL_ADDRESS" columnNames="EXTRA_MAIL_ADDRESS"/>
-</changeSet>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <modifyDataType columnName="PASSWORD" newDataType="varchar(200)" tableName="ACCOUNT"/>
-
-  <delete tableName="ACCOUNT_EXTRA_MAIL_ADDRESS">
-    <where>EXTRA_MAIL_ADDRESS = ''</where>
-  </delete>
-</changeSet>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <addColumn tableName="COMMIT_COMMENT">
-    <column name="ORIGINAL_COMMIT_ID" type="varchar(100)" nullable="true"/>
-    <column name="ORIGINAL_OLD_LINE" type="int" nullable="true"/>
-    <column name="ORIGINAL_NEW_LINE" type="int" nullable="true"/>
-  </addColumn>
-  <update tableName="COMMIT_COMMENT">
-    <column name="ORIGINAL_COMMIT_ID" valueComputed="COMMIT_ID"/>
-    <column name="ORIGINAL_OLD_LINE" valueComputed="OLD_LINE_NUMBER"/>
-    <column name="ORIGINAL_NEW_LINE" valueComputed="NEW_LINE_NUMBER"/>
-  </update>
-  <addNotNullConstraint columnName="ORIGINAL_COMMIT_ID" tableName="COMMIT_COMMENT" columnDataType="varchar(100)"/>
-</changeSet>

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

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

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

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

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

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

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>

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>

src/main/scala/ScalatraBootstrap.scala

@@ -1,41 +1,36 @@
+
 import java.util.EnumSet
 import javax.servlet._
 
-import gitbucket.core.controller.{ReleaseController, _}
+import gitbucket.core.controller._
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.servlet._
 import gitbucket.core.util.Directory
 import org.scalatra._
 
+
 class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
-  override def init(context: ServletContext): Unit = {
+  override def init(context: ServletContext) {
 
     val settings = loadSystemSettings()
-    if (settings.baseUrl.exists(_.startsWith("https://"))) {
+    if(settings.baseUrl.exists(_.startsWith("https://"))) {
       context.getSessionCookieConfig.setSecure(true)
     }
 
-    // Register TransactionFilter at first
+    // Register TransactionFilter and BasicAuthenticationFilter at first
     context.addFilter("transactionFilter", new TransactionFilter)
-    context
+    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
-      .getFilterRegistration("transactionFilter")
-      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
     context.addFilter("gitAuthenticationFilter", new GitAuthenticationFilter)
-    context
+    context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
-      .getFilterRegistration("gitAuthenticationFilter")
-      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
     context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
-    context
+    context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
-      .getFilterRegistration("apiAuthenticationFilter")
-      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/*")
 
     // Register controllers
     context.mount(new PreProcessController, "/*")
 
     context.addFilter("pluginControllerFilter", new PluginControllerFilter)
-    context
+    context.getFilterRegistration("pluginControllerFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
-      .getFilterRegistration("pluginControllerFilter")
-      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
     context.mount(new FileUploadController, "/upload")
 
@@ -52,17 +47,14 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     filter.mount(new MilestonesController, "/*")
     filter.mount(new IssuesController, "/*")
     filter.mount(new PullRequestsController, "/*")
-    filter.mount(new ReleaseController, "/*")
     filter.mount(new RepositorySettingsController, "/*")
 
     context.addFilter("compositeScalatraFilter", filter)
-    context
+    context.getFilterRegistration("compositeScalatraFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
-      .getFilterRegistration("compositeScalatraFilter")
-      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
     // Create GITBUCKET_HOME directory if it does not exist
     val dir = new java.io.File(Directory.GitBucketHome)
-    if (!dir.exists) {
+    if(!dir.exists){
       dir.mkdirs()
     }
   }

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

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

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

@@ -1,9 +0,0 @@
-package gitbucket.core.api
-
-case class AddACollaborator(permission: String) {
-  val role: String = permission match {
-    case "admin" => "ADMIN"
-    case "push"  => "DEVELOPER"
-    case "pull"  => "GUEST"
-  }
-}

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

@@ -6,14 +6,13 @@ import gitbucket.core.util.RepositoryName
  * https://developer.github.com/v3/repos/#get-branch
  * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
  */
-case class ApiBranch(name: String, commit: ApiBranchCommit, protection: ApiBranchProtection)(
+case class ApiBranch(
-  repositoryName: RepositoryName
+  name: String,
-) extends FieldSerializable {
+  commit: ApiBranchCommit,
-  val _links =
+  protection: ApiBranchProtection)(repositoryName:RepositoryName) extends FieldSerializable {
-    Map(
+  def _links = Map(
    "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
-      "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}")
+   "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}"))
-    )
 }
 
 case class ApiBranchCommit(sha: String)
@@ -22,12 +21,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
-)

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

@@ -4,78 +4,43 @@ import gitbucket.core.service.ProtectedBranchService
 import org.json4s._
 
 /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(
+case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]){
-  url: Option[ApiPath], // for output
-  enabled: Boolean,
-  required_status_checks: Option[ApiBranchProtection.Status]
-) {
   def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
 }
 
-object ApiBranchProtection {
+object ApiBranchProtection{
-
   /** form for enabling-and-disabling-branch-protection */
   case class EnablingAndDisabling(protection: ApiBranchProtection)
 
-  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection =
+  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection = ApiBranchProtection(
-    ApiBranchProtection(
-      url = Some(
-        ApiPath(
-          s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection"
-        )
-      ),
     enabled = info.enabled,
-      required_status_checks = Some(
+    required_status_checks = Some(Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)))
-        Status(
+  val statusNone = Status(Off, Seq.empty)
-          Some(
+  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
-            ApiPath(
-              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks"
-            )
-          ),
-          EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators),
-          info.contexts,
-          Some(
-            ApiPath(
-              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks/contexts"
-            )
-          )
-        )
-      )
-    )
-  val statusNone = Status(None, Off, Seq.empty, None)
-  case class Status(
-    url: Option[ApiPath], // for output
-    enforcement_level: EnforcementLevel,
-    contexts: Seq[String],
-    contexts_url: Option[ApiPath] // for output
-  )
   sealed class EnforcementLevel(val name: String)
   case object Off extends EnforcementLevel("off")
   case object NonAdmins extends EnforcementLevel("non_admins")
   case object Everyone extends EnforcementLevel("everyone")
   object EnforcementLevel {
-    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel =
+    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel = if(enabled){
-      if (enabled) {
+      if(includeAdministrators){
-        if (includeAdministrators) {
         Everyone
-        } else {
+      }else{
         NonAdmins
       }
-      } else {
+    }else{
       Off
     }
   }
 
-  implicit val enforcementLevelSerializer: CustomSerializer[EnforcementLevel] = new CustomSerializer[EnforcementLevel](
+  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](format => (
-    format =>
-      (
    {
      case JString("off") => Off
      case JString("non_admins") => NonAdmins
      case JString("everyone") => Everyone
-        }, {
+   },
+   {
      case x: EnforcementLevel => JString(x.name)
    }
-    )
+ ))
-  )
 }

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

@@ -2,6 +2,7 @@ package gitbucket.core.api
 
 import gitbucket.core.model.{Account, CommitState, CommitStatus}
 
+
 /**
  * https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
  */
@@ -10,22 +11,15 @@ case class ApiCombinedCommitStatus(
   sha: String,
   total_count: Int,
   statuses: Iterable[ApiCommitStatus],
-  repository: ApiRepository
+  repository: ApiRepository){
-) {
   // val commit_url = ApiPath(s"/api/v3/repos/${repository.full_name}/${sha}")
   val url = ApiPath(s"/api/v3/repos/${repository.full_name}/commits/${sha}/status")
 }
 object ApiCombinedCommitStatus {
-  def apply(
+  def apply(sha:String, statuses: Iterable[(CommitStatus, Account)], repository:ApiRepository): ApiCombinedCommitStatus = ApiCombinedCommitStatus(
-    sha: String,
-    statuses: Iterable[(CommitStatus, Account)],
-    repository: ApiRepository
-  ): ApiCombinedCommitStatus =
-    ApiCombinedCommitStatus(
     state      = CommitState.combine(statuses.map(_._1.state).toSet).name,
     sha        = sha,
-      total_count = statuses.size,
+    total_count= statuses.size,
-      statuses = statuses.map { case (s, a) => ApiCommitStatus(s, ApiUser(a)) },
+    statuses   = statuses.map{ case (s, a)=> ApiCommitStatus(s, ApiUser(a)) },
-      repository = repository
+    repository = repository)
-    )
 }

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

@@ -5,32 +5,25 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
+
 /**
  * https://developer.github.com/v3/issues/comments/
  */
-case class ApiComment(id: Int, user: ApiUser, body: String, created_at: Date, updated_at: Date)(
+case class ApiComment(
-  repositoryName: RepositoryName,
+  id: Int,
-  issueId: Int,
+  user: ApiUser,
-  isPullRequest: Boolean
+  body: String,
-) {
+  created_at: Date,
-  val html_url = ApiPath(
+  updated_at: Date)(repositoryName: RepositoryName, issueId: Int, isPullRequest: Boolean){
-    s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${issueId}#comment-${id}"
+  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${issueId}#comment-${id}")
-  )
 }
 
-object ApiComment {
+object ApiComment{
-  def apply(
+  def apply(comment: IssueComment, repositoryName: RepositoryName, issueId: Int, user: ApiUser, isPullRequest: Boolean): ApiComment =
-    comment: IssueComment,
-    repositoryName: RepositoryName,
-    issueId: Int,
-    user: ApiUser,
-    isPullRequest: Boolean
-  ): ApiComment =
     ApiComment(
       id = comment.commentId,
       user = user,
       body = comment.content,
       created_at = comment.registeredDate,
-      updated_at = comment.updatedDate
+      updated_at = comment.updatedDate)(repositoryName, issueId, isPullRequest)
-    )(repositoryName, issueId, isPullRequest)
 }

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

@@ -20,31 +20,38 @@ case class ApiCommit(
   removed: List[String],
   modified: List[String],
   author: ApiPersonIdent,
-  committer: ApiPersonIdent
+  committer: ApiPersonIdent)(repositoryName:RepositoryName, urlIsHtmlUrl: Boolean) extends FieldSerializable{
-)(repositoryName: RepositoryName)
+  val url = if(urlIsHtmlUrl){
-    extends FieldSerializable {
+    ApiPath(s"/${repositoryName.fullName}/commit/${id}")
-  val url = ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
+  }else{
-  val html_url = ApiPath(s"/${repositoryName.fullName}/commit/${id}")
+    ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
+  }
+  val html_url = if(urlIsHtmlUrl){
+    None
+  }else{
+    Some(ApiPath(s"/${repositoryName.fullName}/commit/${id}"))
+  }
 }
 
-object ApiCommit {
+object ApiCommit{
-  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = {
+  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo, urlIsHtmlUrl: Boolean = false): ApiCommit = {
-    val diffs = JGitUtil.getDiffs(git, None, commit.id, false, false)
+    val diffs = JGitUtil.getDiffs(git, commit.id, false)
     ApiCommit(
       id        = commit.id,
       message   = commit.fullMessage,
       timestamp = commit.commitTime,
-      added = diffs.collect {
+      added     = diffs._1.collect {
         case x if x.changeType == DiffEntry.ChangeType.ADD    => x.newPath
       },
-      removed = diffs.collect {
+      removed   = diffs._1.collect {
         case x if x.changeType == DiffEntry.ChangeType.DELETE => x.oldPath
       },
-      modified = diffs.collect {
+      modified  = diffs._1.collect {
         case x if x.changeType != DiffEntry.ChangeType.ADD && x.changeType != DiffEntry.ChangeType.DELETE => x.newPath
       },
       author    = ApiPersonIdent.author(commit),
       committer = ApiPersonIdent.committer(commit)
-    )(repositoryName)
+    )(repositoryName, urlIsHtmlUrl)
   }
+  def forPushPayload(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = apply(git, repositoryName, commit, true)
 }

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

@@ -4,6 +4,7 @@ import gitbucket.core.api.ApiCommitListItem._
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.RepositoryName
 
+
 /**
  * https://developer.github.com/v3/repos/commits/
  */
@@ -12,14 +13,12 @@ case class ApiCommitListItem(
   commit: Commit,
   author: Option[ApiUser],
   committer: Option[ApiUser],
-  parents: Seq[Parent]
+  parents: Seq[Parent])(repositoryName: RepositoryName) {
-)(repositoryName: RepositoryName) {
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}")
 }
 
 object ApiCommitListItem {
-  def apply(commit: CommitInfo, repositoryName: RepositoryName): ApiCommitListItem =
+  def apply(commit: CommitInfo, repositoryName: RepositoryName): ApiCommitListItem = ApiCommitListItem(
-    ApiCommitListItem(
     sha    = commit.id,
     commit = Commit(
       message   = commit.fullMessage,
@@ -28,17 +27,16 @@ object ApiCommitListItem {
       )(commit.id, repositoryName),
     author    = None,
     committer = None,
-      parents = commit.parents.map(Parent(_)(repositoryName))
+    parents   = commit.parents.map(Parent(_)(repositoryName)))(repositoryName)
-    )(repositoryName)
 
-  case class Parent(sha: String)(repositoryName: RepositoryName) {
+  case class Parent(sha: String)(repositoryName: RepositoryName){
     val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}")
   }
 
-  case class Commit(message: String, author: ApiPersonIdent, committer: ApiPersonIdent)(
+  case class Commit(
-    sha: String,
+    message: String,
-    repositoryName: RepositoryName
+    author: ApiPersonIdent,
-  ) {
+    committer: ApiPersonIdent)(sha:String, repositoryName: RepositoryName) {
     val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/commits/${sha}")
   }
 }

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

@@ -5,6 +5,7 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
+
 /**
  * https://developer.github.com/v3/repos/statuses/#create-a-status
  * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
@@ -22,14 +23,14 @@ case class ApiCommitStatus(
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}/statuses")
 }
 
+
 object ApiCommitStatus {
-  def apply(status: CommitStatus, creator: ApiUser): ApiCommitStatus =
+  def apply(status: CommitStatus, creator:ApiUser): ApiCommitStatus = ApiCommitStatus(
-    ApiCommitStatus(
     created_at = status.registeredDate,
     updated_at = status.updatedDate,
     state      = status.state.name,
     target_url = status.targetUrl,
-      description = status.description,
+    description= status.description,
     id         = status.commitStatusId,
     context    = status.context,
     creator    = creator

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

@@ -51,25 +51,20 @@ object ApiCommits {
     patch: String
   )
 
-  def apply(
+
-    repositoryName: RepositoryName,
+  def apply(repositoryName: RepositoryName, commitInfo: CommitInfo, diffs: Seq[DiffInfo], author: Account, committer: Account,
-    commitInfo: CommitInfo,
+            commentCount: Int): ApiCommits = {
-    diffs: Seq[DiffInfo],
-    author: Account,
-    committer: Account,
-    commentCount: Int
-  ): ApiCommits = {
     val files = diffs.map { diff =>
       var additions = 0
       var deletions = 0
 
       diff.patch.getOrElse("").split("\n").foreach { line =>
-        if (line.startsWith("+")) additions = additions + 1
+        if(line.startsWith("+")) additions = additions + 1
-        if (line.startsWith("-")) deletions = deletions + 1
+        if(line.startsWith("-")) deletions = deletions + 1
       }
 
       File(
-        filename = if (diff.changeType == ChangeType.DELETE) { diff.oldPath } else { diff.newPath },
+        filename = if(diff.changeType == ChangeType.DELETE){ diff.oldPath } else { diff.newPath },
         additions = additions,
         deletions = deletions,
         changes = additions + deletions,
@@ -80,12 +75,12 @@ object ApiCommits {
           case ChangeType.RENAME => "renamed"
           case ChangeType.COPY   => "copied"
         },
-        raw_url = if (diff.changeType == ChangeType.DELETE) {
+        raw_url = if(diff.changeType == ChangeType.DELETE){
           ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.parents.head}/${diff.oldPath}")
         } else {
           ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.id}/${diff.newPath}")
         },
-        blob_url = if (diff.changeType == ChangeType.DELETE) {
+        blob_url = if(diff.changeType == ChangeType.DELETE){
           ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.parents.head}/${diff.oldPath}")
         } else {
           ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.id}/${diff.newPath}")
@@ -98,7 +93,7 @@ object ApiCommits {
       url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
       sha = commitInfo.id,
       html_url = ApiPath(s"${repositoryName.fullName}/commit/${commitInfo.id}"),
-      comment_url = ApiPath(""), // TODO no API for commit comment
+      comment_url = ApiPath(""),
       commit = Commit(
         url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
         author = ApiPersonIdent.author(commitInfo),

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

@@ -11,29 +11,18 @@ case class ApiContents(
   path: String,
   sha: String,
   content: Option[String],
-  encoding: Option[String]
+  encoding: Option[String])(repositoryName: RepositoryName){
-)(repositoryName: RepositoryName) {
   val download_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/raw/${sha}/${path}")
 }
 
-object ApiContents {
+object ApiContents{
   def apply(fileInfo: FileInfo, repositoryName: RepositoryName, content: Option[Array[Byte]]): ApiContents = {
-    if (fileInfo.isDirectory) {
+    if(fileInfo.isDirectory) {
       ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)
     } else {
-      content
+      content.map(arr =>
-        .map(
+        ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.getEncoder.encodeToString(arr)), Some("base64"))(repositoryName)
-          arr =>
+      ).getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
-            ApiContents(
-              "file",
-              fileInfo.name,
-              fileInfo.path,
-              fileInfo.id.getName,
-              Some(Base64.getEncoder.encodeToString(arr)),
-              Some("base64")
-            )(repositoryName)
-        )
-        .getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
     }
   }
 }

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

@@ -1,3 +1,5 @@
 package gitbucket.core.api
 
-case class ApiError(message: String, documentation_url: Option[String] = None)
+case class ApiError(
+  message: String,
+  documentation_url: Option[String] = None)

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

@@ -1,20 +0,0 @@
-package gitbucket.core.api
-
-import java.util.Date
-
-import gitbucket.core.model.Account
-
-case class ApiGroup(login: String, description: Option[String], created_at: Date) {
-  val id = 0 // dummy id
-  val url = ApiPath(s"/api/v3/orgs/${login}")
-  val html_url = ApiPath(s"/${login}")
-  val avatar_url = ApiPath(s"/${login}/_avatar")
-}
-
-object ApiGroup {
-  def apply(group: Account): ApiGroup = ApiGroup(
-    login = group.userName,
-    description = group.description,
-    created_at = group.registeredDate
-  )
-}

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

@@ -5,6 +5,7 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
+
 /**
  * https://developer.github.com/v3/issues/
  */
@@ -12,51 +13,33 @@ case class ApiIssue(
   number: Int,
   title: String,
   user: ApiUser,
-  assignee: Option[ApiUser],
+  // labels,
-  labels: List[ApiLabel],
   state: String,
   created_at: Date,
   updated_at: Date,
-  body: String,
+  body: String)(repositoryName: RepositoryName, isPullRequest: Boolean){
-  milestone: Option[ApiMilestone]
-)(repositoryName: RepositoryName, isPullRequest: Boolean) {
-  val id = 0 // dummy id
-  val assignees = List(assignee).flatten
   val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${number}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${number}")
   val pull_request = if (isPullRequest) {
-    Some(
+    Some(Map(
-      Map(
       "url" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/${number}"),
       "html_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}")
       // "diff_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.diff"),
       // "patch_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.patch")
-      )
+    ))
-    )
   } else {
     None
   }
 }
 
-object ApiIssue {
+object ApiIssue{
-  def apply(
+  def apply(issue: Issue, repositoryName: RepositoryName, user: ApiUser): ApiIssue =
-    issue: Issue,
-    repositoryName: RepositoryName,
-    user: ApiUser,
-    assignee: Option[ApiUser],
-    labels: List[ApiLabel],
-    milestone: Option[ApiMilestone]
-  ): ApiIssue =
     ApiIssue(
       number = issue.issueId,
       title  = issue.title,
       user   = user,
-      assignee = assignee,
+      state  = if(issue.closed){ "closed" }else{ "open" },
-      labels = labels,
-      milestone = milestone,
-      state = if (issue.closed) { "closed" } else { "open" },
       body   = issue.content.getOrElse(""),
       created_at = issue.registeredDate,
-      updated_at = issue.updatedDate
+      updated_at = issue.updatedDate)(repositoryName, issue.isPullRequest)
-    )(repositoryName, issue.isPullRequest)
 }

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

@@ -6,12 +6,14 @@ import gitbucket.core.util.RepositoryName
 /**
   * https://developer.github.com/v3/issues/labels/
   */
-case class ApiLabel(name: String, color: String)(repositoryName: RepositoryName) {
+case class ApiLabel(
+  name: String,
+  color: String)(repositoryName: RepositoryName){
   var url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/labels/${name}")
 }
 
-object ApiLabel {
+object ApiLabel{
-  def apply(label: Label, repositoryName: RepositoryName): ApiLabel =
+  def apply(label:Label, repositoryName: RepositoryName): ApiLabel =
     ApiLabel(
       name = label.labelName,
       color = label.color

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
-    )
-}

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

@@ -4,11 +4,22 @@ import gitbucket.core.util.JGitUtil.CommitInfo
 
 import java.util.Date
 
-case class ApiPersonIdent(name: String, email: String, date: Date)
+
+case class ApiPersonIdent(
+  name: String,
+  email: String,
+  date: Date)
+
 
 object ApiPersonIdent {
   def author(commit: CommitInfo): ApiPersonIdent =
-    ApiPersonIdent(name = commit.authorName, email = commit.authorEmailAddress, date = commit.authorTime)
+    ApiPersonIdent(
+      name  = commit.authorName,
+      email = commit.authorEmailAddress,
+      date  = commit.authorTime)
   def committer(commit: CommitInfo): ApiPersonIdent =
-    ApiPersonIdent(name = commit.committerName, email = commit.committerEmailAddress, date = commit.commitTime)
+    ApiPersonIdent(
+      name  = commit.committerName,
+      email = commit.committerEmailAddress,
+      date  = commit.commitTime)
 }

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

@@ -1,17 +0,0 @@
-package gitbucket.core.api
-
-import gitbucket.core.plugin.PluginInfo
-
-case class ApiPlugin(
-  id: String,
-  name: String,
-  version: String,
-  description: String,
-  jarFileName: String
-)
-
-object ApiPlugin {
-  def apply(plugin: PluginInfo): ApiPlugin = {
-    ApiPlugin(plugin.pluginId, plugin.pluginName, plugin.pluginVersion, plugin.description, plugin.pluginJar.getName)
-  }
-}

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

@@ -8,7 +8,6 @@ import java.util.Date
  */
 case class ApiPullRequest(
   number: Int,
-  state: String,
   updated_at: Date,
   created_at: Date,
   head: ApiPullRequest.Commit,
@@ -20,11 +19,7 @@ case class ApiPullRequest(
   title: String,
   body: String,
   user: ApiUser,
-  labels: List[ApiLabel],
+  assignee: Option[ApiUser]){
-  assignee: Option[ApiUser],
-  draft: Option[Boolean]
-) {
-  val id = 0 // dummy id
   val html_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
   //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")
@@ -37,24 +32,28 @@ case class ApiPullRequest(
   val statuses_url        = ApiPath(s"${base.repo.url.path}/statuses/${head.sha}")
 }
 
-object ApiPullRequest {
+object ApiPullRequest{
   def apply(
     issue: Issue,
     pullRequest: PullRequest,
     headRepo: ApiRepository,
     baseRepo: ApiRepository,
     user: ApiUser,
-    labels: List[ApiLabel],
     assignee: Option[ApiUser],
     mergedComment: Option[(IssueComment, Account)]
   ): ApiPullRequest =
     ApiPullRequest(
       number     = issue.issueId,
-      state = if (issue.closed) "closed" else "open",
       updated_at = issue.updatedDate,
       created_at = issue.registeredDate,
-      head = Commit(sha = pullRequest.commitIdTo, ref = pullRequest.requestBranch, repo = headRepo)(issue.userName),
+      head       = Commit(
-      base = Commit(sha = pullRequest.commitIdFrom, ref = pullRequest.branch, repo = baseRepo)(issue.userName),
+                     sha  = pullRequest.commitIdTo,
+                     ref  = pullRequest.requestBranch,
+                     repo = headRepo)(issue.userName),
+      base       = Commit(
+                     sha  = pullRequest.commitIdFrom,
+                     ref  = pullRequest.branch,
+                     repo = baseRepo)(issue.userName),
       mergeable  = None, // TODO: need check mergeable.
       merged     = mergedComment.isDefined,
       merged_at  = mergedComment.map { case (comment, _) => comment.registeredDate },
@@ -62,13 +61,14 @@ object ApiPullRequest {
       title      = issue.title,
       body       = issue.content.getOrElse(""),
       user       = user,
-      labels = labels,
+      assignee   = assignee
-      assignee = assignee,
-      draft = Some(pullRequest.isDraft)
     )
 
-  case class Commit(sha: String, ref: String, repo: ApiRepository)(baseOwner: String) {
+  case class Commit(
-    val label = if (baseOwner == repo.owner.login) { ref } else { s"${repo.owner.login}:${ref}" }
+    sha: String,
+    ref: String,
+    repo: ApiRepository)(baseOwner:String){
+    val label = if( baseOwner == repo.owner.login ){ ref } else { s"${repo.owner.login}:${ref}" }
     val user = repo.owner
   }
 

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

@@ -17,11 +17,10 @@ case class ApiPullRequestReviewComment(
   commit_id: String, // "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   user: ApiUser,
-  body: String, // "Maybe you should use more emoji on this line.",
+  body: String, // "Maybe you should use more emojji on this line.",
   created_at: Date,  // "2015-05-05T23:40:27Z",
   updated_at: Date // "2015-05-05T23:40:27Z",
-)(repositoryName: RepositoryName, issueId: Int)
+)(repositoryName:RepositoryName, issueId: Int) extends FieldSerializable {
-    extends FieldSerializable {
   // "url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/comments/29724692",
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/comments/${id}")
   // "html_url": "https://github.com/baxterthehacker/public-repo/pull/1#discussion_r29724692",
@@ -45,17 +44,11 @@ case class ApiPullRequestReviewComment(
   val _links = Map(
     "self" -> Map("href" -> url),
     "html" -> Map("href" -> html_url),
-    "pull_request" -> Map("href" -> pull_request_url)
+    "pull_request" -> Map("href" -> pull_request_url))
-  )
 }
 
-object ApiPullRequestReviewComment {
+object ApiPullRequestReviewComment{
-  def apply(
+  def apply(comment: CommitComment, commentedUser: ApiUser, repositoryName: RepositoryName, issueId: Int): ApiPullRequestReviewComment =
-    comment: CommitComment,
-    commentedUser: ApiUser,
-    repositoryName: RepositoryName,
-    issueId: Int
-  ): ApiPullRequestReviewComment =
     new ApiPullRequestReviewComment(
      id = comment.commentId,
      path = comment.fileName.getOrElse(""),

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

@@ -5,5 +5,7 @@ import gitbucket.core.model.Account
 case class ApiPusher(name: String, email: String)
 
 object ApiPusher {
-  def apply(user: Account): ApiPusher = ApiPusher(name = user.userName, email = user.mailAddress)
+  def apply(user: Account): ApiPusher = ApiPusher(
+    name  = user.userName,
+    email = user.mailAddress)
 }

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

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

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

@@ -3,6 +3,7 @@ package gitbucket.core.api
 import gitbucket.core.model.{Account, Repository}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 
+
 // https://developer.github.com/v3/repos/
 case class ApiRepository(
   name: String,
@@ -12,25 +13,27 @@ case class ApiRepository(
   forks: Int,
   `private`: Boolean,
   default_branch: String,
-  owner: ApiUser,
+  owner: ApiUser)(urlIsHtmlUrl: Boolean) {
-  has_issues: Boolean
-) {
-  val id = 0 // dummy id
   val forks_count = forks
   val watchers_count = watchers
-  val url = ApiPath(s"/api/v3/repos/${full_name}")
+  val url = if(urlIsHtmlUrl){
+    ApiPath(s"/${full_name}")
+  } else {
+    ApiPath(s"/api/v3/repos/${full_name}")
+  }
+  val http_url  = ApiPath(s"/git/${full_name}.git")
   val clone_url = ApiPath(s"/git/${full_name}.git")
   val html_url  = ApiPath(s"/${full_name}")
   val ssh_url   = Some(SshPath(s":${full_name}.git"))
 }
 
-object ApiRepository {
+object ApiRepository{
   def apply(
       repository: Repository,
       owner: ApiUser,
-    forkedCount: Int = 0,
+      forkedCount: Int =0,
-    watchers: Int = 0
+      watchers: Int = 0,
-  ): ApiRepository =
+      urlIsHtmlUrl: Boolean = false): ApiRepository =
     ApiRepository(
       name           = repository.repositoryName,
       full_name      = s"${repository.userName}/${repository.repositoryName}",
@@ -39,19 +42,17 @@ object ApiRepository {
       forks          = forkedCount,
       `private`      = repository.isPrivate,
       default_branch = repository.defaultBranch,
-      owner = owner,
+      owner          = owner
-      has_issues = if (repository.options.issuesOption == "DISABLE") false else true
+    )(urlIsHtmlUrl)
-    )
 
   def apply(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(
+    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount)
-      repositoryInfo.repository,
-      owner,
-      forkedCount = repositoryInfo.forkedCount
-    )
 
   def apply(repositoryInfo: RepositoryInfo, owner: Account): ApiRepository =
-    this(repositoryInfo, ApiUser(owner))
+    this(repositoryInfo.repository, ApiUser(owner))
+
+  def forPushPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
+    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount, urlIsHtmlUrl=true)
 
   def forDummyPayload(owner: ApiUser): ApiRepository =
     ApiRepository(
@@ -62,7 +63,6 @@ object ApiRepository {
       forks          = 0,
       `private`      = false,
       default_branch = "master",
-      owner = owner,
+      owner          = owner
-      has_issues = true
+    )(true)
-    )
 }

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

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

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

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

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

@@ -4,8 +4,13 @@ import gitbucket.core.model.Account
 
 import java.util.Date
 
-case class ApiUser(login: String, email: String, `type`: String, site_admin: Boolean, created_at: Date) {
+
-  val id = 0 // dummy id
+case class ApiUser(
+  login: String,
+  email: String,
+  `type`: String,
+  site_admin: Boolean,
+  created_at: Date) {
   val url                 = ApiPath(s"/api/v3/users/${login}")
   val html_url            = ApiPath(s"/${login}")
   val avatar_url          = ApiPath(s"/${login}/_avatar")
@@ -20,11 +25,12 @@ case class ApiUser(login: String, email: String, `type`: String, site_admin: Boo
   // val received_events_url = ApiPath(s"/api/v3/users/${login}/received_events")
 }
 
-object ApiUser {
+
+object ApiUser{
   def apply(user: Account): ApiUser = ApiUser(
     login      = user.userName,
     email      = user.mailAddress,
-    `type` = if (user.isGroupAccount) { "Organization" } else { "User" },
+    `type`     = if(user.isGroupAccount){ "Organization" } else { "User" },
     site_admin = user.isAdmin,
     created_at = user.registeredDate
   )

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

@@ -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}")
-    )
-}

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

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

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

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

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

@@ -9,10 +9,10 @@ case class CreateALabel(
     color: String
 ) {
   def isValid: Boolean = {
-    name.length <= 100 &&
+    name.length<=100 &&
       !name.startsWith("_") &&
       !name.startsWith("-") &&
-    color.length == 6 &&
+      color.length==6 &&
       color.matches("[a-fA-F0-9+_.]+")
   }
 }

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\\-\\+_.]+")
-  }
-}

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

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

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

@@ -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)

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

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

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

@@ -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"
-  }
-}

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

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

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

@@ -8,5 +8,4 @@ case class CreateAnIssue(
     body: Option[String],
     assignees: List[String],
     milestone: Option[Int],
-  labels: List[String]
+    labels: List[String])
-)

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

@@ -15,16 +15,12 @@ object JsonFormat {
 
   val parserISO = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
-  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](
+  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](format =>
-    format =>
     (
-        {
+      { case JString(s) => Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date")) },
-          case JString(s) =>
+      { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
-            Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date"))
-        }, { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
     )
   ) + FieldSerializer[ApiUser]() +
-    FieldSerializer[ApiGroup]() +
     FieldSerializer[ApiPullRequest]() +
     FieldSerializer[ApiRepository]() +
     FieldSerializer[ApiCommitListItem.Parent]() +
@@ -43,35 +39,21 @@ object JsonFormat {
     FieldSerializer[ApiCommits.Tree]() +
     FieldSerializer[ApiCommits.Stats]() +
     FieldSerializer[ApiCommits.File]() +
-    FieldSerializer[ApiRelease]() +
-    FieldSerializer[ApiReleaseAsset]() +
     ApiBranchProtection.enforcementLevelSerializer
 
-  def apiPathSerializer(c: Context) =
+  def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](_ => ({
-    new CustomSerializer[ApiPath](
-      _ =>
-        ({
     case JString(s) if s.startsWith(c.baseUrl) => ApiPath(s.substring(c.baseUrl.length))
     case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
   }, {
     case ApiPath(path) => JString(c.baseUrl + path)
-        })
+  }))
-    )
 
-  def sshPathSerializer(c: Context) =
+  def sshPathSerializer(c: Context) = new CustomSerializer[SshPath](_ => ({
-    new CustomSerializer[SshPath](
+    case JString(s) if c.sshUrl.exists(sshUrl => s.startsWith(sshUrl)) => SshPath(s.substring(c.sshUrl.get.length))
-      _ =>
-        ({
-          case JString(s) if c.sshUrl.exists(sshUrl => s.startsWith(sshUrl)) =>
-            SshPath(s.substring(c.sshUrl.get.length))
     case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
   }, {
-          case SshPath(path) =>
+    case SshPath(path) => c.sshUrl.map { sshUrl => JString(sshUrl + path) } getOrElse JNothing
-            c.sshUrl.map { sshUrl =>
+  }))
-              JString(sshUrl + path)
-            } getOrElse JNothing
-        })
-    )
 
   /**
    * convert object to json string

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
-)

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)

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

@@ -1,11 +0,0 @@
-package gitbucket.core.api
-
-case class UpdateAUser(
-  name: Option[String],
-  email: Option[String],
-  blog: Option[String],
-  company: Option[String],
-  location: Option[String],
-  hireable: Option[Boolean],
-  bio: Option[String]
-)

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

@@ -1,30 +1,23 @@
 package gitbucket.core.controller
 
 import gitbucket.core.api._
-import gitbucket.core.controller.api._
+import gitbucket.core.model._
+import gitbucket.core.service.IssuesService.IssueSearchCondition
+import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service._
+import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.JGitUtil._
+import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
-import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.revwalk.RevWalk
+import org.scalatra.{Created, NoContent, UnprocessableEntity}
 
-class ApiController
+import scala.collection.JavaConverters._
-    extends ApiControllerBase
+
-    with ApiGitReferenceControllerBase
+class ApiController extends ApiControllerBase
-    with ApiIssueCommentControllerBase
-    with ApiIssueControllerBase
-    with ApiIssueLabelControllerBase
-    with ApiIssueMilestoneControllerBase
-    with ApiOrganizationControllerBase
-    with ApiPullRequestControllerBase
-    with ApiReleaseControllerBase
-    with ApiRepositoryBranchControllerBase
-    with ApiRepositoryCollaboratorControllerBase
-    with ApiRepositoryCommitControllerBase
-    with ApiRepositoryContentsControllerBase
-    with ApiRepositoryControllerBase
-    with ApiRepositoryStatusControllerBase
-    with ApiRepositoryWebhookControllerBase
-    with ApiUserControllerBase
   with RepositoryService
   with AccountService
   with ProtectedBranchService
@@ -34,29 +27,42 @@ class ApiController
   with PullRequestService
   with CommitsService
   with CommitStatusService
-    with ReleaseService
   with RepositoryCreationService
-    with RepositoryCommitFileService
   with IssueCreationService
   with HandleCommentService
-    with MergeService
   with WebHookService
   with WebHookPullRequestService
   with WebHookIssueCommentService
-    with WebHookPullRequestReviewCommentService
   with WikiService
   with ActivityService
   with PrioritiesService
-    with AdminAuthenticator
   with OwnerAuthenticator
   with UsersAuthenticator
   with GroupManagerAuthenticator
   with ReferrerAuthenticator
   with ReadableUsersAuthenticator
   with WritableUsersAuthenticator
-    with RequestCache
 
 trait ApiControllerBase extends ControllerBase {
+  self: RepositoryService
+    with AccountService
+    with ProtectedBranchService
+    with IssuesService
+    with LabelsService
+    with MilestonesService
+    with PullRequestService
+    with CommitsService
+    with CommitStatusService
+    with RepositoryCreationService
+    with IssueCreationService
+    with HandleCommentService
+    with PrioritiesService
+    with OwnerAuthenticator
+    with UsersAuthenticator
+    with GroupManagerAuthenticator
+    with ReferrerAuthenticator
+    with ReadableUsersAuthenticator
+    with WritableUsersAuthenticator =>
 
   /**
     * 404 for non-implemented api
@@ -64,40 +70,631 @@ trait ApiControllerBase extends ControllerBase {
   get("/api/v3/*") {
     NotFound()
   }
-  post("/api/v3/*") {
-    NotFound()
-  }
-  put("/api/v3/*") {
-    NotFound()
-  }
-  delete("/api/v3/*") {
-    NotFound()
-  }
-  patch("/api/v3/*") {
-    NotFound()
-  }
 
   /**
     * https://developer.github.com/v3/#root-endpoint
     */
-  get("/api/v3") {
+  get("/api/v3/") {
     JsonFormat(ApiEndPoint())
   }
 
+  /**
+    * https://developer.github.com/v3/orgs/#get-an-organization
+    */
+  get("/api/v3/orgs/:groupName") {
+    getAccountByUserName(params("groupName")).filter(account => account.isGroupAccount).map { account =>
+      JsonFormat(ApiUser(account))
+    } getOrElse NotFound()
+  }
+
+  /**
+   * https://developer.github.com/v3/users/#get-a-single-user
+   * This API also returns group information (as GitHub).
+   */
+  get("/api/v3/users/:userName") {
+    getAccountByUserName(params("userName")).map { account =>
+      JsonFormat(ApiUser(account))
+    } getOrElse NotFound()
+  }
+
+  /**
+    * https://developer.github.com/v3/repos/#list-organization-repositories
+    */
+  get("/api/v3/orgs/:orgName/repos") {
+    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("orgName"))).map{ r => ApiRepository(r, getAccountByUserName(r.owner).get)})
+  }
+  /**
+   * https://developer.github.com/v3/repos/#list-user-repositories
+   */
+  get("/api/v3/users/:userName/repos") {
+    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("userName"))).map{ r => ApiRepository(r, getAccountByUserName(r.owner).get)})
+  }
+
+  /*
+   * https://developer.github.com/v3/repos/branches/#list-branches
+   */
+  get ("/api/v3/repos/:owner/:repo/branches")(referrersOnly { repository =>
+    JsonFormat(JGitUtil.getBranches(
+      owner         = repository.owner,
+      name          = repository.name,
+      defaultBranch = repository.repository.defaultBranch,
+      origin        = repository.repository.originUserName.isEmpty
+    ).map { br =>
+      ApiBranchForList(br.name, ApiBranchCommit(br.commitId))
+    })
+  })
+
+  /**
+    * https://developer.github.com/v3/repos/branches/#get-branch
+    */
+  get ("/api/v3/repos/:owner/:repo/branches/*")(referrersOnly { repository =>
+    //import gitbucket.core.api._
+    (for{
+      branch <- params.get("splat") if repository.branchList.contains(branch)
+      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
+    } yield {
+      val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
+      JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), ApiBranchProtection(protection))(RepositoryName(repository)))
+    }) getOrElse NotFound()
+  })
+
+  /*
+   * https://developer.github.com/v3/repos/contents/#get-contents
+   */
+  get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
+    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
+      val path = new java.io.File(pathStr)
+      val dirName = path.getParent match {
+        case null => "."
+        case s => s
+      }
+      getFileList(git, revision, dirName).find(f => f.name.equals(path.getName))
+    }
+
+    val path = multiParams("splat").head match {
+      case s if s.isEmpty => "."
+      case s => s
+    }
+    val refStr = params.getOrElse("ref", repository.repository.defaultBranch)
+
+    using(Git.open(getRepositoryDir(params("owner"), params("repo")))){ git =>
+      val fileList = getFileList(git, refStr, path)
+      if (fileList.isEmpty) { // file or NotFound
+        getFileInfo(git, refStr, path).flatMap(f => {
+          val largeFile = params.get("large_file").exists(s => s.equals("true"))
+          val content = getContentFromId(git, f.id, largeFile)
+          request.getHeader("Accept") match {
+            case "application/vnd.github.v3.raw" => {
+              contentType = "application/vnd.github.v3.raw"
+              content
+            }
+            case "application/vnd.github.v3.html" if isRenderable(f.name) => {
+              contentType = "application/vnd.github.v3.html"
+              content.map(c =>
+                List(
+                  "<div data-path=\"", path, "\" id=\"file\">", "<article>",
+                  renderMarkup(path.split("/").toList, new String(c), refStr, repository, false, false, true).body,
+                  "</article>", "</div>"
+                ).mkString
+              )
+            }
+            case "application/vnd.github.v3.html" => {
+              contentType = "application/vnd.github.v3.html"
+              content.map(c =>
+                List(
+                  "<div data-path=\"", path, "\" id=\"file\">", "<div class=\"plain\">", "<pre>",
+                  play.twirl.api.HtmlFormat.escape(new String(c)).body,
+                  "</pre>", "</div>", "</div>"
+                ).mkString
+              )
+            }
+            case _ =>
+              Some(JsonFormat(ApiContents(f, RepositoryName(repository), content)))
+          }
+        }).getOrElse(NotFound())
+      } else { // directory
+        JsonFormat(fileList.map{f => ApiContents(f, RepositoryName(repository), None)})
+      }
+    }
+  })
+
+  /*
+   * https://developer.github.com/v3/git/refs/#get-a-reference
+   */
+  get("/api/v3/repos/:owner/:repo/git/*") (referrersOnly { repository =>
+    val revstr = multiParams("splat").head
+    using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
+      //JsonFormat( (revstr, git.getRepository().resolve(revstr)) )
+      // getRef is deprecated by jgit-4.2. use exactRef() or findRef()
+      val sha = git.getRepository().exactRef(revstr).getObjectId().name()
+      JsonFormat(ApiRef(revstr, ApiObject(sha)))
+    }
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/collaborators/#list-collaborators
+   */
+  get("/api/v3/repos/:owner/:repo/collaborators") (referrersOnly { repository =>
+    // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
+    JsonFormat(getCollaboratorUserNames(params("owner"), params("repo")).map(u => ApiUser(getAccountByUserName(u).get)))
+  })
+
+  /**
+   * https://developer.github.com/v3/users/#get-the-authenticated-user
+   */
+  get("/api/v3/user") {
+    context.loginAccount.map { account =>
+      JsonFormat(ApiUser(account))
+    } getOrElse Unauthorized()
+  }
+
+  /**
+   * List user's own repository
+   * https://developer.github.com/v3/repos/#list-your-repositories
+   */
+  get("/api/v3/user/repos")(usersOnly{
+    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map{
+      r => ApiRepository(r, getAccountByUserName(r.owner).get)
+    })
+  })
+
+  /**
+   * Create user repository
+   * https://developer.github.com/v3/repos/#create
+   */
+  post("/api/v3/user/repos")(usersOnly {
+    val owner = context.loginAccount.get.userName
+    (for {
+      data <- extractFromJsonBody[CreateARepository] if data.isValid
+    } yield {
+      LockUtil.lock(s"${owner}/${data.name}") {
+        if(getRepository(owner, data.name).isEmpty){
+          createRepository(context.loginAccount.get, owner, data.name, data.description, data.`private`, data.auto_init)
+          val repository = getRepository(owner, data.name).get
+          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
+        } else {
+          ApiError(
+            "A repository with this name already exists on this account",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
+        }
+      }
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * Create group repository
+   * https://developer.github.com/v3/repos/#create
+   */
+  post("/api/v3/orgs/:org/repos")(managersOnly {
+    val groupName = params("org")
+    (for {
+      data <- extractFromJsonBody[CreateARepository] if data.isValid
+    } yield {
+      LockUtil.lock(s"${groupName}/${data.name}") {
+        if(getRepository(groupName, data.name).isEmpty){
+          createRepository(context.loginAccount.get, groupName, data.name, data.description, data.`private`, data.auto_init)
+          val repository = getRepository(groupName, data.name).get
+          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
+        } else {
+          ApiError(
+            "A repository with this name already exists for this group",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
+        }
+      }
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
+   */
+  patch("/api/v3/repos/:owner/:repo/branches/*")(ownerOnly { repository =>
+    import gitbucket.core.api._
+    (for{
+      branch     <- params.get("splat") if repository.branchList.contains(branch)
+      protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
+      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
+    } yield {
+      if(protection.enabled){
+        enableBranchProtection(repository.owner, repository.name, branch, protection.status.enforcement_level == ApiBranchProtection.Everyone, protection.status.contexts)
+      } else {
+        disableBranchProtection(repository.owner, repository.name, branch)
+      }
+      JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), protection)(RepositoryName(repository)))
+    }) getOrElse NotFound()
+  })
+
   /**
    * @see https://developer.github.com/v3/rate_limit/#get-your-current-rate-limit-status
    * but not enabled.
    */
-  get("/api/v3/rate_limit") {
+  get("/api/v3/rate_limit"){
     contentType = formats("json")
     // this message is same as github enterprise...
     org.scalatra.NotFound(ApiError("Rate limiting is not enabled."))
   }
 
   /**
-   * non-GitHub compatible API for listing plugins
+    * https://developer.github.com/v3/issues/#list-issues-for-a-repository
     */
-  get("/api/v3/gitbucket/plugins") {
+  get("/api/v3/repos/:owner/:repository/issues")(referrersOnly { repository =>
-    PluginRegistry().getPlugins().map { ApiPlugin(_) }
+    val page = IssueSearchCondition.page(request)
+    // TODO: more api spec condition
+    val condition = IssueSearchCondition(request)
+    val baseOwner = getAccountByUserName(repository.owner).get
+
+    val issues: List[(Issue, Account)] =
+      searchIssueByApi(
+        condition = condition,
+        offset    = (page - 1) * PullRequestLimit,
+        limit     = PullRequestLimit,
+        repos     = repository.owner -> repository.name
+      )
+
+    JsonFormat(issues.map { case (issue, issueUser) =>
+      ApiIssue(
+        issue          = issue,
+        repositoryName = RepositoryName(repository),
+        user           = ApiUser(issueUser)
+      )
+    })
+  })
+
+  /**
+   * https://developer.github.com/v3/issues/#get-a-single-issue
+   */
+  get("/api/v3/repos/:owner/:repository/issues/:id")(referrersOnly { repository =>
+    (for{
+      issueId  <- params("id").toIntOpt
+      issue <- getIssue(repository.owner, repository.name, issueId.toString)
+      openedUser <- getAccountByUserName(issue.openedUserName)
+    } yield {
+      JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(openedUser)))
+    }) getOrElse NotFound()
+  })
+
+  /**
+    * https://developer.github.com/v3/issues/#create-an-issue
+    */
+  post("/api/v3/repos/:owner/:repository/issues")(readableUsersOnly { repository =>
+    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
+      (for{
+        data <- extractFromJsonBody[CreateAnIssue]
+        loginAccount <- context.loginAccount
+      } yield {
+        val milestone = data.milestone.flatMap(getMilestone(repository.owner, repository.name, _))
+        val issue = createIssue(
+          repository,
+          data.title,
+          data.body,
+          data.assignees.headOption,
+          milestone.map(_.milestoneId),
+          None,
+          data.labels,
+          loginAccount)
+        JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(loginAccount)))
+      }) getOrElse NotFound()
+    } else Unauthorized()
+  })
+
+  /**
+   * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
+   */
+  get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
+    (for{
+      issueId  <- params("id").toIntOpt
+      comments =  getCommentsForApi(repository.owner, repository.name, issueId)
+    } yield {
+      JsonFormat(comments.map{ case (issueComment, user, issue) => ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest) })
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/issues/comments/#create-a-comment
+   */
+  post("/api/v3/repos/:owner/:repository/issues/:id/comments")(readableUsersOnly { repository =>
+    (for{
+      issueId      <- params("id").toIntOpt
+      issue        <- getIssue(repository.owner, repository.name, issueId.toString)
+      body         <- extractFromJsonBody[CreateAComment].map(_.body) if ! body.isEmpty
+      action       =  params.get("action").filter(_ => isEditable(issue.userName, issue.repositoryName, issue.openedUserName))
+      (issue, id)  <- handleComment(issue, Some(body), repository, action)
+      issueComment <- getComment(repository.owner, repository.name, id.toString())
+    } yield {
+      JsonFormat(ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(context.loginAccount.get), issue.isPullRequest))
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * List all labels for this repository
+   * https://developer.github.com/v3/issues/labels/#list-all-labels-for-this-repository
+   */
+  get("/api/v3/repos/:owner/:repository/labels")(referrersOnly { repository =>
+    JsonFormat(getLabels(repository.owner, repository.name).map { label =>
+      ApiLabel(label, RepositoryName(repository))
+    })
+  })
+
+  /**
+   * Get a single label
+   * https://developer.github.com/v3/issues/labels/#get-a-single-label
+   */
+  get("/api/v3/repos/:owner/:repository/labels/:labelName")(referrersOnly { repository =>
+    getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+      JsonFormat(ApiLabel(label, RepositoryName(repository)))
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Create a label
+   * https://developer.github.com/v3/issues/labels/#create-a-label
+   */
+  post("/api/v3/repos/:owner/:repository/labels")(writableUsersOnly { repository =>
+    (for{
+      data <- extractFromJsonBody[CreateALabel] if data.isValid
+    } yield {
+      LockUtil.lock(RepositoryName(repository).fullName) {
+        if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
+          val labelId = createLabel(repository.owner, repository.name, data.name, data.color)
+          getLabel(repository.owner, repository.name, labelId).map { label =>
+            Created(JsonFormat(ApiLabel(label, RepositoryName(repository))))
+          } getOrElse NotFound()
+        } else {
+          // TODO ApiError should support errors field to enhance compatibility of GitHub API
+          UnprocessableEntity(ApiError(
+            "Validation Failed",
+            Some("https://developer.github.com/v3/issues/labels/#create-a-label")
+          ))
         }
+      }
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * Update a label
+   * https://developer.github.com/v3/issues/labels/#update-a-label
+   */
+  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
+    (for{
+      data <- extractFromJsonBody[CreateALabel] if data.isValid
+    } yield {
+      LockUtil.lock(RepositoryName(repository).fullName) {
+        getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+          if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
+            updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
+            JsonFormat(ApiLabel(
+              getLabel(repository.owner, repository.name, label.labelId).get,
+              RepositoryName(repository)
+            ))
+          } else {
+            // TODO ApiError should support errors field to enhance compatibility of GitHub API
+            UnprocessableEntity(ApiError(
+              "Validation Failed",
+              Some("https://developer.github.com/v3/issues/labels/#create-a-label")
+            ))
+          }
+        } getOrElse NotFound()
+      }
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * Delete a label
+   * https://developer.github.com/v3/issues/labels/#delete-a-label
+   */
+  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
+    LockUtil.lock(RepositoryName(repository).fullName) {
+      getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+        deleteLabel(repository.owner, repository.name, label.labelId)
+        NoContent()
+      } getOrElse NotFound()
+    }
+  })
+
+  /**
+   * https://developer.github.com/v3/pulls/#list-pull-requests
+   */
+  get("/api/v3/repos/:owner/:repository/pulls")(referrersOnly { repository =>
+    val page = IssueSearchCondition.page(request)
+    // TODO: more api spec condition
+    val condition = IssueSearchCondition(request)
+    val baseOwner = getAccountByUserName(repository.owner).get
+
+    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] =
+      searchPullRequestByApi(
+        condition = condition,
+        offset    = (page - 1) * PullRequestLimit,
+        limit     = PullRequestLimit,
+        repos     = repository.owner -> repository.name
+      )
+
+    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
+      ApiPullRequest(
+        issue         = issue,
+        pullRequest   = pullRequest,
+        headRepo      = ApiRepository(headRepo, ApiUser(headOwner)),
+        baseRepo      = ApiRepository(repository, ApiUser(baseOwner)),
+        user          = ApiUser(issueUser),
+        assignee      = assignee.map(ApiUser.apply),
+        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
+      )
+    })
+  })
+
+  /**
+   * https://developer.github.com/v3/pulls/#get-a-single-pull-request
+   */
+  get("/api/v3/repos/:owner/:repository/pulls/:id")(referrersOnly { repository =>
+    (for{
+      issueId   <- params("id").toIntOpt
+      (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
+      users     =  getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set.empty)
+      baseOwner <- users.get(repository.owner)
+      headOwner <- users.get(pullRequest.requestUserName)
+      issueUser <- users.get(issue.openedUserName)
+      assignee  =  issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) }
+      headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
+    } yield {
+      JsonFormat(ApiPullRequest(
+        issue         = issue,
+        pullRequest   = pullRequest,
+        headRepo      = ApiRepository(headRepo, ApiUser(headOwner)),
+        baseRepo      = ApiRepository(repository, ApiUser(baseOwner)),
+        user          = ApiUser(issueUser),
+        assignee      = assignee.map(ApiUser.apply),
+        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
+      ))
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
+   */
+  get("/api/v3/repos/:owner/:repository/pulls/:id/commits")(referrersOnly { repository =>
+    val owner = repository.owner
+    val name = repository.name
+    params("id").toIntOpt.flatMap{ issueId =>
+      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+        using(Git.open(getRepositoryDir(owner, name))){ git =>
+          val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
+          val newId = git.getRepository.resolve(pullreq.commitIdTo)
+          val repoFullName = RepositoryName(repository)
+          val commits = git.log.addRange(oldId, newId).call.iterator.asScala.map { c => ApiCommitListItem(new CommitInfo(c), repoFullName) }.toList
+          JsonFormat(commits)
+        }
+      }
+    } getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/#get
+   */
+  get("/api/v3/repos/:owner/:repository")(referrersOnly { repository =>
+    JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(repository.owner).get)))
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/statuses/#create-a-status
+   */
+  post("/api/v3/repos/:owner/:repo/statuses/:sha")(writableUsersOnly { repository =>
+    (for{
+      ref      <- params.get("sha")
+      sha      <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+      data     <- extractFromJsonBody[CreateAStatus] if data.isValid
+      creator  <- context.loginAccount
+      state    <- CommitState.valueOf(data.state)
+      statusId =  createCommitStatus(repository.owner, repository.name, sha, data.context.getOrElse("default"),
+                                     state, data.target_url, data.description, new java.util.Date(), creator)
+      status   <- getCommitStatus(repository.owner, repository.name, statusId)
+    } yield {
+      JsonFormat(ApiCommitStatus(status, ApiUser(creator)))
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
+   *
+   * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
+   */
+  val listStatusesRoute = get("/api/v3/repos/:owner/:repo/commits/:ref/statuses")(referrersOnly { repository =>
+    (for{
+      ref <- params.get("ref")
+      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+    } yield {
+      JsonFormat(getCommitStatuesWithCreator(repository.owner, repository.name, sha).map{ case(status, creator) =>
+        ApiCommitStatus(status, ApiUser(creator))
+      })
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
+   *
+   * legacy route
+   */
+  get("/api/v3/repos/:owner/:repo/statuses/:ref"){
+    listStatusesRoute.action()
+  }
+
+  /**
+   * https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
+   *
+   * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name.
+   */
+  get("/api/v3/repos/:owner/:repo/commits/:ref/status")(referrersOnly { repository =>
+    (for{
+      ref   <- params.get("ref")
+      owner <- getAccountByUserName(repository.owner)
+      sha   <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+    } yield {
+      val statuses = getCommitStatuesWithCreator(repository.owner, repository.name, sha)
+      JsonFormat(ApiCombinedCommitStatus(sha, statuses, ApiRepository(repository, owner)))
+    }) getOrElse NotFound()
+  })
+
+  /**
+   * https://developer.github.com/v3/repos/commits/#get-a-single-commit
+   */
+  get("/api/v3/repos/:owner/:repo/commits/:sha")(referrersOnly { repository =>
+    val owner = repository.owner
+    val name  = repository.name
+    val sha   = params("sha")
+
+    using(Git.open(getRepositoryDir(owner, name))){ git =>
+      val repo = git.getRepository
+      val objectId = repo.resolve(sha)
+      val commitInfo = using(new RevWalk(repo)){ revWalk =>
+        new CommitInfo(revWalk.parseCommit(objectId))
+      }
+
+      JsonFormat(ApiCommits(
+        repositoryName = RepositoryName(repository),
+        commitInfo     = commitInfo,
+        diffs          = JGitUtil.getDiffs(git, commitInfo.parents.head, commitInfo.id, false, true),
+        author         = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
+        committer      = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
+        commentCount   = getCommitComment(repository.owner, repository.name, sha).size
+      ))
+    }
+  })
+
+  private def getAccount(userName: String, email: String): Account = {
+    getAccountByMailAddress(email).getOrElse {
+      Account(
+        userName = userName,
+        fullName = userName,
+        mailAddress = email,
+        password = "xxx",
+        isAdmin = false,
+        url = None,
+        registeredDate = new java.util.Date(),
+        updatedDate = new java.util.Date(),
+        lastLoginDate = None,
+        image = None,
+        isGroupAccount = false,
+        isRemoved = true,
+        description = None
+      )
+    }
+  }
+
+  private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
+    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+
+  /**
+    * non-GitHub compatible API for Jenkins-Plugin
+    */
+  get("/api/v3/repos/:owner/:repo/raw/*")(referrersOnly { repository =>
+    val (id, path) = repository.splitPath(multiParams("splat").head)
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        responseRawFile(git, objectId, path, repository)
+      } getOrElse NotFound()
+    }
+  })
+
 }
+

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

@@ -1,10 +1,10 @@
 package gitbucket.core.controller
 
-import java.io.{File, FileInputStream}
+import java.io.FileInputStream
 
-import gitbucket.core.api.{ApiError, JsonFormat}
+import gitbucket.core.api.ApiError
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
+import gitbucket.core.service.{AccountService, SystemSettingsService,RepositoryService}
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
@@ -17,64 +17,62 @@ import org.scalatra.forms._
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 import javax.servlet.{FilterChain, ServletRequest, ServletResponse}
 
-import is.tagomor.woothee.Classifier
-
 import scala.util.Try
-import scala.util.Using
 import net.coobird.thumbnailator.Thumbnails
+
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.ObjectId
 import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.treewalk._
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
-import org.json4s.Formats
 
 /**
  * Provides generic features for controller implementations.
  */
-abstract class ControllerBase
+abstract class ControllerBase extends ScalatraFilter
-    extends ScalatraFilter
+  with ValidationSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
-    with ValidationSupport
-    with JacksonJsonSupport
-    with I18nSupport
-    with FlashMapSupport
-    with Validations
   with SystemSettingsService {
 
   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")
-    request.setAttribute(Keys.Request.APIv3, true)
   }
 
-  override def requestPath(uri: String, idx: Int): String = {
+  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
-    val path = super.requestPath(uri, idx)
-    if (path != "/" && path.endsWith("/")) {
-      path.substring(0, path.length - 1)
-    } else {
-      path
-    }
-  }
-
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit =
-    try {
     val httpRequest  = request.asInstanceOf[HttpServletRequest]
+    val httpResponse = response.asInstanceOf[HttpServletResponse]
     val context      = request.getServletContext.getContextPath
     val path         = httpRequest.getRequestURI.substring(context.length)
 
-      if (path.startsWith("/git/") || path.startsWith("/git-lfs/")) {
+    if(path.startsWith("/console/")){
+      val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val baseUrl = this.baseUrl(httpRequest)
+      if(account == null){
+        // Redirect to login form
+        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
+      } else if(account.isAdmin){
+        // H2 Console (administrators only)
+        chain.doFilter(request, response)
+      } else {
+        // Redirect to dashboard
+        httpResponse.sendRedirect(baseUrl + "/")
+      }
+    } else if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
       // Git repository
       chain.doFilter(request, response)
     } else {
+      if(path.startsWith("/api/v3/")){
+        httpRequest.setAttribute(Keys.Request.APIv3, true)
+      }
       // Scalatra actions
       super.doFilter(request, response, chain)
     }
   } finally {
-      contextCache.remove()
+    contextCache.remove();
   }
 
   private val contextCache = new java.lang.ThreadLocal[Context]()
@@ -93,127 +91,102 @@ abstract class ControllerBase
     }
   }
 
-  private def LoginAccount: Option[Account] =
+  private def LoginAccount: Option[Account] = request.getAs[Account](Keys.Session.LoginAccount).orElse(session.getAs[Account](Keys.Session.LoginAccount))
-    request.getAs[Account](Keys.Session.LoginAccount).orElse(session.getAs[Account](Keys.Session.LoginAccount))
 
-  def ajaxGet(path: String)(action: => Any): Route =
+  def ajaxGet(path : String)(action : => Any) : Route =
-    super.get(path) {
+    super.get(path){
       request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
 
-  override def ajaxGet[T](path: String, form: ValueType[T])(action: T => Any): Route =
+  override def ajaxGet[T](path : String, form : ValueType[T])(action : T => Any) : Route =
-    super.ajaxGet(path, form) { form =>
+    super.ajaxGet(path, form){ form =>
       request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
 
-  def ajaxPost(path: String)(action: => Any): Route =
+  def ajaxPost(path : String)(action : => Any) : Route =
-    super.post(path) {
+    super.post(path){
       request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
 
-  override def ajaxPost[T](path: String, form: ValueType[T])(action: T => Any): Route =
+  override def ajaxPost[T](path : String, form : ValueType[T])(action : T => Any) : Route =
-    super.ajaxPost(path, form) { form =>
+    super.ajaxPost(path, form){ form =>
       request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
 
   protected def NotFound() =
-    if (request.hasAttribute(Keys.Request.Ajax)) {
+    if(request.hasAttribute(Keys.Request.Ajax)){
       org.scalatra.NotFound()
-    } else if (request.hasAttribute(Keys.Request.APIv3)) {
+    } else if(request.hasAttribute(Keys.Request.APIv3)){
       contentType = formats("json")
-      org.scalatra.NotFound(JsonFormat(ApiError("Not Found")))
+      org.scalatra.NotFound(ApiError("Not Found"))
     } else {
       org.scalatra.NotFound(gitbucket.core.html.error("Not Found"))
     }
 
-  private def isBrowser(userAgent: String): Boolean = {
-    if (userAgent == null || userAgent.isEmpty) {
-      false
-    } else {
-      val data = Classifier.parse(userAgent)
-      val category = data.get("category")
-      category == "pc" || category == "smartphone" || category == "mobilephone"
-    }
-  }
-
   protected def Unauthorized()(implicit context: Context) =
-    if (request.hasAttribute(Keys.Request.Ajax)) {
+    if(request.hasAttribute(Keys.Request.Ajax)){
       org.scalatra.Unauthorized()
-    } else if (request.hasAttribute(Keys.Request.APIv3)) {
+    } else if(request.hasAttribute(Keys.Request.APIv3)){
       contentType = formats("json")
-      org.scalatra.Unauthorized(JsonFormat(ApiError("Requires authentication")))
+      org.scalatra.Unauthorized(ApiError("Requires authentication"))
-    } else if (!isBrowser(request.getHeader("USER-AGENT"))) {
-      org.scalatra.Unauthorized()
     } else {
-      if (context.loginAccount.isDefined) {
+      if(context.loginAccount.isDefined){
         org.scalatra.Unauthorized(redirect("/"))
       } else {
-        if (request.getMethod.toUpperCase == "POST") {
+        if(request.getMethod.toUpperCase == "POST"){
           org.scalatra.Unauthorized(redirect("/signin"))
         } else {
-          org.scalatra.Unauthorized(
+          org.scalatra.Unauthorized(redirect("/signin?redirect=" + StringUtil.urlEncode(
-            redirect(
+            defining(request.getQueryString){ queryString =>
-              "/signin?redirect=" + StringUtil.urlEncode(
+              request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "")
-                request.getRequestURI
+            }
-                  .substring(request.getContextPath.length) + Option(request.getQueryString).map("?" + _).getOrElse("")
+          )))
-              )
-            )
-          )
         }
       }
     }
 
-  error {
+  error{
     case e => {
       logger.error(s"Catch unhandled error in request: ${request}", e)
-      if (request.hasAttribute(Keys.Request.Ajax)) {
+      if(request.hasAttribute(Keys.Request.Ajax)){
         org.scalatra.InternalServerError()
-      } else if (request.hasAttribute(Keys.Request.APIv3)) {
+      } else if(request.hasAttribute(Keys.Request.APIv3)){
         contentType = formats("json")
-        org.scalatra.InternalServerError(JsonFormat(ApiError("Internal Server Error")))
+        org.scalatra.InternalServerError(ApiError("Internal Server Error"))
       } else {
         org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
       }
     }
   }
 
-  override def url(
+  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
-    path: String,
+                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
-    params: Iterable[(String, Any)] = Iterable.empty,
+                   absolutize: Boolean = true, withSessionId: Boolean = true)
-    includeContextPath: Boolean = true,
+                  (implicit request: HttpServletRequest, response: HttpServletResponse): String =
-    includeServletPath: Boolean = true,
-    absolutize: Boolean = true,
-    withSessionId: Boolean = true
-  )(implicit request: HttpServletRequest, response: HttpServletResponse): String =
     if (path.startsWith("http")) path
     else baseUrl + super.url(path, params, false, false, false)
 
   /**
    * Extends scalatra-form's trim rule to eliminate CR and LF.
    */
-  protected def trim2[T](valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T]() {
+  protected def trim2[T](valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T](){
     def convert(value: String, messages: Messages): T = valueType.convert(trim(value), messages)
 
-    override def validate(
+    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
-      name: String,
-      value: String,
-      params: Map[String, Seq[String]],
-      messages: Messages
-    ): Seq[(String, String)] =
       valueType.validate(name, trim(value), params, messages)
 
-    private def trim(value: String): String = if (value == null) null else value.replace("\r\n", "").trim
+    private def trim(value: String): String = if(value == null) null else value.replace("\r\n", "").trim
   }
 
   /**
    * Use this method to response the raw data against XSS.
    */
   protected def RawData[T](contentType: String, rawData: T): T = {
-    if (contentType.split(";").head.trim.toLowerCase.startsWith("text/html")) {
+    if(contentType.split(";").head.trim.toLowerCase.startsWith("text/html")){
       this.contentType = "text/plain"
     } else {
       this.contentType = contentType
@@ -223,8 +196,8 @@ abstract class ControllerBase
   }
 
   // jenkins send message as 'application/x-www-form-urlencoded' but scalatra already parsed as multi-part-request.
-  def extractFromJsonBody[A](implicit request: HttpServletRequest, mf: Manifest[A]): Option[A] = {
+  def extractFromJsonBody[A](implicit request:HttpServletRequest, mf:Manifest[A]): Option[A] = {
-    (request.contentType.map(_.split(";").head.toLowerCase) match {
+    (request.contentType.map(_.split(";").head.toLowerCase) match{
       case Some("application/x-www-form-urlencoded") => multiParams.keys.headOption.map(parse(_))
       case Some("application/json") => Some(parsedBody)
       case _ => Some(parse(request.body))
@@ -234,28 +207,24 @@ abstract class ControllerBase
   protected def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
     @scala.annotation.tailrec
     def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-      case true if (walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
       case true  => _getPathObjectId(path, walk)
       case false => None
     }
 
-    Using.resource(new TreeWalk(git.getRepository)) { treeWalk =>
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
       treeWalk.addTree(revCommit.getTree)
       treeWalk.setRecursive(true)
       _getPathObjectId(path, treeWalk)
     }
   }
 
-  protected def responseRawFile(
+  protected def responseRawFile(git: Git, objectId: ObjectId, path: String,
-    git: Git,
+                              repository: RepositoryService.RepositoryInfo): Unit = {
-    objectId: ObjectId,
+    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
-    path: String,
+      contentType = FileUtil.getMimeType(path)
-    repository: RepositoryService.RepositoryInfo
-  ): Unit = {
-    JGitUtil.getObjectLoaderFromId(git, objectId) { loader =>
-      contentType = FileUtil.getSafeMimeType(path, repository.repository.options.safeMode)
 
-      if (loader.isLarge) {
+      if(loader.isLarge){
         response.setContentLength(loader.getSize.toInt)
         loader.copyTo(response.outputStream)
       } else {
@@ -263,11 +232,11 @@ abstract class ControllerBase
         val text = new String(bytes, "UTF-8")
 
         val attrs = JGitUtil.getLfsObjects(text)
-        if (attrs.nonEmpty) {
+        if(attrs.nonEmpty) {
           response.setContentLength(attrs("size").toInt)
           val oid = attrs("oid").split(":")(1)
 
-          Using.resource(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in =>
+          using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))){ in =>
             IOUtils.copy(in, response.getOutputStream)
           }
         } else {
@@ -282,11 +251,7 @@ abstract class ControllerBase
 /**
  * Context object for the current request.
  */
-case class Context(
+case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
-  settings: SystemSettingsService.SystemSettings,
-  loginAccount: Option[Account],
-  request: HttpServletRequest
-) {
   val path = settings.baseUrl.getOrElse(request.getContextPath)
   val currentPath = request.getRequestURI.substring(request.getContextPath.length)
   val baseUrl = settings.baseUrl(request)
@@ -300,21 +265,14 @@ 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 = {
+  def cache[A](key: String)(action: => A): A =
-    val cacheKey = Keys.Request.Cache(key)
+    defining(Keys.Request.Cache(key)){ cacheKey =>
       Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
         val newObject = action
         request.setAttribute(cacheKey, newObject)
@@ -330,105 +288,42 @@ case class Context(
 trait AccountManagementControllerBase extends ControllerBase {
   self: AccountService  =>
 
-  private val logger = LoggerFactory.getLogger(getClass)
-
   protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
-    if (clearImage) {
+    if(clearImage){
-      getAccountByUserName(userName).flatMap(_.image).foreach { image =>
+      getAccountByUserName(userName).flatMap(_.image).map { image =>
-        new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete()
+        new java.io.File(getUserUploadDir(userName), image).delete()
         updateAvatarImage(userName, None)
       }
     } else {
-      try {
+      fileId.map { fileId =>
-        fileId.foreach { fileId =>
         val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
         val uploadDir = getUserUploadDir(userName)
-          if (!uploadDir.exists) {
+        if(!uploadDir.exists){
           uploadDir.mkdirs()
         }
-          Thumbnails
+        Thumbnails.of(new java.io.File(getTemporaryDir(session.getId), fileId))
-            .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
           .size(324, 324)
-            .toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
+          .toFile(new java.io.File(uploadDir, filename))
         updateAvatarImage(userName, Some(filename))
       }
-      } catch {
-        case e: Exception => logger.info("Error while updateImage" + e.getMessage)
-      }
     }
 
-  protected def uniqueUserName: Constraint = new Constraint() {
+  protected def uniqueUserName: Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserNameIgnoreCase(value, true).map { _ =>
+      getAccountByUserName(value, true).map { _ => "User already exists." }
-        "User already exists."
-      }
   }
 
-  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint() {
+  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
-    override def validate(
+    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
-      name: String,
-      value: String,
-      params: Map[String, Seq[String]],
-      messages: Messages
-    ): Option[String] = {
-      val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
-      if (extraMailAddresses.exists {
-            case (k, v) =>
-              v.contains(value)
-          }) {
-        Some("These mail addresses are duplicated.")
-      } else {
       getAccountByMailAddress(value, true)
-          .collect {
+        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName) }
-            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
+        .map    { _ => "Mail address is already registered." }
-              "Mail address is already registered."
-          }
-      }
     }
   }
 
-  protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() {
+  val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets", "signin", "signout", "register", "activities.atom", "sidebar-collapse", "groups", "new")
-    override def validate(
+  protected def reservedNames(): Constraint = new Constraint(){
-      name: String,
+    override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){
-      value: String,
-      params: Map[String, Seq[String]],
-      messages: Messages
-    ): Option[String] = {
-      val extraMailAddresses = params.view.filterKeys(k => k.startsWith("extraMailAddresses"))
-      if (Some(value) == params.optionValue("mailAddress") || extraMailAddresses.count {
-            case (k, v) =>
-              v.contains(value)
-          } > 1) {
-        Some("These mail addresses are duplicated.")
-      } else {
-        getAccountByMailAddress(value, true)
-          .collect {
-            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
-              "Mail address is already registered."
-          }
-      }
-    }
-  }
-
-  val allReservedNames = Set(
-    "git",
-    "admin",
-    "upload",
-    "api",
-    "assets",
-    "plugin-assets",
-    "signin",
-    "signout",
-    "register",
-    "activities.atom",
-    "sidebar-collapse",
-    "groups",
-    "new"
-  )
-
-  protected def reservedNames: Constraint = new Constraint() {
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if (allReservedNames.contains(value.toLowerCase)) {
       Some(s"${value} is reserved")
     } else {
       None

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

@@ -1,97 +1,49 @@
 package gitbucket.core.controller
 
 import gitbucket.core.dashboard.html
-import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.{Keys, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
 import gitbucket.core.service.IssuesService._
 
-class DashboardController
+class DashboardController extends DashboardControllerBase
-    extends DashboardControllerBase
+  with IssuesService with PullRequestService with RepositoryService with AccountService with CommitsService
-    with IssuesService
-    with MergeService
-    with PullRequestService
-    with RepositoryService
-    with AccountService
-    with ActivityService
-    with CommitsService
-    with LabelsService
-    with PrioritiesService
-    with WebHookService
-    with WebHookPullRequestService
-    with WebHookPullRequestReviewCommentService
-    with MilestonesService
-    with CommitStatusService
   with UsersAuthenticator
-    with RequestCache
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService
+  self: IssuesService with PullRequestService with RepositoryService with AccountService
-    with PullRequestService
-    with RepositoryService
-    with AccountService
-    with CommitStatusService
     with UsersAuthenticator =>
 
-  get("/dashboard/repos")(usersOnly {
-    context.withLoginAccount { loginAccount =>
-      val repos = getVisibleRepositories(
-        context.loginAccount,
-        None,
-        withoutPhysicalInfo = true,
-        limit = context.settings.limitVisibleRepositories
-      )
-      html.repos(getGroupNames(loginAccount.userName), repos, repos)
-    }
-  })
-
   get("/dashboard/issues")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchIssues("created_by")
-      searchIssues(loginAccount, "created_by")
-    }
   })
 
   get("/dashboard/issues/assigned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchIssues("assigned")
-      searchIssues(loginAccount, "assigned")
-    }
   })
 
   get("/dashboard/issues/created_by")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchIssues("created_by")
-      searchIssues(loginAccount, "created_by")
-    }
   })
 
   get("/dashboard/issues/mentioned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchIssues("mentioned")
-      searchIssues(loginAccount, "mentioned")
-    }
   })
 
   get("/dashboard/pulls")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchPullRequests("created_by")
-      searchPullRequests(loginAccount, "created_by")
-    }
   })
 
   get("/dashboard/pulls/created_by")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchPullRequests("created_by")
-      searchPullRequests(loginAccount, "created_by")
-    }
   })
 
   get("/dashboard/pulls/assigned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchPullRequests("assigned")
-      searchPullRequests(loginAccount, "assigned")
-    }
   })
 
   get("/dashboard/pulls/mentioned")(usersOnly {
-    context.withLoginAccount { loginAccount =>
+    searchPullRequests("mentioned")
-      searchPullRequests(loginAccount, "mentioned")
-    }
   })
 
   private def getOrCreateCondition(key: String, filter: String, userName: String) = {
@@ -104,20 +56,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 = "open"  ), false, userRepos: _*),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, 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))
@@ -125,41 +76,24 @@ trait DashboardControllerBase extends ControllerBase {
       },
       filter,
       getGroupNames(userName),
-      getVisibleRepositories(
+      Nil,
-        context.loginAccount,
+      getUserRepositories(userName, withoutPhysicalInfo = true))
-        None,
-        withoutPhysicalInfo = true,
-        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 = "open"  ), true, allRepos: _*),
-      countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, 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))
@@ -167,13 +101,9 @@ trait DashboardControllerBase extends ControllerBase {
       },
       filter,
       getGroupNames(userName),
-      getVisibleRepositories(
+      Nil,
-        context.loginAccount,
+      getUserRepositories(userName, withoutPhysicalInfo = true))
-        None,
-        withoutPhysicalInfo = true,
-        limit = context.settings.limitVisibleRepositories
-      )
-    )
   }
 
+
 }

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

@@ -1,11 +1,10 @@
 package gitbucket.core.controller
 
-import java.io.File
-
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, ReleaseService, RepositoryService}
+import gitbucket.core.service.{AccountService, 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
@@ -15,149 +14,84 @@ import org.scalatra._
 import org.scalatra.servlet.{FileItem, FileUploadSupport, MultipartConfig}
 import org.apache.commons.io.{FileUtils, IOUtils}
 
-import scala.util.Using
-import gitbucket.core.service.SystemSettingsService
-import slick.jdbc.JdbcBackend.Session
-
 /**
  * Provides Ajax based file upload functionality.
  *
  * This servlet saves uploaded file.
  */
-class FileUploadController
+class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
-    extends ScalatraServlet
-    with FileUploadSupport
-    with RepositoryService
-    with AccountService
-    with ReleaseService
-    with SystemSettingsService {
 
-  post("/image") {
+  val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
-    setMultipartConfig()
+    System.getProperty("gitbucket.maxFileSize").toLong
-    execute(
+  else
-      { (file, fileId) =>
+    3 * 1024 * 1024
-        FileUtils
+
-          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get())
+  configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize)))
+
+  post("/image"){
+    execute({ (file, fileId) =>
+      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
       session += Keys.Session.Upload(fileId) -> file.name
-      },
+    }, FileUtil.isImage)
-      FileUtil.isImage(_)
-    )
   }
 
-  post("/tmp") {
+  post("/tmp"){
-    setMultipartConfig()
+    execute({ (file, fileId) =>
-    execute(
+      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
-      { (file, fileId) =>
-        FileUtils
-          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get())
       session += Keys.Session.Upload(fileId) -> file.name
-      },
+    }, _ => true)
-      _ => true
-    )
   }
 
-  post("/file/:owner/:repository") {
+  post("/file/:owner/:repository"){
-    setMultipartConfig()
+    execute({ (file, fileId) =>
-    execute(
+      FileUtils.writeByteArrayToFile(new java.io.File(
-      { (file, fileId) =>
-        FileUtils.writeByteArrayToFile(
-          new File(
         getAttachedDir(params("owner"), params("repository")),
-            FileUtil.checkFilename(fileId + "." + FileUtil.getExtension(file.getName))
+        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
-          ),
+    }, _ => true)
-          file.get()
-        )
-      },
-      _ => true
-    )
   }
 
-  post("/wiki/:owner/:repository") {
+  post("/wiki/:owner/:repository"){
-    setMultipartConfig()
     // Don't accept not logged-in users
-    session.get(Keys.Session.LoginAccount).collect {
+    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account =>
-      case loginAccount: Account =>
       val owner      = params("owner")
       val repository = params("repository")
 
       // Check whether logged-in user is collaborator
-        onlyWikiEditable(owner, repository, loginAccount) {
+      onlyWikiEditable(owner, repository, loginAccount){
-          execute(
+        execute({ (file, fileId) =>
-            { (file, fileId) =>
           val fileName = file.getName
           LockUtil.lock(s"${owner}/${repository}/wiki") {
-                Using.resource(Git.open(Directory.getWikiRepositoryDir(owner, repository))) {
+            using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
-                  git =>
               val builder  = DirCache.newInCore.builder()
               val inserter = git.getRepository.newObjectInserter()
               val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
 
-                    if (headId != null) {
+              if(headId != null){
-                      JGitUtil.processTree(git, headId) { (path, tree) =>
+                JGitUtil.processTree(git, headId){ (path, tree) =>
-                        if (path != fileName) {
+                  if(path != fileName){
                     builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
                   }
                 }
               }
 
               val bytes = IOUtils.toByteArray(file.getInputStream)
-                    builder.add(
+              builder.add(JGitUtil.createDirCacheEntry(fileName, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
-                      JGitUtil.createDirCacheEntry(
-                        fileName,
-                        FileMode.REGULAR_FILE,
-                        inserter.insert(Constants.OBJ_BLOB, bytes)
-                      )
-                    )
               builder.finish()
 
-                    val newHeadId = JGitUtil.createNewCommit(
+              val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-                      git,
+                Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, s"Uploaded ${fileName}")
-                      inserter,
-                      headId,
-                      builder.getDirCache.writeTree(inserter),
-                      Constants.HEAD,
-                      loginAccount.fullName,
-                      loginAccount.mailAddress,
-                      s"Uploaded ${fileName}"
-                    )
 
               fileName
             }
           }
-            },
+        }, _ => true)
-            _ => true
-          )
       }
     } getOrElse BadRequest()
   }
 
-  post("/release/:owner/:repository/*") {
-    setMultipartConfigForLargeFile()
-    session
-      .get(Keys.Session.LoginAccount)
-      .collect {
-        case _: Account =>
-          val owner = params("owner")
-          val repository = params("repository")
-          val tag = multiParams("splat").head
-          execute(
-            { (file, fileId) =>
-              FileUtils.writeByteArrayToFile(
-                new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)),
-                file.get()
-              )
-            },
-            _ => true
-          )
-      }
-      .getOrElse(BadRequest())
-  }
-
   post("/import") {
     import JDBCUtil._
-    setMultipartConfig()
+    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account if loginAccount.isAdmin =>
-    session.get(Keys.Session.LoginAccount).collect {
-      case loginAccount: Account if loginAccount.isAdmin =>
       execute({ (file, fileId) =>
         request2Session(request).conn.importAsSQL(file.getInputStream)
       }, _ => true)
@@ -165,23 +99,10 @@ class FileUploadController
     redirect("/admin/data")
   }
 
-  private def setMultipartConfig(): Unit = {
-    val settings = loadSystemSettings()
-    val config = MultipartConfig(maxFileSize = Some(settings.upload.maxFileSize))
-    config.apply(request.getServletContext())
-  }
-
-  private def setMultipartConfigForLargeFile(): Unit = {
-    val settings = loadSystemSettings()
-    val config = MultipartConfig(maxFileSize = Some(settings.upload.largeMaxFileSize))
-    config.apply(request.getServletContext())
-  }
-
   private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
-    implicit val session: Session = Database.getSession(request)
+    implicit val session = Database.getSession(request)
     getRepository(owner, repository) match {
-      case Some(x) =>
+      case Some(x) => x.repository.options.wikiOption match {
-        x.repository.options.wikiOption match {
         case "ALL"     if !x.repository.isPrivate => action
         case "PUBLIC"  if hasGuestRole(owner, repository, Some(loginAccount)) => action
         case "PRIVATE" if hasDeveloperRole(owner, repository, Some(loginAccount)) => action
@@ -191,13 +112,13 @@ 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 {
-    fileParams.get("file") match {
+    case Some(file) if(mimeTypeChcker(file.name)) =>
-      case Some(file) if mimeTypeChecker(file.name) =>
+      defining(FileUtil.generateFileId){ fileId =>
-        val fileId = FileUtil.generateFileId
         f(file, fileId)
         contentType = "text/plain"
         Ok(fileId)
+      }
     case _ => BadRequest()
   }
 

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

@@ -1,45 +1,23 @@
 package gitbucket.core.controller
 
-import java.net.URI
-
-import com.nimbusds.oauth2.sdk.id.State
-import com.nimbusds.openid.connect.sdk.Nonce
 import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util._
+import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.view.helpers._
+import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
-import org.scalatra.Ok
 import org.scalatra.forms._
+import org.scalatra.Ok
+
+
+class IndexController extends IndexControllerBase
+  with RepositoryService with ActivityService with AccountService with RepositorySearchService with IssuesService
+  with UsersAuthenticator with ReferrerAuthenticator
 
-class IndexController
-    extends IndexControllerBase
-    with RepositoryService
-    with ActivityService
-    with AccountService
-    with RepositorySearchService
-    with IssuesService
-    with LabelsService
-    with MilestonesService
-    with PrioritiesService
-    with UsersAuthenticator
-    with ReferrerAuthenticator
-    with AccessTokenService
-    with AccountFederationService
-    with OpenIDConnectService
-    with RequestCache
 
 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService with ActivityService with AccountService with RepositorySearchService
-    with ActivityService
+    with UsersAuthenticator with ReferrerAuthenticator =>
-    with AccountService
-    with RepositorySearchService
-    with UsersAuthenticator
-    with ReferrerAuthenticator
-    with AccessTokenService
-    with AccountFederationService
-    with OpenIDConnectService =>
 
   case class SignInForm(userName: String, password: String, hash: Option[String])
 
@@ -57,115 +35,48 @@ trait IndexControllerBase extends ControllerBase {
 //
 //  case class SearchForm(query: String, owner: String, repository: String)
 
-  case class OidcContext(state: State, nonce: Nonce, redirectBackURI: String)
 
-  get("/") {
+  get("/"){
-    context.loginAccount
+    context.loginAccount.map { account =>
-      .map { account =>
       val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
-        gitbucket.core.html.index(
+      gitbucket.core.html.index(getRecentActivitiesByOwners(visibleOwnerSet), Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
-          getRecentActivitiesByOwners(visibleOwnerSet),
+    }.getOrElse {
-          getVisibleRepositories(
+      gitbucket.core.html.index(getRecentActivities(), getVisibleRepositories(None, withoutPhysicalInfo = true), Nil)
-            Some(account),
-            None,
-            withoutPhysicalInfo = true,
-            limit = context.settings.limitVisibleRepositories
-          ),
-          showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
-            account.userName
-          )
-        )
-      }
-      .getOrElse {
-        gitbucket.core.html.index(
-          getRecentPublicActivities(),
-          getVisibleRepositories(None, withoutPhysicalInfo = true),
-          showBannerToCreatePersonalAccessToken = false
-        )
     }
   }
 
-  get("/signin") {
+  get("/signin"){
     val redirect = params.get("redirect")
-    if (redirect.isDefined && redirect.get.startsWith("/")) {
+    if(redirect.isDefined && redirect.get.startsWith("/")){
-      flash.update(Keys.Flash.Redirect, redirect.get)
+      flash += Keys.Flash.Redirect -> redirect.get
     }
     gitbucket.core.html.signin(flash.get("userName"), flash.get("password"), flash.get("error"))
   }
 
-  post("/signin", signinForm) { form =>
+  post("/signin", signinForm){ form =>
     authenticate(context.settings, form.userName, form.password) match {
-      case Some(account) =>
+      case Some(account) => signin(account, form.hash)
-        flash.get(Keys.Flash.Redirect) match {
+      case None          => {
-          case Some(redirectUrl: String) => signin(account, redirectUrl + form.hash.getOrElse(""))
+        flash += "userName" -> form.userName
-          case _                         => signin(account)
+        flash += "password" -> form.password
-        }
+        flash += "error" -> "Sorry, your Username and/or Password is incorrect. Please try again."
-      case None =>
-        flash.update("userName", form.userName)
-        flash.update("password", form.password)
-        flash.update("error", "Sorry, your Username and/or Password is incorrect. Please try again.")
         redirect("/signin")
       }
     }
-
-  /**
-   * Initiate an OpenID Connect authentication request.
-   */
-  post("/signin/oidc") {
-    context.settings.oidc.map { oidc =>
-      val redirectURI = new URI(s"$baseUrl/signin/oidc")
-      val authenticationRequest = createOIDCAuthenticationRequest(oidc.issuer, oidc.clientID, redirectURI)
-      val redirectBackURI = flash.get(Keys.Flash.Redirect) match {
-        case Some(redirectBackURI: String) => redirectBackURI + params.getOrElse("hash", "")
-        case _                             => "/"
-      }
-      session.setAttribute(
-        Keys.Session.OidcContext,
-        OidcContext(authenticationRequest.getState, authenticationRequest.getNonce, redirectBackURI)
-      )
-      redirect(authenticationRequest.toURI.toString)
-    } getOrElse {
-      NotFound()
-    }
   }
 
-  /**
+  get("/signout"){
-   * Handle an OpenID Connect authentication response.
-   */
-  get("/signin/oidc") {
-    context.settings.oidc.map { oidc =>
-      val redirectURI = new URI(s"$baseUrl/signin/oidc")
-      session.get(Keys.Session.OidcContext) match {
-        case Some(context: OidcContext) =>
-          authenticate(params.toMap, redirectURI, context.state, context.nonce, oidc).map { account =>
-            signin(account, context.redirectBackURI)
-          } orElse {
-            flash.update("error", "Sorry, authentication failed. Please try again.")
-            session.invalidate()
-            redirect("/signin")
-          }
-        case _ =>
-          flash.update("error", "Sorry, something wrong. Please try again.")
-          session.invalidate()
-          redirect("/signin")
-      }
-    } getOrElse {
-      NotFound()
-    }
-  }
-
-  get("/signout") {
     session.invalidate
     redirect("/")
   }
 
-  get("/activities.atom") {
+  get("/activities.atom"){
     contentType = "application/atom+xml; type=feed"
-    xml.feed(getRecentPublicActivities())
+    xml.feed(getRecentActivities())
   }
 
-  post("/sidebar-collapse") {
+  post("/sidebar-collapse"){
-    if (params("collapse") == "true") {
+    if(params("collapse") == "true"){
       session.setAttribute("sidebar-collapse", "true")
     }  else {
       session.setAttribute("sidebar-collapse", null)
@@ -176,18 +87,22 @@ trait IndexControllerBase extends ControllerBase {
   /**
    * Set account information into HttpSession and redirect.
    */
-  private def signin(account: Account, redirectUrl: String = "/") = {
+  private def signin(account: Account, hash: Option[String]) = {
     session.setAttribute(Keys.Session.LoginAccount, account)
     updateLastLoginDate(account.userName)
 
-    if (LDAPUtil.isDummyMailAddress(account)) {
+    if(LDAPUtil.isDummyMailAddress(account)) {
       redirect("/" + account.userName + "/_edit")
     }
 
-    if (redirectUrl.stripSuffix("/") == request.getContextPath) {
+    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
+      if(redirectUrl.stripSuffix("/") == request.getContextPath){
         redirect("/")
       } else {
-      redirect(redirectUrl)
+        redirect(redirectUrl + hash.getOrElse(""))
+      }
+    }.getOrElse {
+      redirect("/")
     }
   }
 
@@ -199,28 +114,20 @@ trait IndexControllerBase extends ControllerBase {
     val user  = params("user").toBoolean
     val group = params("group").toBoolean
     org.json4s.jackson.Serialization.write(
-      Map(
+      Map("options" -> (
-        "options" -> (
         getAllUsers(false)
-            .withFilter { t =>
+          .withFilter { t => (user, group) match {
-              (user, group) match {
             case (true, true) => true
             case (true, false) => !t.isGroupAccount
             case (false, true) => t.isGroupAccount
             case (false, false) => false
-              }
+          }}.map { t =>
-            }
-            .map { t =>
             Map(
-                "label" -> s"${avatar(t.userName, 16)}<b>@${StringUtil.escapeHtml(
+              "label" -> s"<b>@${t.userName}</b> ${t.fullName}",
-                  StringUtil.cutTail(t.userName, 25, "...")
-                )}</b> ${StringUtil
-                  .escapeHtml(StringUtil.cutTail(t.fullName, 25, "..."))}",
               "value" -> t.userName
             )
           }
-        )
+      ))
-      )
     )
   })
 
@@ -229,84 +136,48 @@ trait IndexControllerBase extends ControllerBase {
    * Returns a single string which is any of "group", "user" or "".
    */
   post("/_user/existence")(usersOnly {
-    getAccountByUserNameIgnoreCase(params("userName")).map { account =>
+    getAccountByUserName(params("userName")).map { account =>
-      if (account.isGroupAccount) "group" else "user"
+      if(account.isGroupAccount) "group" else "user"
     } getOrElse ""
   })
 
-  // TODO Move to RepositoryViewrController?
+  // TODO Move to RepositoryViwerController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    val query = params.getOrElse("q", "").trim
+    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")){ case (query, target) =>
-    val target = params.getOrElse("type", "code")
       val page = try {
         val i = params.getOrElse("page", "1").toInt
-      if (i <= 0) 1 else i
+        if(i <= 0) 1 else i
       } catch {
-      case _: NumberFormatException => 1
+        case e: NumberFormatException => 1
       }
 
       target.toLowerCase match {
-      case "issues" =>
+        case "issue" => gitbucket.core.search.html.issues(
-        gitbucket.core.search.html.issues(
+          if(query.nonEmpty) searchIssues(repository.owner, repository.name, query) else Nil,
-          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
+          query, page, repository)
-          false,
-          query,
-          page,
-          repository
-        )
 
-      case "pulls" =>
+        case "wiki" => gitbucket.core.search.html.wiki(
-        gitbucket.core.search.html.issues(
+          if(query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
-          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
+          query, page, repository)
-          true,
-          query,
-          page,
-          repository
-        )
 
-      case "wiki" =>
+        case _ => gitbucket.core.search.html.code(
-        gitbucket.core.search.html.wiki(
+          if(query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
-          if (query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
+          query, page, repository)
-          query,
+      }
-          page,
-          repository
-        )
-
-      case _ =>
-        gitbucket.core.search.html.code(
-          if (query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
-          query,
-          page,
-          repository
-        )
     }
   })
 
-  get("/search") {
+  get("/search"){
     val query = params.getOrElse("query", "").trim.toLowerCase
-    val visibleRepositories =
+    val visibleRepositories = getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
-      getVisibleRepositories(
+    val repositories = visibleRepositories.filter { repository =>
-        context.loginAccount,
-        None,
-        withoutPhysicalInfo = true,
-        limit = context.settings.limitVisibleRepositories
-      )
-
-    val repositories = {
-      context.settings.limitVisibleRepositories match {
-        case true =>
-          getVisibleRepositories(
-            context.loginAccount,
-            None,
-            withoutPhysicalInfo = true,
-            limit = false
-          )
-        case false => visibleRepositories
-      }
-    }.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }
-
+    context.loginAccount.map { account =>
-    gitbucket.core.search.html.repositories(query, repositories, visibleRepositories)
+      gitbucket.core.search.html.repositories(query, repositories, Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
+    }.getOrElse {
+      gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil)
     }
+  }
+
 }