Merge pull request #1988 from kounoike/pr-fix-editor-1962

Fix editor preview bug

.github/CONTRIBUTING.md

@@ -2,7 +2,5 @@
 
 - At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before staring your work.
-- We can also support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
 - 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.
-- Write an issue, a pull request, commit messages and comments in source code in English.
 - 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

@@ -16,4 +16,3 @@
 - *describe the problem and its symptoms*
 - *explain how to reproduce*
 - *attach whatever information that can help understanding the context (screen capture, log files)*
-- *do your best to use a correct english (re-read yourself)*

.github/SUPPORT.md

@@ -2,5 +2,4 @@
 
 - At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
 - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
-- We can also support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
+- Write issues in English if it's possible. It enables many of contributors to help you.
-- Write an issue in English. Since we can't support issues written in other languages, we close them forcibly.

.scalafmt.conf

@@ -0,0 +1,11 @@
+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

@@ -3,7 +3,7 @@ sudo: true
 jdk: 
   - oraclejdk8
 script:
-  - sbt test
+  - sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
 before_script:
   - sudo /etc/init.d/mysql stop
   - sudo /etc/init.d/postgresql stop

CHANGELOG.md

@@ -0,0 +1,493 @@
+# Changelog
+All changes to the project will be documented in this file.
+
+### 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
+- 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.
+
+## 4.18.0 - 14 Oct 2017
+- Form to reply to review comment
+- Display fullname in username suggestion
+- Commit hook plugins are applied to online editing
+- Improve gitbucket-ci-plugin
+
+## 4.17.0 - 30 Sep 2017
+- [gitbucket-ci-plugin](https://github.com/takezoe/gitbucket-ci-plugin) is available
+- Transferring to URL with commit ID
+- Drop uploadable file type limitation
+- Improve Mailer API
+- Web API and webhook enhancement
+
+## 4.16.0 - 2 Sep 2017
+- Support AdminLTE color skin
+- Improve unexpected error handling
+- Show commit status on the commits list
+
+## 4.15.0 - 5 Aug 2017
+- Bundle GitBucket organization plugins
+- Notifications plugin
+- Plugin hot deployment
+- Update Slick to 3.2.1 from 3.2.0
+- Support ed25519 keys for SSH
+- Markdown preview in comment editing forms
+
+## 4.14.1 - 4 Jul 2017
+- Bug fix: Possibility of error in forking repository
+
+## 4.14 - 1 Jul 2017
+- Support priority in issues and pull requests
+- Show icons when the sidebar is collapsed
+- Support gollum events in web hook
+- Support account (user / group) level web hook
+- Add `--max_file_size` option
+- Configuration by system property or environment variable
+
+## 4.13 - 29 May 2017
+- Uploading files into the repository
+- HTML is available in Markdown
+- Added filter box to dropdown menus
+
+## 4.12 - 30 Apr 2017
+- [Gist plug-in](https://github.com/gitbucket/gitbucket-gist-plugin) provides JavaScript to embed snippet
+- Dropdown menu filter in the branch comparing page
+- Caution for the embedded H2 database
+
+## 4.11 - 1 Apr 2017
+- Deploy keys support
+- Auto generate avatar images
+- Collaborators of the private forked repository are copied from the original repository
+- Cache avatar images in the browser
+- New extension point to receive events about repository
+
+## 4.10 - 25 Feb 2017
+- Update to Scala 2.12, Scalatra 2.5 and Slick 3.2
+- Display file size in the file viewer
+
+## 4.9 - 29 Jan 2017
+- GitLFS support
+- Template for issues and pull requests
+- Manual label color editing
+- Account description
+- `--tmp-dir` option for standalone mode
+- More APIs for issues
+  - [List issues for a repository](https://developer.github.com/v3/issues/#list-issues-for-a-repository)
+  - [Create an issue](https://developer.github.com/v3/issues/#create-an-issue)
+
+## 4.8 - 23 Dec 2016
+- Search for repository names from the global header
+- Filter repositories on the sidebar of the dashboard
+- Search issues and wiki
+- Keep pull request comments after new commits are pushed
+- New web API to get a single issue
+- Performance improvement for the repository viewer
+
+## 4.7.1 - 28 Nov 2016
+- Bug fix: group repositories are not shown in the your repositories list on the sidebar
+- Small performance improvement of the dashboard
+
+## 4.7 - 26 Nov 2016
+- New permission system
+- Dropdown filter for issue labels, milestones and assignees
+- Keep sidebar folding status
+- Link from milestone label to the issue list
+
+## 4.6 - 29 Oct 2016
+- Add disable option for forking
+- Add History button to wiki page
+- Git repository URL redirection for GitHub compatibility
+- Get-Content API improvement
+- Indicate who is group master in Members tab in group view
+
+## 4.5 - 29 Sep 2016
+- Attach files by dropping into textarea
+- Issues / Pull requests switcher in dashboard
+- HikariCP could be configured in `GITBUCKET_HOME/database.conf`
+- Improve Cookie security
+- Display commit count on the history button
+- Improve mobile view
+
+## 4.4 - 28 Aug 2016
+- Import a SQL dump file to the database
+- `go get` support in private repositories
+- Sort milestones by due date
+- apache-sshd has been updated to 1.2.0
+
+## 4.3 - 30 Jul 2016
+- Emoji support by [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
+- User name suggestion
+- Add new web APIs and basic authentication support for API access
+- Root Endpoint
+  - [List endpoints](https://developer.github.com/v3/#root-endpoint)
+  - [List Branches](https://developer.github.com/v3/repos/branches/#list-branches)
+  - [Get contents](https://developer.github.com/v3/repos/contents/#get-contents)
+  - [Get a Reference](https://developer.github.com/v3/git/refs/#get-a-reference)
+  - [List Collaborators](https://developer.github.com/v3/repos/collaborators/#list-collaborators)
+  - [List user repositories](https://developer.github.com/v3/repos/#list-user-repositories)
+  - [Get a group](https://developer.github.com/v3/orgs/#get-an-organization)
+  - [List group repositories](https://developer.github.com/v3/repos/#list-organization-repositories)
+- Add new extension points
+  - `assetsMapping` : Supplies resources in plugin classpath as web assets
+  - `suggestionProvider` : Provides suggestion in the Markdown editing textarea
+  - `textDecorator` : Decorate text nodes in HTML which is converted from Markdown
+
+## 4.2.1 - 3 Jul 2016
+- Fix migration bug
+
+This is hotfix for a critical bug in migration. If you are new installation, use 4.2.0. But if you have an exisiting installation and it had been updated to 4.0 from 3.x, you must update to 4.2.1.
+
+## 4.2 - 2 Jul 2016
+- New UI based on [AdminLTE](https://github.com/almasaeed2010/AdminLTE)
+- git gc
+- Issues and Wiki have been possible to be disabled
+- SMTP configuration test mail
+
+## 4.1 - 4 Jun 2016
+- Generic ssh user
+- Improve branch protection UI
+- Default value of pull request title
+
+## 4.0 - 30 Apr 2016
+- MySQL and PostgreSQL support
+- Data export and import
+- Migration system has been switched to [solidbase](https://github.com/gitbucket/solidbase)
+
+**Note:** You can upgrade to GitBucket 4.0 from 3.14. If your GitBucket is 3.13 or before, you have to upgrade 3.14 at first.
+
+## 3.14 - 30 Apr 2016
+- File attachment and search for wiki pages
+- New extension points to add menus
+- Content-Type of webhooks has been choosable
+
+## 3.13 - 1 Apr 2016
+- Refresh user interface for wide screen
+- Add `pull_request` key in list issues API for pull requests
+- Add `X-Hub-Signature` security to webhooks
+- Provide SHA-256 checksum for `gitbucket.war`
+
+## 3.12 - 27 Feb 2016
+- New GitHub UI
+- Improve mobile view
+- Improve printing style
+- Individual URL for pull request tabs
+- SSH host configuration is separated from HTTP base URL
+
+## 3.11 - 30 Jan 2016
+- Upgrade Scalatra to 2.4
+- Sidebar and Footer for Wiki
+- Branch protection and receive hook extension point for plug-in
+- Limit recent updated repositories list
+- Issue actions look-alike GitHub
+- Web API for labels
+- Requires Java 8
+
+## 3.10 - 30 Dec 2015
+- Move to Bootstrap3
+- New URL for raw contents (`raw/master/doc/activity.md` instead of `blob/master/doc/activity.md?raw=true`)
+- Update xsbt-web-plugin
+- Update H2 database
+
+## 3.9 - 5 Dec 2015
+- GFM inline breaks support in Markdown
+- WebHook on create review comment is available
+- WebHook event trigger is selectable
+
+## 3.8 - 31 Oct 2015
+- Moved to GitHub organization
+- Omit diff view for large differences
+- Repository creation API
+- Render url as link in repository description
+- Expand attachable file types
+
+## 3.7 - 3 Oct 2015
+- Markdown processor has been switched to [markedj](https://github.com/gitbucket/markedj) from pegdown
+- Clone in desktop button
+- Providing MD5 and SHA-1 checksum for `gitbucket.war` has started
+
+## 3.6 - 30 Aug 2015
+- User interface Improvements: Especially, commit list, issues and pull request have been updated largely.
+- Installed plugins list has been available at the system administration console.
+- Pages and repository list in the sidebar have been limited and more pages and repositories link is available.
+- More reference link notation in Markdown has been supported.
+
+## 3.5 - 1 Aug 2015
+- Octicons has been applied
+- Global header has been enhanced. Now it's further similar to GitHub.
+- Default compare / pull request target has been changed to the parent repository
+- A lot of updates for [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
+
+## 3.4 - 27 Jun 2015
+- Declarative style plug-in definition
+- New extension point to add markup render
+- go-import support
+
+## 3.3 - 31 May 2015
+- Rich graphical diff for images
+- File finder is available in the repository viewer
+- Blame is displayed at the source viewer
+- Remain user data and repositories even if user is disabled
+- Mobile view improvement
+
+## 3.2 - 3 May 2015
+- Directory history button
+- Compare / pull request button
+- Limit of activity log
+
+## 3.1.1 - 4 Apr 2015
+- Rolled back H2 version to avoid version compatibility issue
+- Plug-ins became possible to access ServletContext
+
+## 3.1 - 28 Mar 2015
+- Web APIs for Jenkins github pull-request builder
+- Improved diff view
+- Bump Scalatra to 2.3.1, sbt to 0.13.8
+
+## 3.0 - 3 Mar 2015
+- New plug-in system is available
+- Connection pooling by c3p0
+- New branch UI
+- Compare between specified commit ids
+
+## 2.8 - 1 Feb 2015
+- New logo and icons
+- New system setting options to control visibility
+- Comment on side-by-side diff
+- Information message on sign-in page
+- Fork repository by group account
+
+## 2.7 - 29 Dec 2014
+- Comment for commit and diff
+- Fix security issue in markdown rendering
+- Some bug fix and improvements
+
+## 2.6 - 24 Nov 2014
+- Search box at issues and pull requests
+- Information from administrator
+- Pull request UI has been updated
+- Move to TravisCI from Buildhive
+- Some bug fix and improvements
+
+## 2.5 - 4 Nov 2014
+- New Dashboard
+- Change datetime format
+- Create branch from Web UI
+- Task list in Markdown
+- Some bug fix and improvements
+
+## 2.4.1 - 6 Oct 2014
+- Bug fix
+
+## 2.4 - 6 Oct 2014
+- New UI is applied to Issues and Pull requests
+- Side-by-side diff is available
+- Fix relative path problem in Markdown links and images
+- Plugin System is disabled in default
+- Some bug fix and improvements
+
+## 2.3 - 1 Sep 2014
+- Scala based plugin system
+- Embedded Jetty war extraction directory moved to `GITBUCKET_HOME/tmp`
+- Some bug fix and improvements
+
+## 2.2.1 - 5 Aug 2014
+- Bug fix
+
+## 2.2 - 4 Aug 2014
+- Plug-in system is available
+- Move to Scala 2.11, Scalatra 2.3 and Slick 2.1
+- tar.gz export for repository contents
+- LDAP authentication improvement (mail address became optional)
+- Show news feed of a private repository to members
+- Some bug fix and improvements
+
+## 2.1 - 6 Jul 2014
+- Upgrade to Slick 2.0 from 1.9
+- Base part of the plug-in system is merged
+- Many bug fix and improvements
+
+## 2.0 - 31 May 2014
+- Modern Github UI
+- Preview in AceEditor
+- Select lines by clicking line number in blob view
+
+## 1.13 - 29 Apr 2014
+- Direct file editing in the repository viewer using AceEditor
+- File attachment for issues
+- Atom feed of user activity
+- Fix some bugs
+
+## 1.12 - 29 Mar 2014
+- SSH repository access is available
+- Allow users can create and management their groups
+- Git submodule support
+- Close issues via commit messages
+- Show repository description below the name on repository page
+- Fix presentation of the source viewer
+- Upgrade to sbt 0.13
+- Fix some bugs
+
+## 1.11.1 - 06 Mar 2014
+- Bug fix
+
+## 1.11 - 01 Mar 2014
+- Base URL for redirection, notification and repository URL box is configurable
+- Remove ```--https``` option because it's possible to substitute in the base url
+- Headline anchor is available for Markdown contents such as Wiki page
+- Improve H2 connectivity
+- Label is available for pull requests not only issues
+- Delete branch button is added
+- Repository icons are updated
+- Select lines of source code by URL hash like `#L10` or `#L10-L15` in repository viewer
+- Display reference to issue from others in comment list
+- Fix some bugs
+
+## 1.10 - 01 Feb 2014
+- Rename repository
+- Transfer repository owner
+- Change default data directory to `HOME/.gitbucket` from `HOME/gitbucket` to avoid problem like #243, but if data directory already exist at HOME/gitbucket, it continues being used.
+- Add LDAP display name attribute
+- Response performance improvement
+- Fix some bugs
+
+## 1.9 - 28 Dec 2013
+- Display GITBUCKET_HOME on the system settings page
+- Fix some bugs
+
+## 1.8 - 30 Nov 2013
+- Add user and group deletion
+- Improve pull request performance
+- Pull request synchronization (when source repository is updated after pull request, it's applied to the pull request)
+- LDAP StartTLS support
+- Enable hard wrapping in Markdown
+- Add new some options to specify the data directory. See details in [Wiki](https://github.com/takezoe/gitbucket/wiki/DirectoryStructure).
+- Fix some bugs
+
+## 1.7 - 26 Oct 2013
+- Support working on Java6 in embedded Jetty mode
+- Add `--host` option to bind specified host name in embedded Jetty mode
+- Add `--https=true` option to force https scheme when using embedded Jetty mode at the back of https proxy
+- Add full name as user property
+- Change link color for absent Wiki pages
+- Add ZIP download button to the repository viewer tab
+- Improve ZIP exporting performance
+- Expand issue and comment textarea for long text automatically
+- Add conflict detection in Wiki
+- Add reverting wiki page from history
+- Match committer to user name by email address
+- Mail notification sender is customizable
+- Add link to changeset in refs comment for issues
+- Fix some bugs
+
+## 1.6 - 1 Oct 2013
+- Web hook
+- Performance improvement for pull request
+- Executable war file
+- Specify suitable Content-Type for downloaded files in the repository viewer
+- Fix some bugs
+
+## 1.5 - 4 Sep 2013
+- Fork and pull request
+- LDAP authentication
+- Mail notification
+- Add an option to turn off the gravatar support
+- Add the branch tab in the repository viewer
+- Encoding auto detection for the file content in the repository viewer
+- Add favicon, header logo and icons for the timeline
+- Specify data directory via environment variable GITBUCKET_HOME
+- Fix some bugs
+
+## 1.4 - 31 Jul 2013
+- Group management
+- Repository search for code and issues
+- Display user related issues on the dashboard
+- Display participants avatar of issues on the issue page
+- Performance improvement for repository viewer
+- Alert by milestone due date
+- H2 database administration console
+- Fix some bugs
+
+## 1.3 - 18 Jul 2013
+- Batch updating for issues
+- Display assigned user on issue list
+- User icon and Gravatar support
+- Convert @xxxx to link to the account page
+- Add copy to clipboard button for git clone URL
+- Allow multi-byte characters as wiki page name
+- Allow to create the empty repository
+- Fix some bugs
+
+## 1.2 - 09 Jul 2013
+- Add activity timeline
+- Bugfix for Git 1.8.1.5 or later
+- Allow multi-byte characters as label
+- Fix some bugs
+
+## 1.1 - 05 Jul 2013
+- Fix some bugs
+- Upgrade to JGit 3.0
+
+## 1.0 - 04 Jul 2013
+- This is a first public release

README.md

@@ -1,4 +1,4 @@
-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 [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12)
 =========
 
 GitBucket is a Git web platform powered by Scala offering:
@@ -66,418 +66,16 @@ Support
 
 - If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
 - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
-- We can also provide support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- Write an issue in English. At least, write subject in English.
 - 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.
 
-Release Notes
+What's New in 4.24.x
 -------------
-### 4.16.0 - 2 Sep 2017
+### 4.24.0 - 30 Apr 2018
-- Support AdminLTE color skin
+- Diff for each review comment on pull requests
-- Improve unexpected error handling
+- Extra mail addresses support
-- Show commit status on the commits list
+- 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.15.0 - 5 Aug 2017
+See the [change log](CHANGELOG.md) for all of the updates.
-- Bundle GitBucket organization plugins
-- Notifications plugin
-- Plugin hot deployment
-- Update Slick to 3.2.1 from 3.2.0
-- Support ed25519 keys for SSH
-- Markdown preview in comment editing forms
-
-### 4.14.1 - 4 Jul 2017
-- Bug fix: Possibility of error in forking repository
-
-### 4.14 - 1 Jul 2017
-- Support priority in issues and pull requests
-- Show icons when the sidebar is collapsed
-- Support gollum events in web hook
-- Support account (user / group) level web hook
-- Add `--max_file_size` option
-- Configuration by system property or environment variable
-
-### 4.13 - 29 May 2017
-- Uploading files into the repository
-- HTML is available in Markdown
-- Added filter box to dropdown menus
-
-### 4.12 - 30 Apr 2017
-- [Gist plug-in](https://github.com/gitbucket/gitbucket-gist-plugin) provides JavaScript to embed snippet
-- Dropdown menu filter in the branch comparing page
-- Caution for the embedded H2 database
-
-### 4.11 - 1 Apr 2017
-- Deploy keys support
-- Auto generate avatar images
-- Collaborators of the private forked repository are copied from the original repository
-- Cache avatar images in the browser
-- New extension point to receive events about repository
-
-### 4.10 - 25 Feb 2017
-- Update to Scala 2.12, Scalatra 2.5 and Slick 3.2
-- Display file size in the file viewer
-
-### 4.9 - 29 Jan 2017
-- GitLFS support
-- Template for issues and pull requests
-- Manual label color editing
-- Account description
-- `--tmp-dir` option for standalone mode
-- More APIs for issues
-  - [List issues for a repository](https://developer.github.com/v3/issues/#list-issues-for-a-repository)
-  - [Create an issue](https://developer.github.com/v3/issues/#create-an-issue)
-
-### 4.8 - 23 Dec 2016
-- Search for repository names from the global header
-- Filter repositories on the sidebar of the dashboard
-- Search issues and wiki
-- Keep pull request comments after new commits are pushed
-- New web API to get a single issue
-- Performance improvement for the repository viewer
-
-### 4.7.1 - 28 Nov 2016
-- Bug fix: group repositories are not shown in the your repositories list on the sidebar
-- Small performance improvement of the dashboard
-
-### 4.7 - 26 Nov 2016
-- New permission system
-- Dropdown filter for issue labels, milestones and assignees
-- Keep sidebar folding status
-- Link from milestone label to the issue list
-
-### 4.6 - 29 Oct 2016
-- Add disable option for forking
-- Add History button to wiki page
-- Git repository URL redirection for GitHub compatibility
-- Get-Content API improvement
-- Indicate who is group master in Members tab in group view
-
-### 4.5 - 29 Sep 2016
-- Attach files by dropping into textarea
-- Issues / Pull requests switcher in dashboard
-- HikariCP could be configured in `GITBUCKET_HOME/database.conf`
-- Improve Cookie security
-- Display commit count on the history button
-- Improve mobile view
-
-### 4.4 - 28 Aug 2016
-- Import a SQL dump file to the database
-- `go get` support in private repositories
-- Sort milestones by due date
-- apache-sshd has been updated to 1.2.0
-
-### 4.3 - 30 Jul 2016
-- Emoji support by [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
-- User name suggestion
-- Add new web APIs and basic authentication support for API access
-- Root Endpoint
-  - [List endpoints](https://developer.github.com/v3/#root-endpoint)
-  - [List Branches](https://developer.github.com/v3/repos/branches/#list-branches)
-  - [Get contents](https://developer.github.com/v3/repos/contents/#get-contents)
-  - [Get a Reference](https://developer.github.com/v3/git/refs/#get-a-reference)
-  - [List Collaborators](https://developer.github.com/v3/repos/collaborators/#list-collaborators)
-  - [List user repositories](https://developer.github.com/v3/repos/#list-user-repositories)
-  - [Get a group](https://developer.github.com/v3/orgs/#get-an-organization)
-  - [List group repositories](https://developer.github.com/v3/repos/#list-organization-repositories)
-- Add new extension points
-  - `assetsMapping` : Supplies resources in plugin classpath as web assets
-  - `suggestionProvider` : Provides suggestion in the Markdown editing textarea
-  - `textDecorator` : Decorate text nodes in HTML which is converted from Markdown
-
-### 4.2.1 - 3 Jul 2016
-- Fix migration bug
-
-This is hotfix for a critical bug in migration. If you are new installation, use 4.2.0. But if you have an exisiting installation and it had been updated to 4.0 from 3.x, you must update to 4.2.1.
-
-### 4.2 - 2 Jul 2016
-- New UI based on [AdminLTE](https://github.com/almasaeed2010/AdminLTE)
-- git gc
-- Issues and Wiki have been possible to be disabled
-- SMTP configuration test mail
-
-### 4.1 - 4 Jun 2016
-- Generic ssh user
-- Improve branch protection UI
-- Default value of pull request title
-
-### 4.0 - 30 Apr 2016
-- MySQL and PostgreSQL support
-- Data export and import
-- Migration system has been switched to [solidbase](https://github.com/gitbucket/solidbase)
-
-**Note:** You can upgrade to GitBucket 4.0 from 3.14. If your GitBucket is 3.13 or before, you have to upgrade 3.14 at first.
-
-### 3.14 - 30 Apr 2016
-- File attachment and search for wiki pages
-- New extension points to add menus
-- Content-Type of webhooks has been choosable
-
-### 3.13 - 1 Apr 2016
-- Refresh user interface for wide screen
-- Add `pull_request` key in list issues API for pull requests
-- Add `X-Hub-Signature` security to webhooks
-- Provide SHA-256 checksum for `gitbucket.war`
-
-### 3.12 - 27 Feb 2016
-- New GitHub UI
-- Improve mobile view
-- Improve printing style
-- Individual URL for pull request tabs
-- SSH host configuration is separated from HTTP base URL
-
-### 3.11 - 30 Jan 2016
-- Upgrade Scalatra to 2.4
-- Sidebar and Footer for Wiki
-- Branch protection and receive hook extension point for plug-in
-- Limit recent updated repositories list
-- Issue actions look-alike GitHub
-- Web API for labels
-- Requires Java 8
-
-### 3.10 - 30 Dec 2015
-- Move to Bootstrap3
-- New URL for raw contents (`raw/master/doc/activity.md` instead of `blob/master/doc/activity.md?raw=true`)
-- Update xsbt-web-plugin
-- Update H2 database
-
-### 3.9 - 5 Dec 2015
-- GFM inline breaks support in Markdown
-- WebHook on create review comment is available
-- WebHook event trigger is selectable
-
-### 3.8 - 31 Oct 2015
-- Moved to GitHub organization
-- Omit diff view for large differences
-- Repository creation API
-- Render url as link in repository description
-- Expand attachable file types
-
-### 3.7 - 3 Oct 2015
-- Markdown processor has been switched to [markedj](https://github.com/gitbucket/markedj) from pegdown
-- Clone in desktop button
-- Providing MD5 and SHA-1 checksum for `gitbucket.war` has started
-
-### 3.6 - 30 Aug 2015
-- User interface Improvements: Especially, commit list, issues and pull request have been updated largely.
-- Installed plugins list has been available at the system administration console.
-- Pages and repository list in the sidebar have been limited and more pages and repositories link is available.
-- More reference link notation in Markdown has been supported.
-
-### 3.5 - 1 Aug 2015
-- Octicons has been applied
-- Global header has been enhanced. Now it's further similar to GitHub.
-- Default compare / pull request target has been changed to the parent repository
-- A lot of updates for [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
-
-### 3.4 - 27 Jun 2015
-- Declarative style plug-in definition
-- New extension point to add markup render
-- go-import support
-
-### 3.3 - 31 May 2015
-- Rich graphical diff for images
-- File finder is available in the repository viewer
-- Blame is displayed at the source viewer
-- Remain user data and repositories even if user is disabled
-- Mobile view improvement
-
-### 3.2 - 3 May 2015
-- Directory history button
-- Compare / pull request button
-- Limit of activity log
-
-### 3.1.1 - 4 Apr 2015
-- Rolled back H2 version to avoid version compatibility issue
-- Plug-ins became possible to access ServletContext
-
-### 3.1 - 28 Mar 2015
-- Web APIs for Jenkins github pull-request builder
-- Improved diff view
-- Bump Scalatra to 2.3.1, sbt to 0.13.8
-
-### 3.0 - 3 Mar 2015
-- New plug-in system is available
-- Connection pooling by c3p0
-- New branch UI
-- Compare between specified commit ids
-
-### 2.8 - 1 Feb 2015
-- New logo and icons
-- New system setting options to control visibility
-- Comment on side-by-side diff
-- Information message on sign-in page
-- Fork repository by group account
-
-### 2.7 - 29 Dec 2014
-- Comment for commit and diff
-- Fix security issue in markdown rendering
-- Some bug fix and improvements
-
-### 2.6 - 24 Nov 2014
-- Search box at issues and pull requests
-- Information from administrator
-- Pull request UI has been updated
-- Move to TravisCI from Buildhive
-- Some bug fix and improvements
-
-### 2.5 - 4 Nov 2014
-- New Dashboard
-- Change datetime format
-- Create branch from Web UI
-- Task list in Markdown
-- Some bug fix and improvements
-
-### 2.4.1 - 6 Oct 2014
-- Bug fix
-
-### 2.4 - 6 Oct 2014
-- New UI is applied to Issues and Pull requests
-- Side-by-side diff is available
-- Fix relative path problem in Markdown links and images
-- Plugin System is disabled in default
-- Some bug fix and improvements
-
-### 2.3 - 1 Sep 2014
-- Scala based plugin system
-- Embedded Jetty war extraction directory moved to `GITBUCKET_HOME/tmp`
-- Some bug fix and improvements
-
-### 2.2.1 - 5 Aug 2014
-- Bug fix
-
-### 2.2 - 4 Aug 2014
-- Plug-in system is available
-- Move to Scala 2.11, Scalatra 2.3 and Slick 2.1
-- tar.gz export for repository contents
-- LDAP authentication improvement (mail address became optional)
-- Show news feed of a private repository to members
-- Some bug fix and improvements
-
-### 2.1 - 6 Jul 2014
-- Upgrade to Slick 2.0 from 1.9
-- Base part of the plug-in system is merged
-- Many bug fix and improvements
-
-### 2.0 - 31 May 2014
-- Modern Github UI
-- Preview in AceEditor
-- Select lines by clicking line number in blob view
-
-### 1.13 - 29 Apr 2014
-- Direct file editing in the repository viewer using AceEditor
-- File attachment for issues
-- Atom feed of user activity
-- Fix some bugs
-
-### 1.12 - 29 Mar 2014
-- SSH repository access is available
-- Allow users can create and management their groups
-- Git submodule support
-- Close issues via commit messages
-- Show repository description below the name on repository page
-- Fix presentation of the source viewer
-- Upgrade to sbt 0.13
-- Fix some bugs
-
-### 1.11.1 - 06 Mar 2014
-- Bug fix
-
-### 1.11 - 01 Mar 2014
-- Base URL for redirection, notification and repository URL box is configurable
-- Remove ```--https``` option because it's possible to substitute in the base url
-- Headline anchor is available for Markdown contents such as Wiki page
-- Improve H2 connectivity
-- Label is available for pull requests not only issues
-- Delete branch button is added
-- Repository icons are updated
-- Select lines of source code by URL hash like `#L10` or `#L10-L15` in repository viewer
-- Display reference to issue from others in comment list
-- Fix some bugs
-
-### 1.10 - 01 Feb 2014
-- Rename repository
-- Transfer repository owner
-- Change default data directory to `HOME/.gitbucket` from `HOME/gitbucket` to avoid problem like #243, but if data directory already exist at HOME/gitbucket, it continues being used.
-- Add LDAP display name attribute
-- Response performance improvement
-- Fix some bugs
-
-### 1.9 - 28 Dec 2013
-- Display GITBUCKET_HOME on the system settings page
-- Fix some bugs
-
-### 1.8 - 30 Nov 2013
-- Add user and group deletion
-- Improve pull request performance
-- Pull request synchronization (when source repository is updated after pull request, it's applied to the pull request)
-- LDAP StartTLS support
-- Enable hard wrapping in Markdown
-- Add new some options to specify the data directory. See details in [Wiki](https://github.com/takezoe/gitbucket/wiki/DirectoryStructure).
-- Fix some bugs
-
-### 1.7 - 26 Oct 2013
-- Support working on Java6 in embedded Jetty mode
-- Add `--host` option to bind specified host name in embedded Jetty mode
-- Add `--https=true` option to force https scheme when using embedded Jetty mode at the back of https proxy
-- Add full name as user property
-- Change link color for absent Wiki pages
-- Add ZIP download button to the repository viewer tab
-- Improve ZIP exporting performance
-- Expand issue and comment textarea for long text automatically
-- Add conflict detection in Wiki
-- Add reverting wiki page from history
-- Match committer to user name by email address
-- Mail notification sender is customizable
-- Add link to changeset in refs comment for issues
-- Fix some bugs
-
-### 1.6 - 1 Oct 2013
-- Web hook
-- Performance improvement for pull request
-- Executable war file
-- Specify suitable Content-Type for downloaded files in the repository viewer
-- Fix some bugs
-
-### 1.5 - 4 Sep 2013
-- Fork and pull request
-- LDAP authentication
-- Mail notification
-- Add an option to turn off the gravatar support
-- Add the branch tab in the repository viewer
-- Encoding auto detection for the file content in the repository viewer
-- Add favicon, header logo and icons for the timeline
-- Specify data directory via environment variable GITBUCKET_HOME
-- Fix some bugs
-
-### 1.4 - 31 Jul 2013
-- Group management
-- Repository search for code and issues
-- Display user related issues on the dashboard
-- Display participants avatar of issues on the issue page
-- Performance improvement for repository viewer
-- Alert by milestone due date
-- H2 database administration console
-- Fix some bugs
-
-### 1.3 - 18 Jul 2013
-- Batch updating for issues
-- Display assigned user on issue list
-- User icon and Gravatar support
-- Convert @xxxx to link to the account page
-- Add copy to clipboard button for git clone URL
-- Allow multi-byte characters as wiki page name
-- Allow to create the empty repository
-- Fix some bugs
-
-### 1.2 - 09 Jul 2013
-- Add activity timeline
-- Bugfix for Git 1.8.1.5 or later
-- Allow multi-byte characters as label
-- Fix some bugs
-
-### 1.1 - 05 Jul 2013
-- Fix some bugs
-- Upgrade to JGit 3.0
-
-### 1.0 - 04 Jul 2013
-- This is a first public release

build.sbt

@@ -1,16 +1,24 @@
+import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
+import com.typesafe.sbt.pgp.PgpKeys._
+
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.16.0"
+val GitBucketVersion = "4.24.0"
-val ScalatraVersion = "2.5.0"
+val ScalatraVersion = "2.6.1"
-val JettyVersion = "9.3.19.v20170502"
+val JettyVersion = "9.4.7.v20170914"
 
-lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)
+lazy val root = (project in file("."))
+  .enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin)
+  .settings(
+    )
 
 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.6"
+
+scalafmtOnCompile := true
 
 // dependency settings
 resolvers ++= Seq(
@@ -20,56 +28,58 @@ resolvers ++= Seq(
   "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/",
   "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
 )
+
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.8.0.201706111038-r",
+  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % "4.11.0.201803080745-r",
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.8.0.201706111038-r",
+  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % "4.11.0.201803080745-r",
   "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"               % "3.5.1",
+  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
-  "io.github.gitbucket"             %% "scalatra-forms"               % "1.1.0",
+  "org.json4s"                      %% "json4s-jackson"              % "3.5.3",
-  "commons-io"                      %  "commons-io"                   % "2.5",
+  "commons-io"                      % "commons-io"                   % "2.6",
   "io.github.gitbucket"             % "solidbase"                    % "1.0.2",
-  "io.github.gitbucket"             %  "markedj"                      % "1.0.14",
+  "io.github.gitbucket"             % "markedj"                      % "1.0.15",
-  "org.apache.commons"              %  "commons-compress"             % "1.13",
+  "org.apache.commons"              % "commons-compress"             % "1.15",
-  "org.apache.commons"              %  "commons-email"                % "1.4",
+  "org.apache.commons"              % "commons-email"                % "1.5",
-  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.3",
+  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.4",
-  "org.apache.sshd"                 %  "apache-sshd"                  % "1.4.0" exclude("org.slf4j","slf4j-jdk14"),
+  "org.apache.sshd"                 % "apache-sshd"                  % "1.6.0" exclude ("org.slf4j", "slf4j-jdk14"),
-  "org.apache.tika"                 %  "tika-core"                    % "1.14",
+  "org.apache.tika"                 % "tika-core"                    % "1.17",
   "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.10",
-  "joda-time"                       %  "joda-time"                    % "2.9.9",
   "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
-  "com.h2database"                  %  "h2"                           % "1.4.195",
+  "com.h2database"                  % "h2"                           % "1.4.196",
-  "org.mariadb.jdbc"                %  "mariadb-java-client"          % "2.0.3",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.2.3",
-  "org.postgresql"                  %  "postgresql"                   % "42.0.0",
+  "org.postgresql"                  % "postgresql"                   % "42.1.4",
   "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      %  "HikariCP"                     % "2.6.1",
+  "com.zaxxer"                      % "HikariCP"                     % "2.7.4",
-  "com.typesafe"                    %  "config"                       % "1.3.1",
+  "com.typesafe"                    % "config"                       % "1.3.2",
-  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.0",
+  "com.typesafe.akka"               %% "akka-actor"                  % "2.5.8",
   "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.0.0",
   "com.github.bkromhout"            % "java-diff-utils"              % "2.1.1",
-  "org.cache2k"                     %  "cache2k-all"                  % "1.0.0.CR1",
+  "org.cache2k"                     % "cache2k-all"                  % "1.0.1.Final",
-  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.0-akka-2.4.x" exclude("c3p0","c3p0"),
+  "com.enragedginger"               %% "akka-quartz-scheduler"       % "1.6.1-akka-2.5.x" exclude ("c3p0", "c3p0"),
   "net.coobird"                     % "thumbnailator"                % "0.4.8",
   "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
+  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "5.45",
   "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
   "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
   "junit"                           % "junit"                        % "4.12" % "test",
   "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test",
-  "org.mockito"                     %  "mockito-core"                 % "2.7.22"         % "test",
+  "org.mockito"                     % "mockito-core"                 % "2.13.0" % "test",
-  "com.wix"                         %  "wix-embedded-mysql"           % "2.1.4"          % "test",
+  "com.wix"                         % "wix-embedded-mysql"           % "3.0.0" % "test",
-  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.0"            % "test",
+  "ru.yandex.qatools.embed"         % "postgresql-embedded"          % "2.6" % "test",
-  "net.i2p.crypto"                  % "eddsa"                         % "0.1.0"
+  "net.i2p.crypto"                  % "eddsa"                        % "0.2.0",
+  "is.tagomor.woothee"              % "woothee-java"                 % "1.7.0"
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method", "-Xfuture")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 
 // Test settings
 //testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
 javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
-testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
+testOptions in Test += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
 fork in Test := true
 
 // Packaging options
@@ -79,7 +89,7 @@ packageOptions += Package.MainClass("JettyLauncher")
 test in assembly := {}
 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
     }
@@ -87,17 +97,30 @@ assemblyMergeStrategy in assembly := {
 }
 
 // JRebel
-Seq(jrebelSettings: _*)
+//Seq(jrebelSettings: _*)
 
-jrebel.webLinks += (target in webappPrepare).value
+//jrebel.webLinks += (target in webappPrepare).value
-jrebel.enabled := System.getenv().get("JREBEL") != null
+//jrebel.enabled := System.getenv().get("JREBEL") != null
 javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
+  if (path.endsWith(".jar")) {
+    // Legacy JRebel agent
     Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
+  } else {
+    // New JRebel agent
+    Seq(s"-agentpath:${path}")
+  }
+}
+
+// Exclude a war file from published artifacts
+signedArtifacts := {
+  signedArtifacts.value.filterNot {
+    case (_, file) => file.getName.endsWith(".war") || file.getName.endsWith(".war.asc")
+  }
 }
 
 // Create executable war file
-val executableConfig = config("executable").hide
+val ExecutableConfig = config("executable").hide
-Keys.ivyConfigurations += executableConfig
+Keys.ivyConfigurations += ExecutableConfig
 libraryDependencies ++= Seq(
   "org.eclipse.jetty" % "jetty-security"     % JettyVersion % "executable",
   "org.eclipse.jetty" % "jetty-webapp"       % JettyVersion % "executable",
@@ -112,8 +135,8 @@ libraryDependencies ++= Seq(
 
 val executableKey = TaskKey[File]("executable")
 executableKey := {
-  import java.util.jar.{ Manifest => JarManifest }
+  import java.util.jar.Attributes.{Name => AttrName}
-  import java.util.jar.Attributes.{ Name => AttrName }
+  import java.util.jar.{Manifest => JarManifest}
 
   val workDir = Keys.target.value / "executable"
   val warName = Keys.name.value + ".war"
@@ -126,12 +149,11 @@ executableKey := {
   IO delete temp
 
   // include jetty classes
-  val jettyJars = Keys.update.value select configurationFilter(name = executableConfig.name)
+  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
@@ -140,7 +162,7 @@ executableKey := {
 
   // include launcher classes
   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)
   }
@@ -148,35 +170,32 @@ executableKey := {
   // include plugins
   val pluginsDir = temp / "WEB-INF" / "classes" / "plugins"
   IO createDirectory (pluginsDir)
-  IO copyFile(Keys.baseDirectory.value / "plugins.json", pluginsDir / "plugins.json")
+  IO copyFile (Keys.baseDirectory.value / "plugins.json", pluginsDir / "plugins.json")
 
-  val json = IO read(Keys.baseDirectory.value / "plugins.json")
+  val json = IO read (Keys.baseDirectory.value / "plugins.json")
-  PluginsJson.parse(json).foreach { case (plugin, version) =>
+  PluginsJson.getUrls(json).foreach { url =>
-    val url = if(plugin == "gitbucket-pages-plugin"){
-      s"https://github.com/gitbucket/${plugin}/releases/download/v${version}/${plugin}_${scalaBinaryVersion.value}-${version}.jar"
-    } else {
-      s"https://github.com/gitbucket/${plugin}/releases/download/${version}/${plugin}_${scalaBinaryVersion.value}-${version}.jar"
-    }
     log info s"Download: ${url}"
-    IO download(new java.net.URL(url), pluginsDir / s"${plugin}_${scalaBinaryVersion.value}-${version}.jar")
+    IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
   }
 
   // zip it up
   IO delete (temp / "META-INF" / "MANIFEST.MF")
-  val contentMappings   = (temp.*** --- PathFinder(temp)).get pair relativeTo(temp)
+  val contentMappings = (temp.allPaths --- PathFinder(temp)).get pair { file =>
+    IO.relativizeFile(temp, file)
+  }
   val manifest = new JarManifest
   manifest.getMainAttributes put (AttrName.MANIFEST_VERSION, "1.0")
   manifest.getMainAttributes put (AttrName.MAIN_CLASS, "JettyLauncher")
   val outputFile = workDir / warName
-  IO jar (contentMappings, outputFile, manifest)
+  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest)
 
   // generate checksums
   Seq(
     "md5" -> "MD5",
     "sha1" -> "SHA-1",
     "sha256" -> "SHA-256"
-  )
+  ).foreach {
-  .foreach { case (extension, algorithm) =>
+    case (extension, algorithm) =>
       val checksumFile = workDir / (warName + "." + extension)
       Checksums generate (outputFile, checksumFile, algorithm)
   }
@@ -191,7 +210,9 @@ publishTo := {
   else Some("releases" at nexus + "service/local/staging/deploy/maven2")
 }
 publishMavenStyle := true
-pomIncludeRepository := { _ => false }
+pomIncludeRepository := { _ =>
+  false
+}
 pomExtra := (
   <url>https://github.com/gitbucket/gitbucket</url>
   <licenses>
@@ -237,3 +258,8 @@ pomExtra := (
     </developer>
   </developers>
 )
+
+licenseOverrides := {
+  case DepModuleInfo("com.github.bkromhout", "java-diff-utils", _) =>
+    LicenseInfo(LicenseCategory.Apache, "Apache-2.0", "http://www.apache.org/licenses/LICENSE-2.0")
+}

contrib/linux/redhat/selinux/gitbucket.te

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,32 @@
+# 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

@@ -0,0 +1,14 @@
+#!/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/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,6 +17,11 @@ 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  |
 
 ### comment
 
@@ -54,3 +59,23 @@ 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.

doc/jrebel.md

@@ -2,23 +2,15 @@ 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 following slow "app restart" in sbt following a code change:
+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.
-> jetty:start
-```
-
-While JRebel is not open source, it does reload your code faster than the `~;copy-resources;aux-compile` way of doing things using `sbt`.
-
-It's only used during development, and doesn't change your deployed app in any way.
-
-JRebel used to be free for Scala developers, but that changed recently, and now there's a cost associated with usage for Scala. There are trial plans and free non-commercial licenses available if you just want to try it out.
 
 ----
 
 ## 1. Get a JRebel license
 
-Sign up for a [usage plan](https://my.jrebel.com/). You will need to create an account.
+Sign up for a [myJRebel](https://my.jrebel.com/register). You will need to create an account.
 
 ## 2. Download JRebel
 
@@ -27,9 +19,7 @@ Next, unzip the downloaded file.
 
 ## 3. Activate
 
-Follow the [instructions on the JRebel website](https://zeroturnaround.com/software/jrebel/download/prev-releases/) to activate your downloaded JRebel.
+Follow `readme.txt` in the extracted directory to activate your downloaded JRebel.
-
-You can use the default settings for all the configurations.
 
 You don't need to integrate with your IDE, since we're using sbt to do the servlet deployment.
 
@@ -38,17 +28,16 @@ You don't need to integrate with your IDE, since we're using sbt to do the servl
 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:
+To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux) and set the environment variable `JREBEL`.
+For example, if you unzipped your JRebel download in your home directory, you would use:
 
 ```bash
-export JREBEL=/path/to/jrebel/jrebel.jar
+export JREBEL=~/jrebel/legacy/jrebel.jar      # legacy agent
+export JREBEL=~/jrebel/lib/libjrebel64.dylib  # new agent
 ```
 
-For example, if you unzipped your JRebel download in your home directory, you whould use:
+You can choose the legacy JRebel agent or the new one.
-
+See [the document](https://zeroturnaround.com/software/jrebel/jrebel7-agent-upgrade-cli/) for details.
-```bash
-export JREBEL=~/jrebel/jrebel.jar
-```
 
 Now reload your shell:
 
@@ -73,39 +62,26 @@ $ ./sbt
 You will start the servlet container slightly differently now that you're using sbt.
 
 ```
-> jetty:start
+> jetty:quickstart
 :
-[info] starting server ...
+2017-09-21 15:46:35 JRebel:
-[success] Total time: 3 s, completed Jan 3, 2016 9:47:55 PM
+2017-09-21 15:46:35 JRebel:  #############################################################
-2016-01-03 21:47:57 JRebel:
+2017-09-21 15:46:35 JRebel:
-2016-01-03 21:47:57 JRebel: A newer version '6.3.1' is available for download
+2017-09-21 15:46:35 JRebel:  Legacy Agent 7.0.15 (201709080836)
-2016-01-03 21:47:57 JRebel: from http://zeroturnaround.com/software/jrebel/download/
+2017-09-21 15:46:35 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
-2016-01-03 21:47:57 JRebel:
+2017-09-21 15:46:35 JRebel:
-2016-01-03 21:47:58 JRebel: Contacting myJRebel server ..
+2017-09-21 15:46:35 JRebel:  Over the last 2 days JRebel prevented
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/classes' will be monitored for changes.
+2017-09-21 15:46:35 JRebel:  at least 8 redeploys/restarts saving you about 0.3 hours.
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/test-classes' will be monitored for changes.
+2017-09-21 15:46:35 JRebel:
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/webapp' will be monitored for changes.
+2017-09-21 15:46:35 JRebel:  Licensed to Naoki Takezoe (using myJRebel).
-2016-01-03 21:48:00 JRebel:
+2017-09-21 15:46:35 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
+2017-09-21 15:46:35 JRebel:
-2016-01-03 21:48:00 JRebel:
+2017-09-21 15:46:35 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:  JRebel Legacy Agent 6.2.5 (201509291538)
+2017-09-21 15:46:35 JRebel:
-2016-01-03 21:48:00 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 30 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 182 redeploys/restarts saving you about 7.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 324 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 1538 redeploys/restarts saving you about 62.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Licensed to nazo king (using myJRebel).
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:
 :
 
-> ~ copy-resources
+> ~compile
-[success] Total time: 0 s, completed Jan 3, 2016 9:13:54 PM
+[success] Total time: 2 s, completed 2017/09/21 15:50:06
 1. Waiting for source changes... (press enter to interrupt)
 ```
 
@@ -114,12 +90,11 @@ For example, you can change the title on `src/main/twirl/gitbucket/core/main.sca
 
 ```html
 :
-  <a class="navbar-brand" href="@path/">
+  <a href="@context.path/" class="logo">
-    <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px;"/>GitBucket
+    <img src="@helpers.assets("/common/images/gitbucket.svg")" style="width: 24px; height: 24px; display: inline;"/>
-    @defining(AutoUpdate.getCurrentVersion){ version =>
+    GitBucket
-      <span class="header-version">@version.majorVersion.@version.minorVersion</span>
-    }
     change code !!!!!!!!!!!!!!!!
+    <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span>
   </a>
 :
 ```
@@ -128,21 +103,17 @@ If JRebel is doing is correctly installed you will see a notice for you:
 
 ```
 1. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:48:42 JRebel: Reloading class 'gitbucket.core.html.main$'.
+[info] Compiling 1 Scala source to /Users/naoki.takezoe/gitbucket/target/scala-2.12/classes...
-[info] Wrote rebel.xml to /git/gitbucket/target/scala-2.11/resource_managed/main/rebel.xml
+[success] Total time: 1 s, completed 2017/09/21 15:55:40
-[info] Compiling 1 Scala source to /git/gitbucket/target/scala-2.11/classes...
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
-2. Waiting for source changes... (press enter to interrupt)
 ```
 
 And you reload browser, JRebel give notice of that it has reloaded classes:
 
 ```
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
 2. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:49:13 JRebel: Reloading class 'gitbucket.core.html.main$'.
+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 routes patterns, there is nothing JRebel can do, you will have to run `jetty:start`.
+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

@@ -0,0 +1,101 @@
+# gitbucket-licenses
+
+Category | License | Dependency | Notes
+--- | --- | --- | ---
+Apache | [         Apache License, Version 2.0       ](         http://opensource.org/licenses/apache2.0.php       ) | org.osgi # org.osgi.core # 4.3.1 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.googlecode.javaewah # JavaEWAH # 1.1.6 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-all # 1.0.0.CR1 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.objenesis # objenesis # 2.5 | <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.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-core # 1.4.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 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 License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | commons-io # commons-io # 2.5 | <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 License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-compress # 1.13 | <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 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, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpclient # 4.5.3 | <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) | org.apache.httpcomponents # httpmime # 4.5.2 | <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) | org.liquibase # liquibase-core # 3.4.1 | <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 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 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 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 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 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 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 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 Software License, Version 1.1](http://www.apache.org/licenses/LICENSE-1.1) | org.bouncycastle # bcpg-jdk15on # 1.56 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.github.bkromhout # java-diff-utils # 2.1.1 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0.html) | com.typesafe.play # twirl-api_2.12 # 1.3.7 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | 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.1 | <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.1 | <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 | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-annotations # 2.8.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-core # 2.8.4 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-databind # 2.8.4 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.github.takezoe # blocking-slick-32_2.12 # 0.0.10 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.google.code.findbugs # jsr305 # 3.0.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.zaxxer # HikariCP # 2.6.1 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | 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) | 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 # scalatra-forms_2.12 # 1.1.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # solidbase # 1.0.2 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy # 1.6.11 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy-agent # 1.6.11 | <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) | 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) | 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.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.0 | <notextile></notextile>
+BSD | [BSD](LICENSE.txt) | com.thoughtworks.paranamer # paranamer # 2.8 | <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-common_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-json_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-scalatest_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-test_2.12 # 2.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.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 License](http://www.opensource.org/licenses/bsd-license.php) | com.wix # wix-embedded-mysql # 2.1.4 | <notextile></notextile>
+BSD | [BSD-2-Clause](https://jdbc.postgresql.org/about/license.html) | org.postgresql # postgresql # 42.0.0 | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit # 4.8.0.201706111038-r | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.archive # 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 | [Two-clause BSD-style license](http://github.com/slick/slick/blob/master/LICENSE.txt) | com.typesafe.slick # slick_2.12 # 3.2.1 | <notextile></notextile>
+CC0 | [CC0](http://creativecommons.org/publicdomain/zero/1.0/) | org.reactivestreams # reactive-streams # 1.0.0 | <notextile></notextile>
+CDDL | [COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0](https://glassfish.dev.java.net/public/CDDLv1.0.html) | javax.activation # activation # 1.1.1 | <notextile></notextile>
+GPL | [CDDL/GPLv2+CE](https://glassfish.java.net/public/CDDL+GPL_1_1.html) | com.sun.mail # javax.mail # 1.5.2 | <notextile></notextile>
+GPL with Classpath Extension | [CDDL + GPLv2 with classpath exception](https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html) | javax.servlet # javax.servlet-api # 3.1.0 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-classic # 1.2.3 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-core # 1.2.3 | <notextile></notextile>
+LGPL | [LGPL, version 2.1](http://www.gnu.org/licenses/licenses.html) | net.java.dev.jna # jna # 4.0.0 | <notextile></notextile>
+LGPL | [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.0.3 | <notextile></notextile>
+MIT | [MIT License](http://www.opensource.org/licenses/mit-license.php) | org.slf4j # slf4j-api # 1.7.25 | <notextile></notextile>
+MIT | [The MIT License](http://www.opensource.org/licenses/mit-license.php) | com.github.zafarkhaja # java-semver # 0.9.0 | <notextile></notextile>
+MIT | [The MIT License](https://jsoup.org/license) | org.jsoup # jsoup # 1.10.2 | <notextile></notextile>
+MIT | [The MIT License](http://github.com/mockito/mockito/blob/master/LICENSE) | org.mockito # mockito-all # 1.10.19 | <notextile></notextile>
+MIT | [The MIT License](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.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>
+Public Domain | [Public Domain](http://en.wikipedia.org/wiki/Public_domain) | net.i2p.crypto # eddsa # 0.1.0 | <notextile></notextile>
+unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcpkix-jdk15on # 1.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>
+

doc/readme.md

@@ -9,3 +9,4 @@ Developer's Guide
  * [Automatic Schema Updating](auto_update.md)
  * [Release Operation](release.md)
  * [JRebel integration (optional)](jrebel.md)
+ * [Licenses](licenses.md)

plugins.json

@@ -5,9 +5,9 @@
     "description": "Provides notifications feature on GitBucket.",
     "versions": [
       {
-        "version": "1.1.0",
+        "version": "1.5.0",
-        "range": ">=4.16.0",
+        "range": ">=4.23.0",
-        "file": "gitbucket-notifications-plugin_2.12-1.1.0.jar"
+        "url": "https://github.com/gitbucket/gitbucket-notifications-plugin/releases/download/1.5.0/gitbucket-notifications-plugin-assembly-1.5.0.jar"
       }
     ],
     "default": true
@@ -18,9 +18,9 @@
     "description": "Provides Emoji support for GitBucket.",
     "versions": [
       {
-        "version": "4.4.0",
+        "version": "4.5.0",
-        "range": ">=4.10.0",
+        "range": ">=4.18.0",
-        "file": "gitbucket-emoji-plugin_2.12-4.4.0.jar"
+        "url": "https://github.com/gitbucket/gitbucket-emoji-plugin/releases/download/4.5.0/gitbucket-emoji-plugin_2.12-4.5.0.jar"
       }
     ],
     "default": false
@@ -31,9 +31,9 @@
     "description": "Provides Gist feature on GitBucket.",
     "versions": [
       {
-        "version": "4.10.0",
+        "version": "4.14.0",
-        "range": ">=4.15.0",
+        "range": ">=4.23.0",
-        "file": "gitbucket-gist-plugin_2.12-4.10.0.jar"
+        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.14.0/gitbucket-gist-plugin-assembly-4.14.0.jar"
       }
     ],
     "default": false
@@ -44,9 +44,9 @@
     "description": "Project pages for gitbucket",
     "versions": [
       {
-        "version": "1.5.0",
+        "version": "1.7.0",
-        "range": ">=4.15.0",
+        "range": ">=4.23.0",
-        "file": "gitbucket-pages-plugin_2.12-1.5.0.jar"
+        "url": "https://github.com/gitbucket/gitbucket-pages-plugin/releases/download/v1.7.0/gitbucket-pages-plugin_2.12-1.7.0.jar"
       }
     ],
     "default": false

project/Checksums.scala

@@ -1,23 +1,24 @@
 import java.security.MessageDigest
 import scala.annotation._
 import sbt._
+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 =
-      IO write (target, compute(source, algorithm))
+    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() {
+      def loop(): Unit = {
         val len = is read buf
         if (len != -1) {
           md update (buf, 0, len)
@@ -28,6 +29,8 @@ object Checksums {
       md.digest()
     }
 
-  def hex(bytes:Array[Byte]):String =
+  def hex(bytes: Array[Byte]): String =
-      bytes map { it => "%02x" format (it.toInt & 0xff) } mkString ""
+    bytes map { it =>
+      "%02x" format (it.toInt & 0xff)
+    } mkString ""
 }

project/PluginsJson.scala

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

project/build.properties

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

project/plugins.sbt

@@ -1,8 +1,11 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.0")
+addSbtPlugin("com.geirsson"     % "sbt-scalafmt" % "1.5.0")
-addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"    % "1.3.13")
-addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "2.1.1")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly" % "0.14.5")
-addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
-addSbtPlugin("com.typesafe.sbt"     % "sbt-pgp"           % "0.8.3")
+//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
-addSbtPlugin("io.get-coursier"      % "sbt-coursier"      % "1.0.0-M15")
+addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.1")
+addSbtPlugin("com.jsuereth"     % "sbt-pgp"      % "1.1.0")
+addSbtCoursier
+addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")

project/project/plugins.sbt

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

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

@@ -0,0 +1,39 @@
+<?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

@@ -0,0 +1,7 @@
+<?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

@@ -0,0 +1,14 @@
+<?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

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

src/main/scala/ScalatraBootstrap.scala

@@ -1,55 +1,69 @@
-
 import java.util.EnumSet
 import javax.servlet._
 
-import gitbucket.core.controller._
+import gitbucket.core.controller.{ReleaseController, _}
 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) {
+  override def init(context: ServletContext): Unit = {
 
     val settings = loadSystemSettings()
-    if(settings.baseUrl.exists(_.startsWith("https://"))) {
+    if (settings.baseUrl.exists(_.startsWith("https://"))) {
       context.getSessionCookieConfig.setSecure(true)
     }
 
     // Register TransactionFilter and BasicAuthenticationFilter at first
     context.addFilter("transactionFilter", new TransactionFilter)
-    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context
+      .getFilterRegistration("transactionFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
     context.addFilter("gitAuthenticationFilter", new GitAuthenticationFilter)
-    context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
+    context
+      .getFilterRegistration("gitAuthenticationFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
     context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
-    context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
+    context
+      .getFilterRegistration("apiAuthenticationFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/*")
 
     // Register controllers
     context.mount(new PreProcessController, "/*")
 
     context.addFilter("pluginControllerFilter", new PluginControllerFilter)
-    context.getFilterRegistration("pluginControllerFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context
+      .getFilterRegistration("pluginControllerFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
-    context.mount(new IndexController, "/")
-    context.mount(new ApiController, "/api/v3")
     context.mount(new FileUploadController, "/upload")
-    context.mount(new SystemSettingsController, "/admin")
+
-    context.mount(new DashboardController, "/*")
+    val filter = new CompositeScalatraFilter()
-    context.mount(new AccountController, "/*")
+    filter.mount(new IndexController, "/")
-    context.mount(new RepositoryViewerController, "/*")
+    filter.mount(new ApiController, "/api/v3")
-    context.mount(new WikiController, "/*")
+    filter.mount(new SystemSettingsController, "/admin")
-    context.mount(new LabelsController, "/*")
+    filter.mount(new DashboardController, "/*")
-    context.mount(new PrioritiesController, "/*")
+    filter.mount(new AccountController, "/*")
-    context.mount(new MilestonesController, "/*")
+    filter.mount(new RepositoryViewerController, "/*")
-    context.mount(new IssuesController, "/*")
+    filter.mount(new WikiController, "/*")
-    context.mount(new PullRequestsController, "/*")
+    filter.mount(new LabelsController, "/*")
-    context.mount(new RepositorySettingsController, "/*")
+    filter.mount(new PrioritiesController, "/*")
+    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
+      .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

@@ -3,43 +3,54 @@ package gitbucket.core
 import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
 import io.github.gitbucket.solidbase.model.{Version, Module}
 
-object GitBucketCoreModule extends Module("gitbucket-core",
+object GitBucketCoreModule
-  new Version("4.0.0",
+    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 Version("4.2.0", new LiquibaseMigration("update/gitbucket-core_4.2.xml")),
-    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 Version("4.6.0", new LiquibaseMigration("update/gitbucket-core_4.6.xml")),
-    new LiquibaseMigration("update/gitbucket-core_4.6.xml")
+      new Version(
-  ),
+        "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 Version("4.9.0", new LiquibaseMigration("update/gitbucket-core_4.9.xml")),
-    new LiquibaseMigration("update/gitbucket-core_4.9.xml")
-  ),
       new Version("4.10.0"),
-  new Version("4.11.0",
+      new Version("4.11.0", new LiquibaseMigration("update/gitbucket-core_4.11.xml")),
-    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("4.14.0",
+      new Version(
+        "4.14.0",
         new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
         new SqlMigration("update/gitbucket-core_4.14.sql")
       ),
       new Version("4.14.1"),
       new Version("4.15.0"),
-  new Version("4.16.0")
+      new Version("4.16.0"),
-)
+      new Version("4.17.0"),
+      new Version("4.18.0"),
+      new Version("4.19.0"),
+      new Version("4.19.1"),
+      new Version("4.19.2"),
+      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"))
+    )

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

@@ -6,13 +6,14 @@ 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(
+case class ApiBranch(name: String, commit: ApiBranchCommit, protection: ApiBranchProtection)(
-  name: String,
+  repositoryName: RepositoryName
-  commit: ApiBranchCommit,
+) extends FieldSerializable {
-  protection: ApiBranchProtection)(repositoryName:RepositoryName) extends FieldSerializable {
+  def _links =
-  def _links = Map(
+    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)

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

@@ -4,17 +4,22 @@ import gitbucket.core.service.ProtectedBranchService
 import org.json4s._
 
 /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]){
+case class ApiBranchProtection(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 = ApiBranchProtection(
+  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection =
+    ApiBranchProtection(
       enabled = info.enabled,
-    required_status_checks = Some(Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)))
+      required_status_checks = Some(
+        Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)
+      )
+    )
   val statusNone = Status(Off, Seq.empty)
   case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
   sealed class EnforcementLevel(val name: String)
@@ -22,25 +27,28 @@ object ApiBranchProtection{
   case object NonAdmins extends EnforcementLevel("non_admins")
   case object Everyone extends EnforcementLevel("everyone")
   object EnforcementLevel {
-    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel = if(enabled){
+    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel =
-      if(includeAdministrators){
+      if (enabled) {
+        if (includeAdministrators) {
           Everyone
-      }else{
+        } else {
           NonAdmins
         }
-    }else{
+      } else {
         Off
       }
   }
 
-  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](format => (
+  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](
+    format =>
+      (
         {
           case JString("off")        => Off
           case JString("non_admins") => NonAdmins
           case JString("everyone")   => Everyone
-   },
+        }, {
-   {
           case x: EnforcementLevel => JString(x.name)
         }
- ))
+    )
+  )
 }

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

@@ -2,7 +2,6 @@ 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
  */
@@ -11,15 +10,22 @@ 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(sha:String, statuses: Iterable[(CommitStatus, Account)], repository:ApiRepository): ApiCombinedCommitStatus = ApiCombinedCommitStatus(
+  def apply(
+    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,25 +5,32 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/issues/comments/
  */
-case class ApiComment(
+case class ApiComment(id: Int, user: ApiUser, body: String, created_at: Date, updated_at: Date)(
-  id: Int,
+  repositoryName: RepositoryName,
-  user: ApiUser,
+  issueId: Int,
-  body: String,
+  isPullRequest: Boolean
-  created_at: Date,
+) {
-  updated_at: Date)(repositoryName: RepositoryName, issueId: Int, isPullRequest: Boolean){
+  val html_url = ApiPath(
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${issueId}#comment-${id}")
+    s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${issueId}#comment-${id}"
+  )
 }
 
-object ApiComment{
+object ApiComment {
-  def apply(comment: IssueComment, repositoryName: RepositoryName, issueId: Int, user: ApiUser, isPullRequest: Boolean): ApiComment =
+  def apply(
+    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)(repositoryName, issueId, isPullRequest)
+      updated_at = comment.updatedDate
+    )(repositoryName, issueId, isPullRequest)
 }

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

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

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

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

@@ -0,0 +1,129 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.Account
+import gitbucket.core.util.JGitUtil.{CommitInfo, DiffInfo}
+import gitbucket.core.util.RepositoryName
+import org.eclipse.jgit.diff.DiffEntry.ChangeType
+import ApiCommits._
+
+case class ApiCommits(
+  url: ApiPath,
+  sha: String,
+  html_url: ApiPath,
+  comment_url: ApiPath,
+  commit: Commit,
+  author: ApiUser,
+  committer: ApiUser,
+  parents: Seq[Tree],
+  stats: Stats,
+  files: Seq[File]
+)
+
+object ApiCommits {
+  case class Commit(
+    url: ApiPath,
+    author: ApiPersonIdent,
+    committer: ApiPersonIdent,
+    message: String,
+    comment_count: Int,
+    tree: Tree
+  )
+
+  case class Tree(
+    url: ApiPath,
+    sha: String
+  )
+
+  case class Stats(
+    additions: Int,
+    deletions: Int,
+    total: Int
+  )
+
+  case class File(
+    filename: String,
+    additions: Int,
+    deletions: Int,
+    changes: Int,
+    status: String,
+    raw_url: ApiPath,
+    blob_url: ApiPath,
+    patch: String
+  )
+
+  def apply(
+    repositoryName: RepositoryName,
+    commitInfo: CommitInfo,
+    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("-")) deletions = deletions + 1
+      }
+
+      File(
+        filename = if (diff.changeType == ChangeType.DELETE) { diff.oldPath } else { diff.newPath },
+        additions = additions,
+        deletions = deletions,
+        changes = additions + deletions,
+        status = diff.changeType match {
+          case ChangeType.ADD    => "added"
+          case ChangeType.MODIFY => "modified"
+          case ChangeType.DELETE => "deleted"
+          case ChangeType.RENAME => "renamed"
+          case ChangeType.COPY   => "copied"
+        },
+        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) {
+          ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.parents.head}/${diff.oldPath}")
+        } else {
+          ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.id}/${diff.newPath}")
+        },
+        patch = diff.patch.getOrElse("")
+      )
+    }
+
+    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(""),
+      commit = Commit(
+        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
+        author = ApiPersonIdent.author(commitInfo),
+        committer = ApiPersonIdent.committer(commitInfo),
+        message = commitInfo.shortMessage,
+        comment_count = commentCount,
+        tree = Tree(
+          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${commitInfo.id}"), // TODO This endpoint has not been implemented yet.
+          sha = commitInfo.id
+        )
+      ),
+      author = ApiUser(author),
+      committer = ApiUser(committer),
+      parents = commitInfo.parents.map { parent =>
+        Tree(
+          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${parent}"), // TODO This endpoint has not been implemented yet.
+          sha = parent
+        )
+      },
+      stats = Stats(
+        additions = files.map(_.additions).sum,
+        deletions = files.map(_.deletions).sum,
+        total = files.map(_.additions).sum + files.map(_.deletions).sum
+      ),
+      files = files
+    )
+  }
+}

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

@@ -11,18 +11,29 @@ case class ApiContents(
   path: String,
   sha: String,
   content: Option[String],
-  encoding: Option[String])(repositoryName: RepositoryName){
+  encoding: Option[String]
+)(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.map(arr =>
+      content
-        ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.getEncoder.encodeToString(arr)), Some("base64"))(repositoryName)
+        .map(
-      ).getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
+          arr =>
+            ApiContents(
+              "file",
+              fileInfo.name,
+              fileInfo.path,
+              fileInfo.commitId,
+              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,5 +1,3 @@
 package gitbucket.core.api
 
-case class ApiError(
+case class ApiError(message: String, documentation_url: Option[String] = None)
-  message: String,
-  documentation_url: Option[String] = None)

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

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

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

@@ -6,14 +6,12 @@ import gitbucket.core.util.RepositoryName
 /**
  * https://developer.github.com/v3/issues/labels/
  */
-case class ApiLabel(
+case class ApiLabel(name: String, color: String)(repositoryName: RepositoryName) {
-  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/ApiPath.scala

@@ -1,6 +1,13 @@
 package gitbucket.core.api
 
 /**
- * path for api url. if set path '/repos/aa/bb' then, expand 'http://server:post/repos/aa/bb' when converted to json.
+ * Path for API url.
+ * If set path '/repos/aa/bb' then, expand 'http://server:port/repos/aa/bb' when converted to json.
  */
 case class ApiPath(path: String)
+
+/**
+ * Path for git repository via SSH.
+ * If set path '/aa/bb.git' then, expand 'git@server:port/aa/bb.git' when converted to json.
+ */
+case class SshPath(path: String)

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

@@ -4,22 +4,11 @@ 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(
+    ApiPersonIdent(name = commit.authorName, email = commit.authorEmailAddress, date = commit.authorTime)
-      name  = commit.authorName,
-      email = commit.authorEmailAddress,
-      date  = commit.authorTime)
   def committer(commit: CommitInfo): ApiPersonIdent =
-    ApiPersonIdent(
+    ApiPersonIdent(name = commit.committerName, email = commit.committerEmailAddress, date = commit.commitTime)
-      name  = commit.committerName,
-      email = commit.committerEmailAddress,
-      date  = commit.commitTime)
 }

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

@@ -0,0 +1,17 @@
+package gitbucket.core.api
+
+import gitbucket.core.plugin.{PluginRegistry, 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

@@ -3,12 +3,12 @@ package gitbucket.core.api
 import gitbucket.core.model.{Account, Issue, IssueComment, PullRequest}
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/pulls/
  */
 case class ApiPullRequest(
   number: Int,
+  state: String,
   updated_at: Date,
   created_at: Date,
   head: ApiPullRequest.Commit,
@@ -19,7 +19,11 @@ case class ApiPullRequest(
   merged_by: Option[ApiUser],
   title: String,
   body: String,
-  user: ApiUser) {
+  user: ApiUser,
+  labels: List[ApiLabel],
+  assignee: Option[ApiUser]
+) {
+  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")
@@ -32,41 +36,38 @@ 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(
+      head = Commit(sha = pullRequest.commitIdTo, ref = pullRequest.requestBranch, repo = headRepo)(issue.userName),
-                     sha  = pullRequest.commitIdTo,
+      base = Commit(sha = pullRequest.commitIdFrom, ref = pullRequest.branch, repo = baseRepo)(issue.userName),
-                     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 },
       merged_by = mergedComment.map { case (_, account) => ApiUser(account) },
       title = issue.title,
       body = issue.content.getOrElse(""),
-      user       = user
+      user = user,
+      labels = labels,
+      assignee = assignee
     )
 
-  case class Commit(
+  case class Commit(sha: String, ref: String, repo: ApiRepository)(baseOwner: String) {
-    sha: String,
+    val label = if (baseOwner == repo.owner.login) { ref } else { s"${repo.owner.login}:${ref}" }
-    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

@@ -20,7 +20,8 @@ case class ApiPullRequestReviewComment(
   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) extends FieldSerializable {
+)(repositoryName: RepositoryName, issueId: Int)
+    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",
@@ -44,11 +45,17 @@ 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(comment: CommitComment, commentedUser: ApiUser, repositoryName: RepositoryName, issueId: Int): ApiPullRequestReviewComment =
+  def apply(
+    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,7 +5,5 @@ import gitbucket.core.model.Account
 case class ApiPusher(name: String, email: String)
 
 object ApiPusher {
-  def apply(user: Account): ApiPusher = ApiPusher(
+  def apply(user: Account): ApiPusher = ApiPusher(name = user.userName, email = user.mailAddress)
-    name  = user.userName,
-    email = user.mailAddress)
 }

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

@@ -3,7 +3,6 @@ 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,
@@ -13,10 +12,12 @@ case class ApiRepository(
   forks: Int,
   `private`: Boolean,
   default_branch: String,
-  owner: ApiUser)(urlIsHtmlUrl: Boolean) {
+  owner: ApiUser
+)(urlIsHtmlUrl: Boolean) {
+  val id = 0 // dummy id
   val forks_count = forks
   val watchers_count = watchers
-  val url = if(urlIsHtmlUrl){
+  val url = if (urlIsHtmlUrl) {
     ApiPath(s"/${full_name}")
   } else {
     ApiPath(s"/api/v3/repos/${full_name}")
@@ -24,15 +25,17 @@ case class ApiRepository(
   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,
-      urlIsHtmlUrl: Boolean = false): ApiRepository =
+    urlIsHtmlUrl: Boolean = false
+  ): ApiRepository =
     ApiRepository(
       name = repository.repositoryName,
       full_name = s"${repository.userName}/${repository.repositoryName}",
@@ -45,22 +48,23 @@ object ApiRepository{
     )(urlIsHtmlUrl)
 
   def apply(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount)
+    ApiRepository(repositoryInfo.repository, owner, forkedCount = repositoryInfo.forkedCount)
 
   def apply(repositoryInfo: RepositoryInfo, owner: Account): ApiRepository =
     this(repositoryInfo.repository, ApiUser(owner))
 
-  def forPushPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
+  def forWebhookPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount, urlIsHtmlUrl=true)
+    ApiRepository(repositoryInfo.repository, owner, forkedCount = repositoryInfo.forkedCount, urlIsHtmlUrl = true)
 
   def forDummyPayload(owner: ApiUser): ApiRepository =
     ApiRepository(
-      name="dummy",
+      name = "dummy",
-      full_name=s"${owner.login}/dummy",
+      full_name = s"${owner.login}/dummy",
-      description="",
+      description = "",
-      watchers=0,
+      watchers = 0,
-      forks=0,
+      forks = 0,
-      `private`=false,
+      `private` = false,
-      default_branch="master",
+      default_branch = "master",
-      owner=owner)(true)
+      owner = owner
+    )(true)
 }

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

@@ -4,13 +4,8 @@ import gitbucket.core.model.Account
 
 import java.util.Date
 
-
+case class ApiUser(login: String, email: String, `type`: String, site_admin: Boolean, created_at: Date) {
-case class ApiUser(
+  val id = 0 // dummy id
-  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")
@@ -25,12 +20,11 @@ case class ApiUser(
   // 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/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/CreateAnIssue.scala

@@ -8,4 +8,5 @@ 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

@@ -1,23 +1,27 @@
 package gitbucket.core.api
 
-import org.joda.time.DateTime
+import java.time._
-import org.joda.time.DateTimeZone
+import java.time.format.DateTimeFormatter
-import org.joda.time.format._
+import java.util.Date
+
+import scala.util.Try
+
 import org.json4s._
 import org.json4s.jackson.Serialization
-import java.util.Date
-import scala.util.Try
 
 object JsonFormat {
 
-  case class Context(baseUrl: String)
+  case class Context(baseUrl: String, sshUrl: Option[String])
 
-  val parserISO = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
+  val parserISO = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
-  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](format =>
+  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](
+    format =>
       (
-      { case JString(s) => Try(parserISO.parseDateTime(s)).toOption.map(_.toDate).getOrElse(throw new MappingException("Can't convert " + s + " to Date")) },
+        {
-      { case x: Date => JString(parserISO.print(new DateTime(x).withZone(DateTimeZone.UTC))) }
+          case JString(s) =>
+            Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date"))
+        }, { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
     )
   ) + FieldSerializer[ApiUser]() +
     FieldSerializer[ApiPullRequest]() +
@@ -33,23 +37,43 @@ object JsonFormat {
     FieldSerializer[ApiComment]() +
     FieldSerializer[ApiContents]() +
     FieldSerializer[ApiLabel]() +
+    FieldSerializer[ApiCommits]() +
+    FieldSerializer[ApiCommits.Commit]() +
+    FieldSerializer[ApiCommits.Tree]() +
+    FieldSerializer[ApiCommits.Stats]() +
+    FieldSerializer[ApiCommits.File]() +
     ApiBranchProtection.enforcementLevelSerializer
 
-  def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>
+  def apiPathSerializer(c: Context) =
-    (
+    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) =
+    new CustomSerializer[SshPath](
+      _ =>
+        ({
+          case JString(s) if c.sshUrl.exists(sshUrl => s.startsWith(sshUrl)) =>
+            SshPath(s.substring(c.sshUrl.get.length))
+          case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
+        }, {
+          case SshPath(path) =>
+            c.sshUrl.map { sshUrl =>
+              JString(sshUrl + path)
+            } getOrElse JNothing
+        })
     )
 
   /**
    * convert object to json string
    */
-  def apply(obj: AnyRef)(implicit c: Context): String = Serialization.write(obj)(jsonFormats + apiPathSerializer(c))
+  def apply(obj: AnyRef)(implicit c: Context): String =
+    Serialization.write(obj)(jsonFormats + apiPathSerializer(c) + sshPathSerializer(c))
 
 }

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

@@ -1,8 +1,10 @@
 package gitbucket.core.controller
 
+import java.io.File
+
 import gitbucket.core.account.html
 import gitbucket.core.helper
-import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, RepositoryWebHookEvent, Role, WebHook, WebHookContentType}
+import gitbucket.core.model._
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
@@ -12,90 +14,154 @@ import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util._
-import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.scalatra.BadRequest
+import org.scalatra.forms._
 
-class AccountController extends AccountControllerBase
+class AccountController
-  with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
+    extends AccountControllerBase
-  with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
+    with AccountService
-  with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService
+    with RepositoryService
-
+    with ActivityService
+    with WikiService
+    with LabelsService
+    with SshKeyService
+    with OneselfAuthenticator
+    with UsersAuthenticator
+    with GroupManagerAuthenticator
+    with ReadableUsersAuthenticator
+    with AccessTokenService
+    with WebHookService
+    with PrioritiesService
+    with RepositoryCreationService
 
 trait AccountControllerBase extends AccountManagementControllerBase {
-  self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
+  self: AccountService
-    with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
+    with RepositoryService
-    with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService =>
+    with ActivityService
+    with WikiService
+    with LabelsService
+    with SshKeyService
+    with OneselfAuthenticator
+    with UsersAuthenticator
+    with GroupManagerAuthenticator
+    with ReadableUsersAuthenticator
+    with AccessTokenService
+    with WebHookService
+    with PrioritiesService
+    with RepositoryCreationService =>
 
-  case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
+  case class AccountNewForm(
-                            description: Option[String], url: Option[String], fileId: Option[String])
+    userName: String,
+    password: String,
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String]
+  )
 
-  case class AccountEditForm(password: Option[String], fullName: String, mailAddress: String,
+  case class AccountEditForm(
-                             description: Option[String], url: Option[String], fileId: Option[String], clearImage: Boolean)
+    password: Option[String],
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    clearImage: Boolean
+  )
 
   case class SshKeyForm(title: String, publicKey: String)
 
   case class PersonalTokenForm(note: String)
 
   val newForm = mapping(
-    "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "userName" -> trim(label("User name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     , text(required, maxlength(20), password))),
+    "password" -> trim(label("Password", text(required, maxlength(20), password))),
-    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
-    "description" -> trim(label("bio"          , optional(text()))),
+    "extraMailAddresses" -> list(
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress())))
-    "fileId"      -> trim(label("File ID"      , optional(text())))
+    ),
+    "description" -> trim(label("bio", optional(text()))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text())))
   )(AccountNewForm.apply)
 
   val editForm = mapping(
-    "password"    -> trim(label("Password"     , optional(text(maxlength(20), password)))),
+    "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
-    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "description" -> trim(label("bio"          , optional(text()))),
+    "extraMailAddresses" -> list(
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
+    ),
-    "clearImage"  -> trim(label("Clear image"  , boolean()))
+    "description" -> trim(label("bio", optional(text()))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text()))),
+    "clearImage" -> trim(label("Clear image", boolean()))
   )(AccountEditForm.apply)
 
   val sshKeyForm = mapping(
     "title" -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey" -> trim2(label("Key" , text(required, validPublicKey)))
+    "publicKey" -> trim2(label("Key", text(required, validPublicKey)))
   )(SshKeyForm.apply)
 
   val personalTokenForm = mapping(
     "note" -> trim(label("Token", text(required, maxlength(100))))
   )(PersonalTokenForm.apply)
 
-  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String)
+  case class NewGroupForm(
-  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
+    groupName: String,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    members: String
+  )
+  case class EditGroupForm(
+    groupName: String,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    members: String,
+    clearImage: Boolean
+  )
 
   val newGroupForm = mapping(
-    "groupName"   -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"         -> trim(label("URL"        ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"    ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"     -> trim(label("Members"    ,text(required, members)))
+    "members" -> trim(label("Members", text(required, members)))
   )(NewGroupForm.apply)
 
   val editGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"         -> trim(label("URL"         ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"     ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"     -> trim(label("Members"     ,text(required, members))),
+    "members" -> trim(label("Members", text(required, members))),
-    "clearImage"  -> trim(label("Clear image" ,boolean()))
+    "clearImage" -> trim(label("Clear image", boolean()))
   )(EditGroupForm.apply)
 
-  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
+  case class RepositoryCreationForm(
+    owner: String,
+    name: String,
+    description: Option[String],
+    isPrivate: Boolean,
+    initOption: String,
+    sourceUrl: Option[String]
+  )
   case class ForkRepositoryForm(owner: String, name: String)
 
   val newRepositoryForm = mapping(
-    "owner"        -> trim(label("Owner"          , text(required, maxlength(100), identifier, existsAccount))),
+    "owner" -> trim(label("Owner", text(required, maxlength(100), identifier, existsAccount))),
     "name" -> trim(label("Repository name", text(required, maxlength(100), repository, uniqueRepository))),
-    "description"  -> trim(label("Description"    , optional(text()))),
+    "description" -> trim(label("Description", optional(text()))),
     "isPrivate" -> trim(label("Repository Type", boolean())),
-    "createReadme" -> trim(label("Create README"  , boolean()))
+    "initOption" -> trim(label("Initialize option", text(required))),
+    "sourceUrl" -> trim(label("Source URL", optionalRequired(_.value("initOption") == "COPY", text())))
   )(RepositoryCreationForm.apply)
 
   val forkRepositoryForm = mapping(
@@ -110,9 +176,15 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   )(AccountForm.apply)
 
   // for account web hook url addition.
-  case class AccountWebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
+  case class AccountWebHookForm(
+    url: String,
+    events: Set[WebHook.Event],
+    ctype: WebHookContentType,
+    token: Option[String]
+  )
 
-  def accountWebHookForm(update:Boolean) = mapping(
+  def accountWebHookForm(update: Boolean) =
+    mapping(
       "url" -> trim(label("url", text(required, accountWebHook(update)))),
       "events" -> accountWebhookEvents,
       "ctype" -> label("ctype", text()),
@@ -120,13 +192,14 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     )(
       (url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
     )
+
   /**
    * Provides duplication check for web hook url. duplicated from RepositorySettingsController.scala
    */
-  private def accountWebHook(needExists: Boolean): Constraint = new Constraint(){
+  private def accountWebHook(needExists: Boolean): Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(getAccountWebHook(params("userName"), value).isDefined != needExists){
+      if (getAccountWebHook(params("userName"), value).isDefined != needExists) {
-        Some(if(needExists){
+        Some(if (needExists) {
           "URL had not been registered yet."
         } else {
           "URL had been registered already."
@@ -136,20 +209,20 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       }
   }
 
-  private def accountWebhookEvents = new ValueType[Set[WebHook.Event]]{
+  private def accountWebhookEvents = new ValueType[Set[WebHook.Event]] {
-    def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
+    def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
       WebHook.Event.values.flatMap { t =>
-        params.get(name + "." + t.name).map(_ => t)
+        params.optionValue(name + "." + t.name).map(_ => t)
       }.toSet
     }
-    def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+    def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
+      if (convert(name, params, messages).isEmpty) {
         Seq(name -> messages("error.required").format(name))
       } else {
         Nil
       }
   }
 
-
   /**
    * Displays user information.
    */
@@ -159,24 +232,41 @@ trait AccountControllerBase extends AccountManagementControllerBase {
       params.getOrElse("tab", "repositories") match {
         // Public Activity
         case "activity" =>
-          gitbucket.core.account.html.activity(account,
+          gitbucket.core.account.html.activity(
-            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            account,
-            getActivitiesByUser(userName, true))
+            if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            getActivitiesByUser(userName, true)
+          )
 
         // Members
-        case "members" if(account.isGroupAccount) => {
+        case "members" if (account.isGroupAccount) => {
           val members = getGroupMembers(account.userName)
-          gitbucket.core.account.html.members(account, members,
+          gitbucket.core.account.html.members(
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+            account,
+            members,
+            context.loginAccount.exists(
+              x =>
+                members.exists { member =>
+                  member.userName == x.userName && member.isManager
+              }
+            )
+          )
         }
 
         // Repositories
         case _ => {
           val members = getGroupMembers(account.userName)
-          gitbucket.core.account.html.repositories(account,
+          gitbucket.core.account.html.repositories(
-            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            account,
+            if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
             getVisibleRepositories(context.loginAccount, Some(userName)),
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+            context.loginAccount.exists(
+              x =>
+                members.exists { member =>
+                  member.userName == x.userName && member.isManager
+              }
+            )
+          )
         }
       }
     } getOrElse NotFound()
@@ -188,21 +278,27 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     helper.xml.feed(getActivitiesByUser(userName, true))
   }
 
-  get("/:userName/_avatar"){
+  get("/:userName/_avatar") {
     val userName = params("userName")
     contentType = "image/png"
-    getAccountByUserName(userName).flatMap{ account =>
+    getAccountByUserName(userName)
+      .flatMap { account =>
         response.setDateHeader("Last-Modified", account.updatedDate.getTime)
-      account.image.map{ image =>
+        account.image
-        Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image)))
+          .map { image =>
-      }.getOrElse{
+            Some(
+              RawData(FileUtil.getMimeType(image), new File(getUserUploadDir(userName), FileUtil.checkFilename(image)))
+            )
+          }
+          .getOrElse {
             if (account.isGroupAccount) {
               TextAvatarUtil.textGroupAvatar(account.fullName)
             } else {
               TextAvatarUtil.textAvatar(account.fullName)
             }
           }
-    }.getOrElse{
+      }
+      .getOrElse {
         response.setHeader("Cache-Control", "max-age=3600")
         Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
       }
@@ -211,36 +307,39 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_edit")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
-      html.edit(x, flash.get("info"), flash.get("error"))
+      val extraMails = getAccountExtraMailAddresses(userName)
+      html.edit(x, extraMails, flash.get("info"), flash.get("error"))
     } getOrElse NotFound()
   })
 
   post("/:userName/_edit", editForm)(oneselfOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName).map { account =>
+    getAccountByUserName(userName).map {
-      updateAccount(account.copy(
+      account =>
+        updateAccount(
+          account.copy(
             password = form.password.map(sha1).getOrElse(account.password),
             fullName = form.fullName,
             mailAddress = form.mailAddress,
             description = form.description,
-        url         = form.url))
+            url = form.url
+          )
+        )
 
         updateImage(userName, form.fileId, form.clearImage)
+        updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
         flash += "info" -> "Account information has been updated."
         redirect(s"/${userName}/_edit")
 
     } getOrElse NotFound()
   })
 
-  get("/captures/(.*)".r) {
-    multiParams("captures").head
-  }
-
   get("/:userName/_delete")(oneselfOnly {
     val userName = params("userName")
 
-    getAccountByUserName(userName, true).map { account =>
+    getAccountByUserName(userName, true).map {
-      if(isLastAdministrator(account)){
+      account =>
+        if (isLastAdministrator(account)) {
           flash += "error" -> "Account can't be removed because this is last one administrator."
           redirect(s"/${userName}/_edit")
         } else {
@@ -289,9 +388,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(userName).map { x =>
       var tokens = getAccessTokens(x.userName)
       val generatedToken = flash.get("generatedToken") match {
-        case Some((tokenId:Int, token:String)) => {
+        case Some((tokenId: Int, token: String)) => {
           val gt = tokens.find(_.accessTokenId == tokenId)
-          gt.map{ t =>
+          gt.map { t =>
             tokens = tokens.filterNot(_ == t)
             (t, token)
           }
@@ -362,7 +461,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_hooks/edit")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).flatMap { account =>
-      getAccountWebHook(userName, params("url")).map { case (webhook, events) =>
+      getAccountWebHook(userName, params("url")).map {
+        case (webhook, events) =>
           html.edithook(webhook, events, account, false)
       }
     } getOrElse NotFound()
@@ -389,7 +489,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     import org.apache.http.util.EntityUtils
     import scala.concurrent.ExecutionContext.Implicits.global
 
-    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h => Array(h.getName, h.getValue) }
+    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h =>
+      Array(h.getName, h.getValue)
+    }
 
     val userName = params("userName")
     val url = params("url")
@@ -403,31 +505,49 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
     val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
 
-    val toErrorMap: PartialFunction[Throwable, Map[String,String]] = {
+    val toErrorMap: PartialFunction[Throwable, Map[String, String]] = {
-      case e: java.net.UnknownHostException => Map("error"-> ("Unknown host " + e.getMessage))
+      case e: java.net.UnknownHostException                  => Map("error" -> ("Unknown host " + e.getMessage))
-      case e: java.lang.IllegalArgumentException => Map("error"-> ("invalid url"))
+      case e: java.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
-      case e: org.apache.http.client.ClientProtocolException => Map("error"-> ("invalid url"))
+      case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
-      case NonFatal(e) => Map("error"-> (e.getClass + " "+ e.getMessage))
+      case NonFatal(e)                                       => Map("error" -> (e.getClass + " " + e.getMessage))
     }
 
     contentType = formats("json")
-    org.json4s.jackson.Serialization.write(Map(
+    org.json4s.jackson.Serialization.write(
+      Map(
         "url" -> url,
-      "request" -> Await.result(reqFuture.map(req => Map(
+        "request" -> Await.result(
+          reqFuture
+            .map(
+              req =>
+                Map(
                   "headers" -> _headers(req.getAllHeaders),
                   "payload" -> json
-      )).recover(toErrorMap), 20 seconds),
+              )
-      "response" -> Await.result(resFuture.map(res => Map(
+            )
+            .recover(toErrorMap),
+          20 seconds
+        ),
+        "response" -> Await.result(
+          resFuture
+            .map(
+              res =>
+                Map(
                   "status" -> res.getStatusLine(),
                   "body" -> EntityUtils.toString(res.getEntity()),
                   "headers" -> _headers(res.getAllHeaders())
-      )).recover(toErrorMap), 20 seconds)
+              )
-    ))
+            )
+            .recover(toErrorMap),
+          20 seconds
+        )
+      )
+    )
   })
 
-  get("/register"){
+  get("/register") {
-    if(context.settings.allowAccountRegistration){
+    if (context.settings.allowAccountRegistration) {
-      if(context.loginAccount.isDefined){
+      if (context.loginAccount.isDefined) {
         redirect("/")
       } else {
         html.register()
@@ -435,10 +555,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     } else NotFound()
   }
 
-  post("/register", newForm){ form =>
+  post("/register", newForm) { form =>
-    if(context.settings.allowAccountRegistration){
+    if (context.settings.allowAccountRegistration) {
-      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.description, form.url)
+      createAccount(
+        form.userName,
+        sha1(form.password),
+        form.fullName,
+        form.mailAddress,
+        false,
+        form.description,
+        form.url
+      )
       updateImage(form.userName, form.fileId, false)
+      updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses)
       redirect("/signin")
     } else NotFound()
   }
@@ -449,18 +578,23 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   post("/groups/new", newGroupForm)(usersOnly { form =>
     createGroup(form.groupName, form.description, form.url)
-    updateGroupMembers(form.groupName, form.members.split(",").map {
+    updateGroupMembers(
+      form.groupName,
+      form.members
+        .split(",")
+        .map {
           _.split(":") match {
             case Array(userName, isManager) => (userName, isManager.toBoolean)
           }
-    }.toList)
+        }
+        .toList
+    )
     updateImage(form.groupName, form.fileId, false)
     redirect(s"/${form.groupName}")
   })
 
   get("/:groupName/_editgroup")(managersOnly {
-    defining(params("groupName")){ groupName =>
+    defining(params("groupName")) { groupName =>
-      // TODO Don't use Option.get
       getAccountByUserName(groupName, true).map { account =>
         html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
       } getOrElse NotFound()
@@ -468,7 +602,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   get("/:groupName/_deletegroup")(managersOnly {
-    defining(params("groupName")){ groupName =>
+    defining(params("groupName")) {
+      groupName =>
         // Remove from GROUP_MEMBER
         updateGroupMembers(groupName, Nil)
         // Disable group
@@ -487,11 +622,18 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   post("/:groupName/_editgroup", editGroupForm)(managersOnly { form =>
-    defining(params("groupName"), form.members.split(",").map {
+    defining(
+      params("groupName"),
+      form.members
+        .split(",")
+        .map {
           _.split(":") match {
             case Array(userName, isManager) => (userName, isManager.toBoolean)
           }
-    }.toList){ case (groupName, members) =>
+        }
+        .toList
+    ) {
+      case (groupName, members) =>
         getAccountByUserName(groupName, true).map { account =>
           updateGroup(groupName, form.description, form.url, false)
 
@@ -525,13 +667,17 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    * Create new repository.
    */
   post("/new", newRepositoryForm)(usersOnly { form =>
-    LockUtil.lock(s"${form.owner}/${form.name}"){
+    LockUtil.lock(s"${form.owner}/${form.name}") {
-      if(getRepository(form.owner, form.name).isEmpty){
+      if (getRepository(form.owner, form.name).isEmpty) {
-        // Create the repository
+        createRepository(
-        createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.createReadme)
+          context.loginAccount.get,
-
+          form.owner,
-        // Call hooks
+          form.name,
-        PluginRegistry().getRepositoryHooks.foreach(_.created(form.owner, form.name))
+          form.description,
+          form.isPrivate,
+          form.initOption,
+          form.sourceUrl
+        )
       }
     }
 
@@ -540,7 +686,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    if(repository.repository.options.allowFork){
+    if (repository.repository.options.allowFork) {
       val loginAccount = context.loginAccount.get
       val loginUserName = loginAccount.userName
       val groups = getGroupsByUserName(loginUserName)
@@ -548,7 +694,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         case _: List[String] =>
           val managerPermissions = groups.map { group =>
             val members = getGroupMembers(group)
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager })
+            context.loginAccount.exists(
+              x =>
+                members.exists { member =>
+                  member.userName == x.userName && member.isManager
+              }
+            )
           }
           helper.html.forkrepository(
             repository,
@@ -560,103 +711,63 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   post("/:owner/:repository/fork", accountForm)(readableUsersOnly { (form, repository) =>
-    if(repository.repository.options.allowFork){
+    if (repository.repository.options.allowFork) {
       val loginAccount = context.loginAccount.get
       val loginUserName = loginAccount.userName
       val accountName = form.accountName
 
-      LockUtil.lock(s"${accountName}/${repository.name}"){
+      if (getRepository(accountName, repository.name).isDefined ||
-        if(getRepository(accountName, repository.name).isDefined ||
+          (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))) {
-            (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))){
         // redirect to the repository if repository already exists
         redirect(s"/${accountName}/${repository.name}")
       } else {
-          // Insert to the database at first
+        // fork repository asynchronously
-          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
+        forkRepository(accountName, repository, loginUserName)
-          val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
-
-          insertRepository(
-            repositoryName       = repository.name,
-            userName             = accountName,
-            description          = repository.repository.description,
-            isPrivate            = repository.repository.isPrivate,
-            originRepositoryName = Some(originRepositoryName),
-            originUserName       = Some(originUserName),
-            parentRepositoryName = Some(repository.name),
-            parentUserName       = Some(repository.owner)
-          )
-
-          // Set default collaborators for the private fork
-          if(repository.repository.isPrivate){
-            // Copy collaborators from the source repository
-            getCollaborators(repository.owner, repository.name).foreach { case (collaborator, _) =>
-              addCollaborator(accountName, repository.name, collaborator.collaboratorName, collaborator.role)
-            }
-            // Register an owner of the source repository as a collaborator
-            addCollaborator(accountName, repository.name, repository.owner, Role.ADMIN.name)
-          }
-
-          // Insert default labels
-          insertDefaultLabels(accountName, repository.name)
-          // Insert default priorities
-          insertDefaultPriorities(accountName, repository.name)
-
-          // clone repository actually
-          JGitUtil.cloneRepository(
-            getRepositoryDir(repository.owner, repository.name),
-            FileUtil.deleteIfExists(getRepositoryDir(accountName, repository.name)))
-
-          // Create Wiki repository
-          JGitUtil.cloneRepository(getWikiRepositoryDir(repository.owner, repository.name),
-            FileUtil.deleteIfExists(getWikiRepositoryDir(accountName, repository.name)))
-
-          // Copy LFS files
-          val lfsDir = getLfsDir(repository.owner, repository.name)
-          if(lfsDir.exists){
-            FileUtils.copyDirectory(lfsDir, FileUtil.deleteIfExists(getLfsDir(accountName, repository.name)))
-          }
-
-          // Record activity
-          recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
-
-          // Call hooks
-          PluginRegistry().getRepositoryHooks.foreach(_.forked(repository.owner, accountName, repository.name))
-
         // redirect to the repository
         redirect(s"/${accountName}/${repository.name}")
       }
-      }
     } else BadRequest()
   })
 
-  private def existsAccount: Constraint = new Constraint(){
+  private def existsAccount: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
+      if (getAccountByUserNameIgnoreCase(value).isEmpty) Some("User or group does not exist.") else None
   }
 
-  private def uniqueRepository: Constraint = new Constraint(){
+  private def uniqueRepository: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+    override def validate(
-      params.get("owner").flatMap { userName =>
+      name: String,
-        getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      for {
+        userName <- params.optionValue("owner")
+        _ <- getRepositoryNamesOfUser(userName).find(_.equalsIgnoreCase(value))
+      } yield {
+        "Repository already exists."
+      }
     }
   }
 
-  private def members: Constraint = new Constraint(){
+  private def members: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      if(value.split(",").exists {
+      if (value.split(",").exists {
             _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
-      }) None else Some("Must select one manager at least.")
+          }) None
+      else Some("Must select one manager at least.")
     }
   }
 
-  private def validPublicKey: Constraint = new Constraint(){
+  private def validPublicKey: Constraint = new Constraint() {
-    override def validate(name: String, value: String, messages: Messages): Option[String] = SshUtil.str2PublicKey(value) match {
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      SshUtil.str2PublicKey(value) match {
         case Some(_) if !getAllKeys().exists(_.publicKey == value) => None
         case _                                                     => Some("Key is invalid.")
       }
   }
 
-  private def validAccountName: Constraint = new Constraint(){
+  private def validAccountName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       getAccountByUserName(value) match {
         case Some(_) => None

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

@@ -10,13 +10,18 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
 import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.revwalk.RevWalk
 import org.scalatra.{Created, NoContent, UnprocessableEntity}
 
 import scala.collection.JavaConverters._
+import scala.concurrent.Await
+import scala.concurrent.duration.Duration
 
-class ApiController extends ApiControllerBase
+class ApiController
+    extends ApiControllerBase
     with RepositoryService
     with AccountService
     with ProtectedBranchService
@@ -50,6 +55,7 @@ trait ApiControllerBase extends ControllerBase {
     with LabelsService
     with MilestonesService
     with PullRequestService
+    with CommitsService
     with CommitStatusService
     with RepositoryCreationService
     with IssueCreationService
@@ -72,7 +78,7 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/#root-endpoint
    */
-  get("/api/v3/") {
+  get("/api/v3") {
     JsonFormat(ApiEndPoint())
   }
 
@@ -99,66 +105,89 @@ trait ApiControllerBase extends ControllerBase {
    * 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)})
+    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)})
+    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 =>
+  get("/api/v3/repos/:owner/:repo/branches")(referrersOnly { repository =>
-    JsonFormat(JGitUtil.getBranches(
+    JsonFormat(
+      JGitUtil
+        .getBranches(
           owner = repository.owner,
           name = repository.name,
           defaultBranch = repository.repository.defaultBranch,
           origin = repository.repository.originUserName.isEmpty
-    ).map { br =>
+        )
+        .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 =>
+  get("/api/v3/repos/:owner/:repo/branches/*")(referrersOnly { repository =>
     //import gitbucket.core.api._
-    (for{
+    (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)
+      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)))
+      JsonFormat(
+        ApiBranch(branch, ApiBranchCommit(br.commitId), ApiBranchProtection(protection))(RepositoryName(repository))
+      )
     }) getOrElse NotFound()
   })
 
+  /*
+   * https://developer.github.com/v3/repos/contents/#get-contents
+   */
+  get("/api/v3/repos/:owner/:repo/contents")(referrersOnly { repository =>
+    getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch))
+  })
+
   /*
    * https://developer.github.com/v3/repos/contents/#get-contents
    */
   get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
+    getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
+  })
+
+  private def getContents(repository: RepositoryService.RepositoryInfo, path: String, refStr: String) = {
     def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
-      val path = new java.io.File(pathStr)
+      val (dirName, fileName) = pathStr.lastIndexOf('/') match {
-      val dirName = path.getParent match {
+        case -1 =>
-        case null => "."
+          (".", pathStr)
-        case s => s
+        case n =>
+          (pathStr.take(n), pathStr.drop(n + 1))
       }
-      getFileList(git, revision, dirName).find(f => f.name.equals(path.getName))
+      getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
     }
 
-    val path = multiParams("splat").head match {
+    using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
-      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 => {
+        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 {
@@ -168,51 +197,79 @@ trait ApiControllerBase extends ControllerBase {
               }
               case "application/vnd.github.v3.html" if isRenderable(f.name) => {
                 contentType = "application/vnd.github.v3.html"
-              content.map(c =>
+                content.map { c =>
                   List(
-                  "<div data-path=\"", path, "\" id=\"file\">", "<article>",
+                    "<div data-path=\"",
+                    path,
+                    "\" id=\"file\">",
+                    "<article>",
                     renderMarkup(path.split("/").toList, new String(c), refStr, repository, false, false, true).body,
-                  "</article>", "</div>"
+                    "</article>",
+                    "</div>"
                   ).mkString
-              )
+                }
               }
               case "application/vnd.github.v3.html" => {
                 contentType = "application/vnd.github.v3.html"
-              content.map(c =>
+                content.map { c =>
                   List(
-                  "<div data-path=\"", path, "\" id=\"file\">", "<div class=\"plain\">", "<pre>",
+                    "<div data-path=\"",
+                    path,
+                    "\" id=\"file\">",
+                    "<div class=\"plain\">",
+                    "<pre>",
                     play.twirl.api.HtmlFormat.escape(new String(c)).body,
-                  "</pre>", "</div>", "</div>"
+                    "</pre>",
+                    "</div>",
+                    "</div>"
                   ).mkString
-              )
+                }
               }
               case _ =>
                 Some(JsonFormat(ApiContents(f, RepositoryName(repository), content)))
             }
-        }).getOrElse(NotFound())
+          }
+          .getOrElse(NotFound())
+
       } else { // directory
-        JsonFormat(fileList.map{f => ApiContents(f, RepositoryName(repository), None)})
+        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 =>
+  get("/api/v3/repos/:owner/:repo/git/refs/*")(referrersOnly { repository =>
     val revstr = multiParams("splat").head
     using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
-      //JsonFormat( (revstr, git.getRepository().resolve(revstr)) )
+      val ref = git.getRepository().findRef(revstr)
-      // getRef is deprecated by jgit-4.2. use exactRef() or findRef()
+
-      val sha = git.getRepository().exactRef(revstr).getObjectId().name()
+      if (ref != null) {
+        val sha = ref.getObjectId().name()
         JsonFormat(ApiRef(revstr, ApiObject(sha)))
+
+      } else {
+        val refs = git
+          .getRepository()
+          .getAllRefs()
+          .asScala
+          .collect { case (str, ref) if str.startsWith("refs/" + revstr) => ref }
+
+        JsonFormat(refs.map { ref =>
+          val sha = ref.getObjectId().name()
+          ApiRef(revstr, ApiObject(sha))
+        })
+      }
     }
   })
 
   /**
    * https://developer.github.com/v3/repos/collaborators/#list-collaborators
    */
-  get("/api/v3/repos/:owner/:repo/collaborators") (referrersOnly { repository =>
+  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)))
   })
@@ -230,9 +287,9 @@ trait ApiControllerBase extends ControllerBase {
    * List user's own repository
    * https://developer.github.com/v3/repos/#list-your-repositories
    */
-  get("/api/v3/user/repos")(usersOnly{
+  get("/api/v3/user/repos")(usersOnly {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map{
+    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map { r =>
-      r => ApiRepository(r, getAccountByUserName(r.owner).get)
+      ApiRepository(r, getAccountByUserName(r.owner).get)
     })
   })
 
@@ -246,8 +303,16 @@ trait ApiControllerBase extends ControllerBase {
       data <- extractFromJsonBody[CreateARepository] if data.isValid
     } yield {
       LockUtil.lock(s"${owner}/${data.name}") {
-        if(getRepository(owner, data.name).isEmpty){
+        if (getRepository(owner, data.name).isEmpty) {
-          createRepository(context.loginAccount.get, owner, data.name, data.description, data.`private`, data.auto_init)
+          val f = createRepository(
+            context.loginAccount.get,
+            owner,
+            data.name,
+            data.description,
+            data.`private`,
+            data.auto_init
+          )
+          Await.result(f, Duration.Inf)
           val repository = getRepository(owner, data.name).get
           JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
         } else {
@@ -270,8 +335,16 @@ trait ApiControllerBase extends ControllerBase {
       data <- extractFromJsonBody[CreateARepository] if data.isValid
     } yield {
       LockUtil.lock(s"${groupName}/${data.name}") {
-        if(getRepository(groupName, data.name).isEmpty){
+        if (getRepository(groupName, data.name).isEmpty) {
-          createRepository(context.loginAccount.get, groupName, data.name, data.description, data.`private`, data.auto_init)
+          val f = createRepository(
+            context.loginAccount.get,
+            groupName,
+            data.name,
+            data.description,
+            data.`private`,
+            data.auto_init
+          )
+          Await.result(f, Duration.Inf)
           val repository = getRepository(groupName, data.name).get
           JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
         } else {
@@ -289,13 +362,24 @@ trait ApiControllerBase extends ControllerBase {
    */
   patch("/api/v3/repos/:owner/:repo/branches/*")(ownerOnly { repository =>
     import gitbucket.core.api._
-    (for{
+    (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)
+      br <- getBranches(
+        repository.owner,
+        repository.name,
+        repository.repository.defaultBranch,
+        repository.repository.originUserName.isEmpty
+      ).find(_.name == branch)
     } yield {
-      if(protection.enabled){
+      if (protection.enabled) {
-        enableBranchProtection(repository.owner, repository.name, branch, protection.status.enforcement_level == ApiBranchProtection.Everyone, protection.status.contexts)
+        enableBranchProtection(
+          repository.owner,
+          repository.name,
+          branch,
+          protection.status.enforcement_level == ApiBranchProtection.Everyone,
+          protection.status.contexts
+        )
       } else {
         disableBranchProtection(repository.owner, repository.name, branch)
       }
@@ -307,7 +391,7 @@ trait ApiControllerBase extends ControllerBase {
    * @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."))
@@ -330,11 +414,14 @@ trait ApiControllerBase extends ControllerBase {
         repos = repository.owner -> repository.name
       )
 
-    JsonFormat(issues.map { case (issue, issueUser) =>
+    JsonFormat(issues.map {
+      case (issue, issueUser) =>
         ApiIssue(
           issue = issue,
           repositoryName = RepositoryName(repository),
-        user           = ApiUser(issueUser)
+          user = ApiUser(issueUser),
+          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+            .map(ApiLabel(_, RepositoryName(repository)))
         )
     })
   })
@@ -343,12 +430,19 @@ trait ApiControllerBase extends ControllerBase {
    * https://developer.github.com/v3/issues/#get-a-single-issue
    */
   get("/api/v3/repos/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    (for{
+    (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)))
+      JsonFormat(
+        ApiIssue(
+          issue,
+          RepositoryName(repository),
+          ApiUser(openedUser),
+          getIssueLabels(repository.owner, repository.name, issue.issueId).map(ApiLabel(_, RepositoryName(repository)))
+        )
+      )
     }) getOrElse NotFound()
   })
 
@@ -356,8 +450,8 @@ trait ApiControllerBase extends ControllerBase {
    * 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?
+    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-      (for{
+      (for {
         data <- extractFromJsonBody[CreateAnIssue]
         loginAccount <- context.loginAccount
       } yield {
@@ -370,8 +464,17 @@ trait ApiControllerBase extends ControllerBase {
           milestone.map(_.milestoneId),
           None,
           data.labels,
-          loginAccount)
+          loginAccount
-        JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(loginAccount)))
+        )
+        JsonFormat(
+          ApiIssue(
+            issue,
+            RepositoryName(repository),
+            ApiUser(loginAccount),
+            getIssueLabels(repository.owner, repository.name, issue.issueId)
+              .map(ApiLabel(_, RepositoryName(repository)))
+          )
+        )
       }) getOrElse NotFound()
     } else Unauthorized()
   })
@@ -380,11 +483,14 @@ trait ApiControllerBase extends ControllerBase {
    * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
    */
   get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
-    (for{
+    (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) })
+      JsonFormat(comments.map {
+        case (issueComment, user, issue) =>
+          ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest)
+      })
     }) getOrElse NotFound()
   })
 
@@ -392,15 +498,23 @@ trait ApiControllerBase extends ControllerBase {
    * https://developer.github.com/v3/issues/comments/#create-a-comment
    */
   post("/api/v3/repos/:owner/:repository/issues/:id/comments")(readableUsersOnly { repository =>
-    (for{
+    (for {
       issueId <- params("id").toIntOpt
       issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      body         <- extractFromJsonBody[CreateAComment].map(_.body) if ! body.isEmpty
+      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))
+      JsonFormat(
+        ApiComment(
+          issueComment,
+          RepositoryName(repository),
+          issueId,
+          ApiUser(context.loginAccount.get),
+          issue.isPullRequest
+        )
+      )
     }) getOrElse NotFound()
   })
 
@@ -429,7 +543,7 @@ trait ApiControllerBase extends ControllerBase {
    * https://developer.github.com/v3/issues/labels/#create-a-label
    */
   post("/api/v3/repos/:owner/:repository/labels")(writableUsersOnly { repository =>
-    (for{
+    (for {
       data <- extractFromJsonBody[CreateALabel] if data.isValid
     } yield {
       LockUtil.lock(RepositoryName(repository).fullName) {
@@ -440,10 +554,12 @@ trait ApiControllerBase extends ControllerBase {
           } getOrElse NotFound()
         } else {
           // TODO ApiError should support errors field to enhance compatibility of GitHub API
-          UnprocessableEntity(ApiError(
+          UnprocessableEntity(
+            ApiError(
               "Validation Failed",
               Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-          ))
+            )
+          )
         }
       }
     }) getOrElse NotFound()
@@ -454,23 +570,28 @@ trait ApiControllerBase extends ControllerBase {
    * https://developer.github.com/v3/issues/labels/#update-a-label
    */
   patch("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
-    (for{
+    (for {
       data <- extractFromJsonBody[CreateALabel] if data.isValid
     } yield {
       LockUtil.lock(RepositoryName(repository).fullName) {
-        getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+        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(
+              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(
+              UnprocessableEntity(
+                ApiError(
                   "Validation Failed",
                   Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-            ))
+                )
+              )
             }
         } getOrElse NotFound()
       }
@@ -499,7 +620,7 @@ trait ApiControllerBase extends ControllerBase {
     val condition = IssueSearchCondition(request)
     val baseOwner = getAccountByUserName(repository.owner).get
 
-    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account)] =
+    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] =
       searchPullRequestByApi(
         condition = condition,
         offset = (page - 1) * PullRequestLimit,
@@ -507,13 +628,17 @@ trait ApiControllerBase extends ControllerBase {
         repos = repository.owner -> repository.name
       )
 
-    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) =>
+    JsonFormat(issues.map {
+      case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
         ApiPullRequest(
           issue = issue,
           pullRequest = pullRequest,
           headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
           baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
           user = ApiUser(issueUser),
+          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+            .map(ApiLabel(_, RepositoryName(repository))),
+          assignee = assignee.map(ApiUser.apply),
           mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
         )
     })
@@ -523,23 +648,34 @@ trait ApiControllerBase extends ControllerBase {
    * https://developer.github.com/v3/pulls/#get-a-single-pull-request
    */
   get("/api/v3/repos/:owner/:repository/pulls/:id")(referrersOnly { repository =>
-    (for{
+    (for {
       issueId <- params("id").toIntOpt
       (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
-      users     =  getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set.empty)
+      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(
+      JsonFormat(
+        ApiPullRequest(
           issue = issue,
           pullRequest = pullRequest,
           headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
           baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
           user = ApiUser(issueUser),
+          labels = getIssueLabels(repository.owner, repository.name, issue.issueId)
+            .map(ApiLabel(_, RepositoryName(repository))),
+          assignee = assignee.map(ApiUser.apply),
           mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-      ))
+        )
+      )
     }) getOrElse NotFound()
   })
 
@@ -549,13 +685,23 @@ trait ApiControllerBase extends ControllerBase {
   get("/api/v3/repos/:owner/:repository/pulls/:id/commits")(referrersOnly { repository =>
     val owner = repository.owner
     val name = repository.name
-    params("id").toIntOpt.flatMap{ issueId =>
+    params("id").toIntOpt.flatMap {
-      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+      issueId =>
-        using(Git.open(getRepositoryDir(owner, name))){ git =>
+        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
+              val commits = git.log
+                .addRange(oldId, newId)
+                .call
+                .iterator
+                .asScala
+                .map { c =>
+                  ApiCommitListItem(new CommitInfo(c), repoFullName)
+                }
+                .toList
               JsonFormat(commits)
             }
         }
@@ -573,14 +719,23 @@ trait ApiControllerBase extends ControllerBase {
    * https://developer.github.com/v3/repos/statuses/#create-a-status
    */
   post("/api/v3/repos/:owner/:repo/statuses/:sha")(writableUsersOnly { repository =>
-    (for{
+    (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"),
+      statusId = createCommitStatus(
-                                     state, data.target_url, data.description, new java.util.Date(), creator)
+        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)))
@@ -593,11 +748,12 @@ trait ApiControllerBase extends ControllerBase {
    * 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{
+    (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) =>
+      JsonFormat(getCommitStatuesWithCreator(repository.owner, repository.name, sha).map {
+        case (status, creator) =>
           ApiCommitStatus(status, ApiUser(creator))
       })
     }) getOrElse NotFound()
@@ -608,7 +764,7 @@ trait ApiControllerBase extends ControllerBase {
    *
    * legacy route
    */
-  get("/api/v3/repos/:owner/:repo/statuses/:ref"){
+  get("/api/v3/repos/:owner/:repo/statuses/:ref") {
     listStatusesRoute.action()
   }
 
@@ -618,7 +774,7 @@ trait ApiControllerBase extends ControllerBase {
    * 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{
+    (for {
       ref <- params.get("ref")
       owner <- getAccountByUserName(repository.owner)
       sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
@@ -628,6 +784,55 @@ trait ApiControllerBase extends ControllerBase {
     }) getOrElse NotFound()
   })
 
+  /**
+   * https://developer.github.com/v3/repos/commits/#get-a-single-commit
+   */
+  get("/api/v3/repos/:owner/:repo/commits/:sha")(referrersOnly { repository =>
+    val owner = repository.owner
+    val name = repository.name
+    val sha = params("sha")
+
+    using(Git.open(getRepositoryDir(owner, name))) {
+      git =>
+        val repo = git.getRepository
+        val objectId = repo.resolve(sha)
+        val commitInfo = using(new RevWalk(repo)) { revWalk =>
+          new CommitInfo(revWalk.parseCommit(objectId))
+        }
+
+        JsonFormat(
+          ApiCommits(
+            repositoryName = RepositoryName(repository),
+            commitInfo = commitInfo,
+            diffs = JGitUtil.getDiffs(git, Some(commitInfo.parents.head), commitInfo.id, false, true),
+            author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
+            committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
+            commentCount = getCommitComment(repository.owner, repository.name, sha).size
+          )
+        )
+    }
+  })
+
+  private def getAccount(userName: String, email: String): Account = {
+    getAccountByMailAddress(email).getOrElse {
+      Account(
+        userName = userName,
+        fullName = userName,
+        mailAddress = email,
+        password = "xxx",
+        isAdmin = false,
+        url = None,
+        registeredDate = new java.util.Date(),
+        updatedDate = new java.util.Date(),
+        lastLoginDate = None,
+        image = None,
+        isGroupAccount = false,
+        isRemoved = true,
+        description = None
+      )
+    }
+  }
+
   private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 
@@ -636,7 +841,7 @@ trait ApiControllerBase extends ControllerBase {
    */
   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 =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
 
       getPathObjectId(git, path, revCommit).map { objectId =>
@@ -645,5 +850,10 @@ trait ApiControllerBase extends ControllerBase {
     }
   })
 
+  /**
+   * non-GitHub compatible API for listing plugins
+   */
+  get("/api/v3/gitbucket/plugins") {
+    PluginRegistry().getPlugins().map { ApiPlugin(_) }
+  }
 }
-

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

@@ -1,26 +1,26 @@
 package gitbucket.core.controller
 
-import java.io.FileInputStream
+import java.io.{File, FileInputStream}
 
-import gitbucket.core.api.ApiError
+import gitbucket.core.api.{ApiError, JsonFormat}
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, SystemSettingsService,RepositoryService}
+import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
-import gitbucket.core.util.JGitUtil._
-import io.github.gitbucket.scalatra.forms._
 import org.json4s._
 import org.scalatra._
 import org.scalatra.i18n._
 import org.scalatra.json._
+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 net.coobird.thumbnailator.Thumbnails
-
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.ObjectId
 import org.eclipse.jgit.revwalk.RevCommit
@@ -31,8 +31,13 @@ import org.slf4j.LoggerFactory
 /**
  * Provides generic features for controller implementations.
  */
-abstract class ControllerBase extends ScalatraFilter
+abstract class ControllerBase
-  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
+    extends ScalatraFilter
+    with ValidationSupport
+    with JacksonJsonSupport
+    with I18nSupport
+    with FlashMapSupport
+    with Validations
     with SystemSettingsService {
 
   private val logger = LoggerFactory.getLogger(getClass)
@@ -41,34 +46,28 @@ abstract class ControllerBase extends ScalatraFilter
 
   before("/api/v3/*") {
     contentType = formats("json")
+    request.setAttribute(Keys.Request.APIv3, true)
   }
 
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
+  override def requestPath(uri: String, idx: Int): String = {
+    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("/console/")){
+      if (path.startsWith("/git/") || path.startsWith("/git-lfs/")) {
-      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)
       }
@@ -92,102 +91,130 @@ abstract class ControllerBase extends ScalatraFilter
     }
   }
 
-  private def LoginAccount: Option[Account] = request.getAs[Account](Keys.Session.LoginAccount).orElse(session.getAs[Account](Keys.Session.LoginAccount))
+  private def LoginAccount: Option[Account] =
+    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(ApiError("Not Found"))
+      org.scalatra.NotFound(JsonFormat(ApiError("Not Found")))
     } else {
       org.scalatra.NotFound(gitbucket.core.html.error("Not Found"))
     }
 
-  protected def Unauthorized()(implicit context: Context) =
+  private def isBrowser(userAgent: String): Boolean = {
-    if(request.hasAttribute(Keys.Request.Ajax)){
+    if (userAgent == null || userAgent.isEmpty) {
-      org.scalatra.Unauthorized()
+      false
-    } else if(request.hasAttribute(Keys.Request.APIv3)){
-      contentType = formats("json")
-      org.scalatra.Unauthorized(ApiError("Requires authentication"))
     } else {
-      if(context.loginAccount.isDefined){
+      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)) {
+      org.scalatra.Unauthorized()
+    } else if (request.hasAttribute(Keys.Request.APIv3)) {
+      contentType = formats("json")
+      org.scalatra.Unauthorized(JsonFormat(ApiError("Requires authentication")))
+    } else if (!isBrowser(request.getHeader("USER-AGENT"))) {
+      org.scalatra.Unauthorized()
+    } else {
+      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(redirect("/signin?redirect=" + StringUtil.urlEncode(
+          org.scalatra.Unauthorized(
-            defining(request.getQueryString){ queryString =>
+            redirect(
-              request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "")
+              "/signin?redirect=" + StringUtil.urlEncode(
+                defining(request.getQueryString) { queryString =>
+                  request.getRequestURI.substring(request.getContextPath.length) + (if (queryString != null)
+                                                                                      "?" + queryString
+                                                                                    else "")
                 }
-          )))
+              )
+            )
+          )
         }
       }
     }
 
-  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(ApiError("Internal Server Error"))
+        org.scalatra.InternalServerError(JsonFormat(ApiError("Internal Server Error")))
       } else {
         org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
       }
     }
   }
 
-  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
+  override def url(
-                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
+    path: String,
-                   absolutize: Boolean = true, withSessionId: Boolean = true)
+    params: Iterable[(String, Any)] = Iterable.empty,
-                  (implicit request: HttpServletRequest, response: HttpServletResponse): String =
+    includeContextPath: Boolean = true,
+    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(name: String, value: String, params: Map[String, String], messages: Messages): Seq[(String, String)] =
+    override def validate(
+      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
@@ -197,8 +224,8 @@ abstract class ControllerBase extends ScalatraFilter
   }
 
   // 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))
@@ -208,24 +235,28 @@ abstract class ControllerBase extends ScalatraFilter
   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(new TreeWalk(git.getRepository)){ treeWalk =>
+    using(new TreeWalk(git.getRepository)) { treeWalk =>
       treeWalk.addTree(revCommit.getTree)
       treeWalk.setRecursive(true)
       _getPathObjectId(path, treeWalk)
     }
   }
 
-  protected def responseRawFile(git: Git, objectId: ObjectId, path: String,
+  protected def responseRawFile(
-                              repository: RepositoryService.RepositoryInfo): Unit = {
+    git: Git,
-    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+    objectId: ObjectId,
+    path: String,
+    repository: RepositoryService.RepositoryInfo
+  ): Unit = {
+    JGitUtil.getObjectLoaderFromId(git, objectId) { loader =>
       contentType = FileUtil.getMimeType(path)
 
-      if(loader.isLarge){
+      if (loader.isLarge) {
         response.setContentLength(loader.getSize.toInt)
         loader.copyTo(response.outputStream)
       } else {
@@ -233,11 +264,11 @@ abstract class ControllerBase extends ScalatraFilter
         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(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 {
@@ -252,7 +283,11 @@ abstract class ControllerBase extends ScalatraFilter
 /**
  * Context object for the current request.
  */
-case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
+case class Context(
+  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)
@@ -273,7 +308,7 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
    * Cached object are available during a request.
    */
   def cache[A](key: String)(action: => A): A =
-    defining(Keys.Request.Cache(key)){ cacheKey =>
+    defining(Keys.Request.Cache(key)) { cacheKey =>
       Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
         val newObject = action
         request.setAttribute(cacheKey, newObject)
@@ -290,40 +325,98 @@ trait AccountManagementControllerBase extends ControllerBase {
   self: AccountService =>
 
   protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
-    if(clearImage){
+    if (clearImage) {
       getAccountByUserName(userName).flatMap(_.image).map { image =>
-        new java.io.File(getUserUploadDir(userName), image).delete()
+        new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete()
         updateAvatarImage(userName, None)
       }
     } else {
       fileId.map { 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.of(new java.io.File(getTemporaryDir(session.getId), fileId))
+        Thumbnails
+          .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
           .size(324, 324)
-          .toFile(new java.io.File(uploadDir, filename))
+          .toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
         updateAvatarImage(userName, Some(filename))
       }
     }
 
-  protected def uniqueUserName: Constraint = new Constraint(){
+  protected def uniqueUserName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value, true).map { _ => "User already exists." }
+      getAccountByUserNameIgnoreCase(value, true).map { _ =>
+        "User already exists."
+      }
   }
 
-  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
+  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+    override def validate(
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
+      if (extraMailAddresses.exists {
+            case (k, v) =>
+              v.contains(value)
+          }) {
+        Some("These mail addresses are duplicated.")
+      } else {
         getAccountByMailAddress(value, true)
-        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
+          .collect {
-        .map    { _ => "Mail address is already registered." }
+            case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) =>
+              "Mail address is already registered."
+          }
+      }
+    }
   }
 
-  val allReservedNames = Set("git", "admin", "upload", "api")
+  protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() {
-  protected def reservedNames(): Constraint = new Constraint(){
+    override def validate(
-    override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      val extraMailAddresses = params.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

@@ -6,13 +6,20 @@ import gitbucket.core.util.{Keys, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
 import gitbucket.core.service.IssuesService._
 
-class DashboardController extends DashboardControllerBase
+class DashboardController
-  with IssuesService with PullRequestService with RepositoryService with AccountService with CommitsService
+    extends DashboardControllerBase
+    with IssuesService
+    with PullRequestService
+    with RepositoryService
+    with AccountService
+    with CommitsService
+    with LabelsService
+    with PrioritiesService
+    with MilestonesService
     with UsersAuthenticator
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with PullRequestService with RepositoryService with AccountService
+  self: IssuesService with PullRequestService with RepositoryService with AccountService with UsersAuthenticator =>
-    with UsersAuthenticator =>
 
   get("/dashboard/issues")(usersOnly {
     searchIssues("created_by")
@@ -67,7 +74,7 @@ trait DashboardControllerBase extends ControllerBase {
     html.issues(
       searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
       page,
-      countIssue(condition.copy(state = "open"  ), false, userRepos: _*),
+      countIssue(condition.copy(state = "open"), false, userRepos: _*),
       countIssue(condition.copy(state = "closed"), false, userRepos: _*),
       filter match {
         case "assigned"  => condition.copy(assigned = Some(Some(userName)))
@@ -77,7 +84,8 @@ trait DashboardControllerBase extends ControllerBase {
       filter,
       getGroupNames(userName),
       Nil,
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+      getUserRepositories(userName, withoutPhysicalInfo = true)
+    )
   }
 
   private def searchPullRequests(filter: String) = {
@@ -92,7 +100,7 @@ trait DashboardControllerBase extends ControllerBase {
     html.pulls(
       searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
       page,
-      countIssue(condition.copy(state = "open"  ), true, allRepos: _*),
+      countIssue(condition.copy(state = "open"), true, allRepos: _*),
       countIssue(condition.copy(state = "closed"), true, allRepos: _*),
       filter match {
         case "assigned"  => condition.copy(assigned = Some(Some(userName)))
@@ -102,8 +110,8 @@ trait DashboardControllerBase extends ControllerBase {
       filter,
       getGroupNames(userName),
       Nil,
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+      getUserRepositories(userName, withoutPhysicalInfo = true)
+    )
   }
 
-
 }

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

@@ -1,8 +1,9 @@
 package gitbucket.core.controller
 
+import java.io.File
+
 import gitbucket.core.model.Account
-import gitbucket.core.service.RepositoryService.RepositoryInfo
+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._
@@ -20,79 +21,135 @@ import org.apache.commons.io.{FileUtils, IOUtils}
  *
  * This servlet saves uploaded file.
  */
-class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
+class FileUploadController
+    extends ScalatraServlet
+    with FileUploadSupport
+    with RepositoryService
+    with AccountService
+    with ReleaseService {
 
-  val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
+  configureMultipartHandling(MultipartConfig(maxFileSize = Some(FileUtil.MaxFileSize)))
-    System.getProperty("gitbucket.maxFileSize").toLong
-  else
-    3 * 1024 * 1024
 
-  configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize)))
+  post("/image") {
-
+    execute(
-  post("/image"){
+      { (file, fileId) =>
-    execute({ (file, fileId) =>
+        FileUtils
-      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get)
         session += Keys.Session.Upload(fileId) -> file.name
-    }, FileUtil.isImage)
+      },
+      FileUtil.isImage
+    )
   }
 
-  post("/tmp"){
+  post("/tmp") {
-    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") {
-    execute({ (file, fileId) =>
+    execute(
-      FileUtils.writeByteArrayToFile(new java.io.File(
+      { (file, fileId) =>
+        FileUtils.writeByteArrayToFile(
+          new File(
             getAttachedDir(params("owner"), params("repository")),
-        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
+            FileUtil.checkFilename(fileId + "." + FileUtil.getExtension(file.getName))
-    }, FileUtil.isUploadableType)
+          ),
+          file.get
+        )
+      },
+      _ => true
+    )
   }
 
-  post("/wiki/:owner/:repository"){
+  post("/wiki/:owner/:repository") {
     // Don't accept not logged-in users
-    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account =>
+    session.get(Keys.Session.LoginAccount).collect {
+      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({ (file, fileId) =>
+          execute(
+            { (file, fileId) =>
               val fileName = file.getName
               LockUtil.lock(s"${owner}/${repository}/wiki") {
-            using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
+                using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) {
+                  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(JGitUtil.createDirCacheEntry(fileName, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
+                    builder.add(
+                      JGitUtil.createDirCacheEntry(
+                        fileName,
+                        FileMode.REGULAR_FILE,
+                        inserter.insert(Constants.OBJ_BLOB, bytes)
+                      )
+                    )
                     builder.finish()
 
-              val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+                    val newHeadId = JGitUtil.createNewCommit(
-                Constants.HEAD, loginAccount.userName, loginAccount.mailAddress, s"Uploaded ${fileName}")
+                      git,
+                      inserter,
+                      headId,
+                      builder.getDirCache.writeTree(inserter),
+                      Constants.HEAD,
+                      loginAccount.fullName,
+                      loginAccount.mailAddress,
+                      s"Uploaded ${fileName}"
+                    )
 
                     fileName
                 }
               }
-        }, FileUtil.isUploadableType)
+            },
+            _ => true
+          )
         }
     } getOrElse BadRequest()
   }
 
+  post("/release/:owner/:repository/:tag") {
+    session
+      .get(Keys.Session.LoginAccount)
+      .collect {
+        case _: Account =>
+          val owner = params("owner")
+          val repository = params("repository")
+          val tag = params("tag")
+          execute(
+            { (file, fileId) =>
+              FileUtils.writeByteArrayToFile(
+                new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)),
+                file.get
+              )
+            },
+            _ => true
+          )
+      }
+      .getOrElse(BadRequest())
+  }
+
   post("/import") {
     import JDBCUtil._
-    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)
@@ -103,7 +160,8 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
   private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
     implicit val session = Database.getSession(request)
     getRepository(owner, repository) match {
-      case Some(x) => x.repository.options.wikiOption match {
+      case Some(x) =>
+        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
@@ -113,10 +171,12 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
     }
   }
 
-  private def execute(f: (FileItem, String) => Unit, mimeTypeChcker: (String) => Boolean) = fileParams.get("file") match {
+  private def execute(f: (FileItem, String) => Unit, mimeTypeChcker: (String) => Boolean) =
-    case Some(file) if(mimeTypeChcker(file.name)) =>
+    fileParams.get("file") match {
-      defining(FileUtil.generateFileId){ fileId =>
+      case Some(file) if (mimeTypeChcker(file.name)) =>
+        defining(FileUtil.generateFileId) { fileId =>
           f(file, fileId)
+          contentType = "text/plain"
           Ok(fileId)
         }
       case _ => BadRequest()

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

@@ -1,29 +1,51 @@
 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.SyntaxSugars._
 import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
-import io.github.gitbucket.scalatra.forms._
 import org.scalatra.Ok
+import org.scalatra.forms._
 
-
+class IndexController
-class IndexController extends IndexControllerBase
+    extends IndexControllerBase
-  with RepositoryService with ActivityService with AccountService with RepositorySearchService with IssuesService
+    with RepositoryService
-  with UsersAuthenticator with ReferrerAuthenticator
+    with ActivityService
-
+    with AccountService
+    with RepositorySearchService
+    with IssuesService
+    with LabelsService
+    with MilestonesService
+    with PrioritiesService
+    with UsersAuthenticator
+    with ReferrerAuthenticator
+    with AccessTokenService
+    with AccountFederationService
+    with OpenIDConnectService
 
 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService with ActivityService with AccountService with RepositorySearchService
+  self: RepositoryService
-    with UsersAuthenticator with ReferrerAuthenticator =>
+    with ActivityService
+    with AccountService
+    with RepositorySearchService
+    with UsersAuthenticator
+    with ReferrerAuthenticator
+    with AccessTokenService
+    with AccountFederationService
+    with OpenIDConnectService =>
 
-  case class SignInForm(userName: String, password: String)
+  case class SignInForm(userName: String, password: String, hash: Option[String])
 
   val signinForm = mapping(
     "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required)))
+    "password" -> trim(label("Password", text(required))),
+    "hash" -> trim(optional(text()))
   )(SignInForm.apply)
 
 //  val searchForm = mapping(
@@ -34,48 +56,112 @@ 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.map { account =>
+    context.loginAccount
+      .map { account =>
         val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
-      gitbucket.core.html.index(getRecentActivitiesByOwners(visibleOwnerSet), Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
+        gitbucket.core.html.index(
-    }.getOrElse {
+          getRecentActivitiesByOwners(visibleOwnerSet),
-      gitbucket.core.html.index(getRecentActivities(), getVisibleRepositories(None, withoutPhysicalInfo = true), Nil)
+          Nil,
+          getUserRepositories(account.userName, withoutPhysicalInfo = true),
+          showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
+            account.userName
+          )
+        )
+      }
+      .getOrElse {
+        gitbucket.core.html.index(
+          getRecentActivities(),
+          getVisibleRepositories(None, withoutPhysicalInfo = true),
+          Nil,
+          showBannerToCreatePersonalAccessToken = false
+        )
       }
   }
 
-  get("/signin"){
+  get("/signin") {
     val redirect = params.get("redirect")
-    if(redirect.isDefined && redirect.get.startsWith("/")){
+    if (redirect.isDefined && redirect.get.startsWith("/")) {
       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) => signin(account)
+      case Some(account) =>
-      case None          => {
+        flash.get(Keys.Flash.Redirect) match {
+          case Some(redirectUrl: String) => signin(account, redirectUrl + form.hash.getOrElse(""))
+          case _                         => signin(account)
+        }
+      case None =>
         flash += "userName" -> form.userName
         flash += "password" -> form.password
         flash += "error" -> "Sorry, your Username and/or Password is incorrect. Please try again."
         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, redirectURI, context.state, context.nonce, oidc) map { account =>
+            signin(account, context.redirectBackURI)
+          } orElse {
+            flash += "error" -> "Sorry, authentication failed. Please try again."
+            session.invalidate()
+            redirect("/signin")
+          }
+        case _ =>
+          flash += "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(getRecentActivities())
   }
 
-  get("/sidebar-collapse"){
+  post("/sidebar-collapse") {
-    if(params("collapse") == "true"){
+    if (params("collapse") == "true") {
       session.setAttribute("sidebar-collapse", "true")
     } else {
       session.setAttribute("sidebar-collapse", null)
@@ -86,23 +172,19 @@ trait IndexControllerBase extends ControllerBase {
   /**
    * Set account information into HttpSession and redirect.
    */
-  private def signin(account: Account) = {
+  private def signin(account: Account, redirectUrl: String = "/") = {
     session.setAttribute(Keys.Session.LoginAccount, account)
     updateLastLoginDate(account.userName)
 
-    if(LDAPUtil.isDummyMailAddress(account)) {
+    if (LDAPUtil.isDummyMailAddress(account)) {
       redirect("/" + account.userName + "/_edit")
     }
 
-    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
+    if (redirectUrl.stripSuffix("/") == request.getContextPath) {
-      if(redirectUrl.stripSuffix("/") == request.getContextPath){
       redirect("/")
     } else {
       redirect(redirectUrl)
     }
-    }.getOrElse {
-      redirect("/")
-    }
   }
 
   /**
@@ -113,15 +195,25 @@ trait IndexControllerBase extends ControllerBase {
     val user = params("user").toBoolean
     val group = params("group").toBoolean
     org.json4s.jackson.Serialization.write(
-      Map("options" -> (
+      Map(
+        "options" -> (
           getAllUsers(false)
-          .withFilter { t => (user, group) match {
+            .withFilter { t =>
+              (user, group) match {
                 case (true, true)   => true
                 case (true, false)  => !t.isGroupAccount
                 case (false, true)  => t.isGroupAccount
                 case (false, false) => false
-          }}.map { t => t.userName }
+              }
-      ))
+            }
+            .map { t =>
+              Map(
+                "label" -> s"<b>@${t.userName}</b> ${t.fullName}",
+                "value" -> t.userName
+              )
+            }
+        )
+      )
     )
   })
 
@@ -130,46 +222,67 @@ trait IndexControllerBase extends ControllerBase {
    * Returns a single string which is any of "group", "user" or "".
    */
   post("/_user/existence")(usersOnly {
-    getAccountByUserName(params("userName")).map { account =>
+    getAccountByUserNameIgnoreCase(params("userName")).map { account =>
-      if(account.isGroupAccount) "group" else "user"
+      if (account.isGroupAccount) "group" else "user"
     } getOrElse ""
   })
 
   // TODO Move to RepositoryViwerController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")){ case (query, target) =>
+    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")) {
+      case (query, target) =>
         val page = try {
           val i = params.getOrElse("page", "1").toInt
-        if(i <= 0) 1 else i
+          if (i <= 0) 1 else i
         } catch {
           case e: NumberFormatException => 1
         }
 
         target.toLowerCase match {
-        case "issue" => gitbucket.core.search.html.issues(
+          case "issue" =>
-          if(query.nonEmpty) searchIssues(repository.owner, repository.name, query) else Nil,
+            gitbucket.core.search.html.issues(
-          query, page, repository)
+              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query) else Nil,
+              query,
+              page,
+              repository
+            )
 
-        case "wiki" => gitbucket.core.search.html.wiki(
+          case "wiki" =>
-          if(query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
+            gitbucket.core.search.html.wiki(
-          query, page, repository)
+              if (query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
+              query,
+              page,
+              repository
+            )
 
-        case _ => gitbucket.core.search.html.code(
+          case _ =>
-          if(query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
+            gitbucket.core.search.html.code(
-          query, page, repository)
+              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 = getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
+    val visibleRepositories =
+      getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
     val repositories = visibleRepositories.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
     }
-    context.loginAccount.map { account =>
+    context.loginAccount
-      gitbucket.core.search.html.repositories(query, repositories, Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
+      .map { account =>
-    }.getOrElse {
+        gitbucket.core.search.html.repositories(
+          query,
+          repositories,
+          Nil,
+          getUserRepositories(account.userName, withoutPhysicalInfo = true)
+        )
+      }
+      .getOrElse {
         gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil)
       }
   }

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

@@ -8,11 +8,11 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import gitbucket.core.view
 import gitbucket.core.view.Markdown
-import io.github.gitbucket.scalatra.forms._
+import org.scalatra.forms._
 import org.scalatra.{BadRequest, Ok}
 
-
+class IssuesController
-class IssuesController extends IssuesControllerBase
+    extends IssuesControllerBase
     with IssuesService
     with RepositoryService
     with AccountService
@@ -45,8 +45,14 @@ trait IssuesControllerBase extends ControllerBase {
     with WebHookIssueCommentService
     with PrioritiesService =>
 
-  case class IssueCreateForm(title: String, content: Option[String],
+  case class IssueCreateForm(
-    assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Option[String])
+    title: String,
+    content: Option[String],
+    assignedUserName: Option[String],
+    milestoneId: Option[Int],
+    priorityId: Option[Int],
+    labelNames: Option[String]
+  )
   case class CommentForm(issueId: Int, content: String)
   case class IssueStateForm(issueId: Int, content: Option[String])
 
@@ -78,7 +84,7 @@ trait IssuesControllerBase extends ControllerBase {
 
   get("/:owner/:repository/issues")(referrersOnly { repository =>
     val q = request.getParameter("q")
-    if(Option(q).exists(_.contains("is:pr"))){
+    if (Option(q).exists(_.contains("is:pr"))) {
       redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
     } else {
       searchIssues(repository)
@@ -86,9 +92,11 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
+    defining(repository.owner, repository.name, params("id")) {
-      getIssue(owner, name, issueId) map { issue =>
+      case (owner, name, issueId) =>
-        if(issue.isPullRequest){
+        getIssue(owner, name, issueId) map {
+          issue =>
+            if (issue.isPullRequest) {
               redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
             } else {
               html.issue(
@@ -101,15 +109,17 @@ trait IssuesControllerBase extends ControllerBase {
                 getLabels(owner, name),
                 isIssueEditable(repository),
                 isIssueManageable(repository),
-            repository)
+                repository
+              )
             }
         } getOrElse NotFound()
     }
   })
 
   get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
+    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-      defining(repository.owner, repository.name){ case (owner, name) =>
+      defining(repository.owner, repository.name) {
+        case (owner, name) =>
           html.create(
             getAssignableUserNames(owner, name),
             getMilestones(owner, name),
@@ -118,13 +128,14 @@ trait IssuesControllerBase extends ControllerBase {
             getLabels(owner, name),
             isIssueManageable(repository),
             getContentTemplate(repository, "ISSUE_TEMPLATE"),
-          repository)
+            repository
+          )
       }
     } else Unauthorized()
   })
 
   post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
+    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
       val issue = createIssue(
         repository,
         form.title,
@@ -133,16 +144,18 @@ trait IssuesControllerBase extends ControllerBase {
         form.milestoneId,
         form.priorityId,
         form.labelNames.toArray.flatMap(_.split(",")),
-        context.loginAccount.get)
+        context.loginAccount.get
+      )
 
       redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
     } else Unauthorized()
   })
 
   ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
         getIssue(owner, name, params("id")).map { issue =>
-        if(isEditableContent(owner, name, issue.openedUserName)){
+          if (isEditableContent(owner, name, issue.openedUserName)) {
             // update issue
             updateIssue(owner, name, issue.issueId, title, issue.content)
             // extract references and create refer comment
@@ -155,9 +168,10 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (content, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
         getIssue(owner, name, params("id")).map { issue =>
-        if(isEditableContent(owner, name, issue.openedUserName)){
+          if (isEditableContent(owner, name, issue.openedUserName)) {
             // update issue
             updateIssue(owner, name, issue.issueId, issue.title, content)
             // extract references and create refer comment
@@ -171,28 +185,35 @@ trait IssuesControllerBase extends ControllerBase {
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
     getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-      val actionOpt = params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      val actionOpt =
-      handleComment(issue, Some(form.content), repository, actionOpt) map { case (issue, id) =>
+        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
-        redirect(s"/${repository.owner}/${repository.name}/${
+      handleComment(issue, Some(form.content), repository, actionOpt) map {
-          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+        case (issue, id) =>
+          redirect(
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+          )
       }
     } getOrElse NotFound()
   })
 
   post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
     getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-      val actionOpt = params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
+      val actionOpt =
-      handleComment(issue, form.content, repository, actionOpt) map { case (issue, id) =>
+        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
-        redirect(s"/${repository.owner}/${repository.name}/${
+      handleComment(issue, form.content, repository, actionOpt) map {
-          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+        case (issue, id) =>
+          redirect(
+            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+          )
       }
     } getOrElse NotFound()
   })
 
   ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
         getComment(owner, name, params("id")).map { comment =>
-        if(isEditableContent(owner, name, comment.commentedUserName)){
+          if (isEditableContent(owner, name, comment.commentedUserName)) {
             updateComment(comment.issueId, comment.commentId, form.content)
             redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
           } else Unauthorized()
@@ -201,9 +222,10 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
         getComment(owner, name, params("id")).map { comment =>
-        if(isEditableContent(owner, name, comment.commentedUserName)){
+          if (isEditableContent(owner, name, comment.commentedUserName)) {
             Ok(deleteComment(comment.issueId, comment.commentId))
           } else Unauthorized()
         } getOrElse NotFound()
@@ -211,8 +233,9 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
-    getIssue(repository.owner, repository.name, params("id")) map { x =>
+    getIssue(repository.owner, repository.name, params("id")) map {
-      if(isEditableContent(x.userName, x.repositoryName, x.openedUserName)){
+      x =>
+        if (isEditableContent(x.userName, x.repositoryName, x.openedUserName)) {
           params.get("dataType") collect {
             case t if t == "html" => html.editissue(x.content, x.issueId, repository)
           } getOrElse {
@@ -238,8 +261,9 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
-    getComment(repository.owner, repository.name, params("id")) map { x =>
+    getComment(repository.owner, repository.name, params("id")) map {
-      if(isEditableContent(x.userName, x.repositoryName, x.commentedUserName)){
+      x =>
+        if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName)) {
           params.get("dataType") collect {
             case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
           } getOrElse {
@@ -270,48 +294,60 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/new")(writableUsersOnly { repository =>
-    defining(params("id").toInt){ issueId =>
+    defining(params("id").toInt) { issueId =>
-      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
       html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
     }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/delete")(writableUsersOnly { repository =>
-    defining(params("id").toInt){ issueId =>
+    defining(params("id").toInt) { issueId =>
-      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
       html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
     }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/assign")(writableUsersOnly { repository =>
-    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
+    updateAssignedUserName(
+      repository.owner,
+      repository.name,
+      params("id").toInt,
+      assignedUserName("assignedUserName"),
+      true
+    )
     Ok("updated")
   })
 
   ajaxPost("/:owner/:repository/issues/:id/milestone")(writableUsersOnly { repository =>
-    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"))
+    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"), true)
     milestoneId("milestoneId").map { milestoneId =>
       getMilestonesWithIssueCount(repository.owner, repository.name)
-          .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) =>
+        .find(_._1.milestoneId == milestoneId)
+        .map {
+          case (_, openCount, closeCount) =>
             gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
         } getOrElse NotFound()
     } getOrElse Ok()
   })
 
   ajaxPost("/:owner/:repository/issues/:id/priority")(writableUsersOnly { repository =>
-    updatePriorityId(repository.owner, repository.name, params("id").toInt, priorityId("priorityId"))
+    val priority = priorityId("priorityId")
+    updatePriorityId(repository.owner, repository.name, params("id").toInt, priority, true)
     Ok("updated")
   })
 
   post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
-    defining(params.get("value")){ action =>
+    defining(params.get("value")) {
+      action =>
         action match {
-        case Some("open")  => executeBatch(repository) { issueId =>
+          case Some("open") =>
+            executeBatch(repository) { issueId =>
               getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
                 handleComment(issue, None, repository, Some("reopen"))
               }
             }
-        case Some("close") => executeBatch(repository) { issueId =>
+          case Some("close") =>
+            executeBatch(repository) { issueId =>
               getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
                 handleComment(issue, None, repository, Some("close"))
               }
@@ -322,42 +358,42 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/label")(writableUsersOnly { repository =>
-    params("value").toIntOpt.map{ labelId =>
+    params("value").toIntOpt.map { labelId =>
       executeBatch(repository) { issueId =>
         getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
-          registerIssueLabel(repository.owner, repository.name, issueId, labelId)
+          registerIssueLabel(repository.owner, repository.name, issueId, labelId, true)
         }
       }
     } getOrElse NotFound()
   })
 
   post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
-    defining(assignedUserName("value")){ value =>
+    defining(assignedUserName("value")) { value =>
       executeBatch(repository) {
-        updateAssignedUserName(repository.owner, repository.name, _, value)
+        updateAssignedUserName(repository.owner, repository.name, _, value, true)
       }
     }
   })
 
   post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
-    defining(milestoneId("value")){ value =>
+    defining(milestoneId("value")) { value =>
       executeBatch(repository) {
-        updateMilestoneId(repository.owner, repository.name, _, value)
+        updateMilestoneId(repository.owner, repository.name, _, value, true)
       }
     }
   })
 
   post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
-    defining(priorityId("value")){ value =>
+    defining(priorityId("value")) { value =>
       executeBatch(repository) {
-        updatePriorityId(repository.owner, repository.name, _, value)
+        updatePriorityId(repository.owner, repository.name, _, value, true)
       }
     }
   })
 
   get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
     (Directory.getAttachedDir(repository.owner, repository.name) match {
-      case dir if(dir.exists && dir.isDirectory) =>
+      case dir if (dir.exists && dir.isDirectory) =>
         dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file =>
           response.setHeader("Content-Disposition", f"""inline; filename=${file.getName}""")
           RawData(FileUtil.getMimeType(file.getName), file)
@@ -371,7 +407,7 @@ trait IssuesControllerBase extends ControllerBase {
   val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
   private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
-    params("checked").split(',') map(_.toInt) foreach execute
+    params("checked").split(',') map (_.toInt) foreach execute
     params("from") match {
       case "issues" => redirect(s"/${repository.owner}/${repository.name}/issues")
       case "pulls"  => redirect(s"/${repository.owner}/${repository.name}/pulls")
@@ -379,7 +415,8 @@ trait IssuesControllerBase extends ControllerBase {
   }
 
   private def searchIssues(repository: RepositoryService.RepositoryInfo) = {
-    defining(repository.owner, repository.name){ case (owner, repoName) =>
+    defining(repository.owner, repository.name) {
+      case (owner, repoName) =>
         val page = IssueSearchCondition.page(request)
 
         // retrieve search condition
@@ -393,19 +430,22 @@ trait IssuesControllerBase extends ControllerBase {
           getMilestones(owner, repoName),
           getPriorities(owner, repoName),
           getLabels(owner, repoName),
-          countIssue(condition.copy(state = "open"  ), false, owner -> repoName),
+          countIssue(condition.copy(state = "open"), false, owner -> repoName),
           countIssue(condition.copy(state = "closed"), false, owner -> repoName),
           condition,
           repository,
           isIssueEditable(repository),
-          isIssueManageable(repository))
+          isIssueManageable(repository)
+        )
     }
   }
 
   /**
    * Tests whether an issue or a comment is editable by a logged-in user.
    */
-  private def isEditableContent(owner: String, repository: String, author: String)(implicit context: Context): Boolean = {
+  private def isEditableContent(owner: String, repository: String, author: String)(
+    implicit context: Context
+  ): Boolean = {
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
   }
 }

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

@@ -1,20 +1,38 @@
 package gitbucket.core.controller
 
 import gitbucket.core.issues.labels.html
-import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService}
+import gitbucket.core.service.{
+  RepositoryService,
+  AccountService,
+  IssuesService,
+  LabelsService,
+  MilestonesService,
+  PrioritiesService
+}
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
-import io.github.gitbucket.scalatra.forms._
+import gitbucket.core.util.SyntaxSugars._
+import org.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.scalatra.Ok
 
-class LabelsController extends LabelsControllerBase
+class LabelsController
-  with LabelsService with IssuesService with RepositoryService with AccountService
+    extends LabelsControllerBase
-with ReferrerAuthenticator with WritableUsersAuthenticator
+    with IssuesService
+    with RepositoryService
+    with AccountService
+    with LabelsService
+    with PrioritiesService
+    with MilestonesService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
 
 trait LabelsControllerBase extends ControllerBase {
-  self: LabelsService with IssuesService with RepositoryService
+  self: LabelsService
-    with ReferrerAuthenticator with WritableUsersAuthenticator =>
+    with IssuesService
+    with RepositoryService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator =>
 
   case class LabelForm(labelName: String, color: String)
 
@@ -23,13 +41,13 @@ trait LabelsControllerBase extends ControllerBase {
     "labelColor" -> trim(label("Color", text(required, color)))
   )(LabelForm.apply)
 
-
   get("/:owner/:repository/issues/labels")(referrersOnly { repository =>
     html.list(
       getLabels(repository.owner, repository.name),
       countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxGet("/:owner/:repository/issues/labels/new")(writableUsersOnly { repository =>
@@ -43,7 +61,8 @@ trait LabelsControllerBase extends ControllerBase {
       // TODO futility
       countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxGet("/:owner/:repository/issues/labels/:labelId/edit")(writableUsersOnly { repository =>
@@ -59,7 +78,8 @@ trait LabelsControllerBase extends ControllerBase {
       // TODO futility
       countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxPost("/:owner/:repository/issues/labels/:labelId/delete")(writableUsersOnly { repository =>
@@ -70,24 +90,32 @@ trait LabelsControllerBase extends ControllerBase {
   /**
    * Constraint for the identifier such as user name, repository name or page name.
    */
-  private def labelName: Constraint = new Constraint(){
+  private def labelName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(value.contains(',')){
+      if (value.contains(',')) {
         Some(s"${name} contains invalid character.")
-      } else if(value.startsWith("_") || value.startsWith("-")){
+      } else if (value.startsWith("_") || value.startsWith("-")) {
         Some(s"${name} starts with invalid character.")
       } else {
         None
       }
   }
 
-  private def uniqueLabelName: Constraint = new Constraint(){
+  private def uniqueLabelName: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+    override def validate(
-      val owner = params("owner")
+      name: String,
-      val repository = params("repository")
+      value: String,
-      params.get("labelId").map { labelId =>
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      val owner = params.value("owner")
+      val repository = params.value("repository")
+      params
+        .optionValue("labelId")
+        .map { labelId =>
           getLabel(owner, repository, value).filter(_.labelId != labelId.toInt).map(_ => "Name has already been taken.")
-      }.getOrElse {
+        }
+        .getOrElse {
           getLabel(owner, repository, value).map(_ => "Name has already been taken.")
         }
     }

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

@@ -4,15 +4,18 @@ import gitbucket.core.issues.milestones.html
 import gitbucket.core.service.{RepositoryService, MilestonesService, AccountService}
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
-import io.github.gitbucket.scalatra.forms._
+import org.scalatra.forms._
 
-class MilestonesController extends MilestonesControllerBase
+class MilestonesController
-  with MilestonesService with RepositoryService with AccountService
+    extends MilestonesControllerBase
-  with ReferrerAuthenticator with WritableUsersAuthenticator
+    with MilestonesService
+    with RepositoryService
+    with AccountService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
 
 trait MilestonesControllerBase extends ControllerBase {
-  self: MilestonesService with RepositoryService
+  self: MilestonesService with RepositoryService with ReferrerAuthenticator with WritableUsersAuthenticator =>
-    with ReferrerAuthenticator with WritableUsersAuthenticator  =>
 
   case class MilestoneForm(title: String, description: Option[String], dueDate: Option[java.util.Date])
 
@@ -27,7 +30,8 @@ trait MilestonesControllerBase extends ControllerBase {
       params.getOrElse("state", "open"),
       getMilestonesWithIssueCount(repository.owner, repository.name),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   get("/:owner/:repository/issues/milestones/new")(writableUsersOnly {
@@ -40,13 +44,14 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/edit")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.map{ milestoneId =>
+    params("milestoneId").toIntOpt.map { milestoneId =>
       html.edit(getMilestone(repository.owner, repository.name, milestoneId), repository)
     } getOrElse NotFound()
   })
 
-  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableUsersOnly {
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    (form, repository) =>
+      params("milestoneId").toIntOpt.flatMap { milestoneId =>
         getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
           updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
           redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
@@ -55,7 +60,7 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/close")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    params("milestoneId").toIntOpt.flatMap { milestoneId =>
       getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
         closeMilestone(milestone)
         redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
@@ -64,7 +69,7 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/open")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    params("milestoneId").toIntOpt.flatMap { milestoneId =>
       getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
         openMilestone(milestone)
         redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
@@ -73,7 +78,7 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/delete")(writableUsersOnly { repository =>
-    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+    params("milestoneId").toIntOpt.flatMap { milestoneId =>
       getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
         deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
         redirect(s"/${repository.owner}/${repository.name}/issues/milestones")

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

@@ -28,13 +28,12 @@ trait PreProcessControllerBase extends ControllerBase {
    * But if it's not allowed, demands authentication except some paths.
    */
   get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
-    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
+    if (!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
-      !context.currentPath.startsWith("/register")) {
+        !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs")) {
       Unauthorized()
     } else {
       pass()
     }
   }
 
-
 }

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

@@ -1,20 +1,38 @@
 package gitbucket.core.controller
 
 import gitbucket.core.issues.priorities.html
-import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, PrioritiesService}
+import gitbucket.core.service.{
+  RepositoryService,
+  AccountService,
+  IssuesService,
+  LabelsService,
+  MilestonesService,
+  PrioritiesService
+}
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
-import io.github.gitbucket.scalatra.forms._
+import gitbucket.core.util.SyntaxSugars._
+import org.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.scalatra.Ok
 
-class PrioritiesController extends PrioritiesControllerBase
+class PrioritiesController
-  with PrioritiesService with IssuesService with RepositoryService with AccountService
+    extends PrioritiesControllerBase
-with ReferrerAuthenticator with WritableUsersAuthenticator
+    with IssuesService
+    with RepositoryService
+    with AccountService
+    with LabelsService
+    with PrioritiesService
+    with MilestonesService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
 
 trait PrioritiesControllerBase extends ControllerBase {
-  self: PrioritiesService with IssuesService with RepositoryService
+  self: PrioritiesService
-    with ReferrerAuthenticator with WritableUsersAuthenticator =>
+    with IssuesService
+    with RepositoryService
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator =>
 
   case class PriorityForm(priorityName: String, description: Option[String], color: String)
 
@@ -24,13 +42,13 @@ trait PrioritiesControllerBase extends ControllerBase {
     "priorityColor" -> trim(label("Color", text(required, color)))
   )(PriorityForm.apply)
 
-
   get("/:owner/:repository/issues/priorities")(referrersOnly { repository =>
     html.list(
       getPriorities(repository.owner, repository.name),
       countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxGet("/:owner/:repository/issues/priorities/new")(writableUsersOnly { repository =>
@@ -38,12 +56,14 @@ trait PrioritiesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/priorities/new", priorityForm)(writableUsersOnly { (form, repository) =>
-    val priorityId = createPriority(repository.owner, repository.name, form.priorityName, form.description, form.color.substring(1))
+    val priorityId =
+      createPriority(repository.owner, repository.name, form.priorityName, form.description, form.color.substring(1))
     html.priority(
       getPriority(repository.owner, repository.name, priorityId).get,
       countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
       repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
   })
 
   ajaxGet("/:owner/:repository/issues/priorities/:priorityId/edit")(writableUsersOnly { repository =>
@@ -52,21 +72,34 @@ trait PrioritiesControllerBase extends ControllerBase {
     } getOrElse NotFound()
   })
 
-  ajaxPost("/:owner/:repository/issues/priorities/:priorityId/edit", priorityForm)(writableUsersOnly { (form, repository) =>
+  ajaxPost("/:owner/:repository/issues/priorities/:priorityId/edit", priorityForm)(writableUsersOnly {
-    updatePriority(repository.owner, repository.name, params("priorityId").toInt, form.priorityName, form.description, form.color.substring(1))
+    (form, repository) =>
+      updatePriority(
+        repository.owner,
+        repository.name,
+        params("priorityId").toInt,
+        form.priorityName,
+        form.description,
+        form.color.substring(1)
+      )
       html.priority(
         getPriority(repository.owner, repository.name, params("priorityId").toInt).get,
         countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
         repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+        hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+      )
   })
 
   ajaxPost("/:owner/:repository/issues/priorities/reorder")(writableUsersOnly { (repository) =>
-    reorderPriorities(repository.owner, repository.name, params("order")
+    reorderPriorities(
+      repository.owner,
+      repository.name,
+      params("order")
         .split(",")
         .map(id => id.toInt)
         .zipWithIndex
-      .toMap)
+        .toMap
+    )
 
     Ok()
   })
@@ -86,24 +119,34 @@ trait PrioritiesControllerBase extends ControllerBase {
   /**
    * Constraint for the identifier such as user name, repository name or page name.
    */
-  private def priorityName: Constraint = new Constraint(){
+  private def priorityName: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(value.contains(',')){
+      if (value.contains(',')) {
         Some(s"${name} contains invalid character.")
-      } else if(value.startsWith("_") || value.startsWith("-")){
+      } else if (value.startsWith("_") || value.startsWith("-")) {
         Some(s"${name} starts with invalid character.")
       } else {
         None
       }
   }
 
-  private def uniquePriorityName: Constraint = new Constraint(){
+  private def uniquePriorityName: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+    override def validate(
-      val owner = params("owner")
+      name: String,
-      val repository = params("repository")
+      value: String,
-      params.get("priorityId").map { priorityId =>
+      params: Map[String, Seq[String]],
-        getPriority(owner, repository, value).filter(_.priorityId != priorityId.toInt).map(_ => "Name has already been taken.")
+      messages: Messages
-      }.getOrElse {
+    ): Option[String] = {
+      val owner = params.value("owner")
+      val repository = params.value("repository")
+      params
+        .optionValue("priorityId")
+        .map { priorityId =>
+          getPriority(owner, repository, value)
+            .filter(_.priorityId != priorityId.toInt)
+            .map(_ => "Name has already been taken.")
+        }
+        .getOrElse {
           getPriority(owner, repository, value).map(_ => "Name has already been taken.")
         }
     }

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

@@ -1,6 +1,6 @@
 package gitbucket.core.controller
 
-import gitbucket.core.model.WebHook
+import gitbucket.core.model.{CommitComment, CommitComments, IssueComment, WebHook}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
@@ -13,28 +13,53 @@ import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
-import io.github.gitbucket.scalatra.forms._
+import org.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.PersonIdent
+import org.eclipse.jgit.revwalk.RevWalk
+import org.scalatra.BadRequest
 
 import scala.collection.JavaConverters._
 
-
+class PullRequestsController
-class PullRequestsController extends PullRequestsControllerBase
+    extends PullRequestsControllerBase
-  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
+    with RepositoryService
-  with CommitsService with ActivityService with WebHookPullRequestService
+    with AccountService
-  with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
+    with IssuesService
-  with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService
+    with PullRequestService
-
+    with MilestonesService
+    with LabelsService
+    with CommitsService
+    with ActivityService
+    with WebHookPullRequestService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+    with CommitStatusService
+    with MergeService
+    with ProtectedBranchService
+    with PrioritiesService
 
 trait PullRequestsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
+  self: RepositoryService
-    with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService
+    with AccountService
-    with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
+    with IssuesService
-    with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService =>
+    with MilestonesService
+    with LabelsService
+    with CommitsService
+    with ActivityService
+    with PullRequestService
+    with WebHookPullRequestService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+    with CommitStatusService
+    with MergeService
+    with ProtectedBranchService
+    with PrioritiesService =>
 
   val pullRequestForm = mapping(
-    "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
+    "title" -> trim(label("Title", text(required, maxlength(100)))),
     "content" -> trim(label("Content", optional(text()))),
     "targetUserName" -> trim(text(required, maxlength(100))),
     "targetBranch" -> trim(text(required, maxlength(100))),
@@ -50,7 +75,8 @@ trait PullRequestsControllerBase extends ControllerBase {
   )(PullRequestForm.apply)
 
   val mergeForm = mapping(
-    "message" -> trim(label("Message", text(required)))
+    "message" -> trim(label("Message", text(required))),
+    "strategy" -> trim(label("Strategy", text(required)))
   )(MergeForm.apply)
 
   case class PullRequestForm(
@@ -69,11 +95,11 @@ trait PullRequestsControllerBase extends ControllerBase {
     labelNames: Option[String]
   )
 
-  case class MergeForm(message: String)
+  case class MergeForm(message: String, strategy: String)
 
   get("/:owner/:repository/pulls")(referrersOnly { repository =>
     val q = request.getParameter("q")
-    if(Option(q).exists(_.contains("is:issue"))){
+    if (Option(q).exists(_.contains("is:issue"))) {
       redirect(s"/${repository.owner}/${repository.name}/issues?q=" + StringUtil.urlEncode(q))
     } else {
       searchPullRequests(None, repository)
@@ -81,65 +107,145 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/pull/:id")(referrersOnly { repository =>
-    params("id").toIntOpt.flatMap{ issueId =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
         val owner = repository.owner
         val name = repository.name
-      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+        getPullRequest(owner, name, issueId) map {
-        using(Git.open(getRepositoryDir(owner, name))){ git =>
+          case (issue, pullreq) =>
-          val (commits, diffs) =
+            val (commits, _) =
               getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
-          html.pullreq(
+
-            issue, pullreq,
+            html.conversation(
-            (commits.flatten.map(commit => getCommitComments(owner, name, commit.id, true)).flatten.toList ::: getComments(owner, name, issueId))
+              issue,
-              .sortWith((a, b) => a.registeredDate before b.registeredDate),
+              pullreq,
+              commits.flatten,
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
               getIssueLabels(owner, name, issueId),
               getAssignableUserNames(owner, name),
               getMilestonesWithIssueCount(owner, name),
               getPriorities(owner, name),
               getLabels(owner, name),
-            commits,
-            diffs,
               isEditable(repository),
               isManageable(repository),
               hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
               repository,
               getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
-            flash.toMap.map(f => f._1 -> f._2.toString))
+              flash.toMap.map(f => f._1 -> f._2.toString)
+            )
+
+//                html.pullreq(
+//                  issue,
+//                  pullreq,
+//                  comments,
+//                  getIssueLabels(owner, name, issueId),
+//                  getAssignableUserNames(owner, name),
+//                  getMilestonesWithIssueCount(owner, name),
+//                  getPriorities(owner, name),
+//                  getLabels(owner, name),
+//                  commits,
+//                  diffs,
+//                  isEditable(repository),
+//                  isManageable(repository),
+//                  hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
+//                  repository,
+//                  getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
+//                  flash.toMap.map(f => f._1 -> f._2.toString)
+//                )
         }
+    } getOrElse NotFound()
+  })
+
+  get("/:owner/:repository/pull/:id/commits")(referrersOnly { repository =>
+    params("id").toIntOpt.flatMap { issueId =>
+      val owner = repository.owner
+      val name = repository.name
+      getPullRequest(owner, name, issueId) map {
+        case (issue, pullreq) =>
+          val (commits, _) =
+            getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+
+          html.commits(
+            issue,
+            pullreq,
+            commits,
+            getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+            isManageable(repository),
+            repository
+          )
+      }
+    } getOrElse NotFound()
+  })
+
+  get("/:owner/:repository/pull/:id/files")(referrersOnly { repository =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
+        val owner = repository.owner
+        val name = repository.name
+        getPullRequest(owner, name, issueId) map {
+          case (issue, pullreq) =>
+            val (commits, diffs) =
+              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+
+            html.files(
+              issue,
+              pullreq,
+              diffs,
+              commits.flatten,
+              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              isManageable(repository),
+              repository
+            )
         }
     } getOrElse NotFound()
   })
 
   ajaxGet("/:owner/:repository/pull/:id/mergeguide")(referrersOnly { repository =>
-    params("id").toIntOpt.flatMap{ issueId =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
         val owner = repository.owner
         val name = repository.name
-      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+        getPullRequest(owner, name, issueId) map {
-        val hasConflict = LockUtil.lock(s"${owner}/${name}"){
+          case (issue, pullreq) =>
+            val conflictMessage = LockUtil.lock(s"${owner}/${name}") {
               checkConflict(owner, name, pullreq.branch, issueId)
             }
             val hasMergePermission = hasDeveloperRole(owner, name, context.loginAccount)
             val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
             val mergeStatus = PullRequestService.MergeStatus(
-           hasConflict         = hasConflict,
+              conflictMessage = conflictMessage,
               commitStatues = getCommitStatues(owner, name, pullreq.commitIdTo),
               branchProtection = branchProtection,
               branchIsOutOfDate = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
-           needStatusCheck     = context.loginAccount.map{ u =>
+              needStatusCheck = context.loginAccount
+                .map { u =>
                   branchProtection.needStatusCheck(u.userName)
-                                 }.getOrElse(true),
+                }
-           hasUpdatePermission = hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount) &&
+                .getOrElse(true),
-                                   context.loginAccount.map{ u =>
+              hasUpdatePermission = hasDeveloperRole(
-                                     !getProtectedBranchInfo(pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch).needStatusCheck(u.userName)
+                pullreq.requestUserName,
-                                   }.getOrElse(false),
+                pullreq.requestRepositoryName,
+                context.loginAccount
+              ) &&
+                context.loginAccount
+                  .map { u =>
+                    !getProtectedBranchInfo(
+                      pullreq.requestUserName,
+                      pullreq.requestRepositoryName,
+                      pullreq.requestBranch
+                    ).needStatusCheck(u.userName)
+                  }
+                  .getOrElse(false),
               hasMergePermission = hasMergePermission,
-           commitIdTo          = pullreq.commitIdTo)
+              commitIdTo = pullreq.commitIdTo
+            )
             html.mergeguide(
               mergeStatus,
               issue,
               pullreq,
               repository,
-          getRepository(pullreq.requestUserName, pullreq.requestRepositoryName).get)
+              getRepository(pullreq.requestUserName, pullreq.requestRepositoryName).get
+            )
         }
     } getOrElse NotFound()
   })
@@ -155,16 +261,23 @@ trait PullRequestsControllerBase extends ControllerBase {
     } yield {
       val repository = getRepository(owner, name).get
       val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
-      if(branchProtection.enabled){
+      if (branchProtection.enabled) {
         flash += "error" -> s"branch ${pullreq.requestBranch} is protected."
       } else {
-        if(repository.repository.defaultBranch != pullreq.requestBranch){
+        if (repository.repository.defaultBranch != pullreq.requestBranch) {
           val userName = context.loginAccount.get.userName
-          using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+          using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
             git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call()
             recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch)
           }
-          createComment(baseRepository.owner, baseRepository.name, userName, issueId, pullreq.requestBranch, "delete_branch")
+          createComment(
+            baseRepository.owner,
+            baseRepository.name,
+            userName,
+            issueId,
+            pullreq.requestBranch,
+            "delete_branch"
+          )
         } else {
           flash += "error" -> s"""Can't delete the default branch "${pullreq.requestBranch}"."""
         }
@@ -184,31 +297,49 @@ trait PullRequestsControllerBase extends ControllerBase {
     } yield {
       val repository = getRepository(owner, name).get
       val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
-      if(branchProtection.needStatusCheck(loginAccount.userName)){
+      if (branchProtection.needStatusCheck(loginAccount.userName)) {
         flash += "error" -> s"branch ${pullreq.requestBranch} is protected need status check."
       } else {
-        LockUtil.lock(s"${owner}/${name}"){
+        LockUtil.lock(s"${owner}/${name}") {
-          val alias = if(pullreq.repositoryName == pullreq.requestRepositoryName && pullreq.userName == pullreq.requestUserName){
+          val alias =
+            if (pullreq.repositoryName == pullreq.requestRepositoryName && pullreq.userName == pullreq.requestUserName) {
               pullreq.branch
             } else {
               s"${pullreq.userName}:${pullreq.branch}"
             }
-          val existIds = using(Git.open(Directory.getRepositoryDir(owner, name))) { git => JGitUtil.getAllCommitIds(git) }.toSet
+          val existIds = using(Git.open(Directory.getRepositoryDir(owner, name))) { git =>
-          pullRemote(owner, name, pullreq.requestBranch, pullreq.userName, pullreq.repositoryName, pullreq.branch, loginAccount,
+            JGitUtil.getAllCommitIds(git)
-                     s"Merge branch '${alias}' into ${pullreq.requestBranch}") match {
+          }.toSet
+          pullRemote(
+            owner,
+            name,
+            pullreq.requestBranch,
+            pullreq.userName,
+            pullreq.repositoryName,
+            pullreq.branch,
+            loginAccount,
+            s"Merge branch '${alias}' into ${pullreq.requestBranch}"
+          ) match {
             case None => // conflict
               flash += "error" -> s"Can't automatic merging branch '${alias}' into ${pullreq.requestBranch}."
             case Some(oldId) =>
               // update pull request
               updatePullRequests(owner, name, pullreq.requestBranch)
 
-              using(Git.open(Directory.getRepositoryDir(owner, name))) { git =>
+              using(Git.open(Directory.getRepositoryDir(owner, name))) {
+                git =>
                   //  after update branch
                   val newCommitId = git.getRepository.resolve(s"refs/heads/${pullreq.requestBranch}")
-                val commits = git.log.addRange(oldId, newCommitId).call.iterator.asScala.map(c => new JGitUtil.CommitInfo(c)).toList
+                  val commits = git.log
+                    .addRange(oldId, newCommitId)
+                    .call
+                    .iterator
+                    .asScala
+                    .map(c => new JGitUtil.CommitInfo(c))
+                    .toList
 
                   commits.foreach { commit =>
-                  if(!existIds.contains(commit.id)){
+                    if (!existIds.contains(commit.id)) {
                       createIssueComment(owner, name, commit)
                     }
                   }
@@ -217,19 +348,34 @@ trait PullRequestsControllerBase extends ControllerBase {
                   recordPushActivity(owner, name, loginAccount.userName, pullreq.branch, commits)
 
                   // close issue by commit message
-                if(pullreq.requestBranch == repository.repository.defaultBranch){
+                  if (pullreq.requestBranch == repository.repository.defaultBranch) {
                     commits.map { commit =>
                       closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
                     }
                   }
 
                   // call web hook
-                callPullRequestWebHookByRequestBranch("synchronize", repository, pullreq.requestBranch, baseUrl, loginAccount)
+                  callPullRequestWebHookByRequestBranch(
+                    "synchronize",
+                    repository,
+                    pullreq.requestBranch,
+                    baseUrl,
+                    loginAccount
+                  )
                   callWebHookOf(owner, name, WebHook.Push) {
                     for {
                       ownerAccount <- getAccountByUserName(owner)
                     } yield {
-                    WebHookService.WebHookPushPayload(git, loginAccount, pullreq.requestBranch, repository, commits, ownerAccount, oldId = oldId, newId = newCommitId)
+                      WebHookService.WebHookPushPayload(
+                        git,
+                        loginAccount,
+                        pullreq.requestBranch,
+                        repository,
+                        commits,
+                        ownerAccount,
+                        oldId = oldId,
+                        newId = newCommitId
+                      )
                     }
                   }
               }
@@ -243,12 +389,16 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/pull/:id/merge", mergeForm)(writableUsersOnly { (form, repository) =>
-    params("id").toIntOpt.flatMap { issueId =>
+    params("id").toIntOpt.flatMap {
+      issueId =>
         val owner = repository.owner
         val name = repository.name
-      LockUtil.lock(s"${owner}/${name}"){
+        if (repository.repository.options.mergeOptions.split(",").contains(form.strategy)) {
-        getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
+          LockUtil.lock(s"${owner}/${name}") {
-          using(Git.open(getRepositoryDir(owner, name))) { git =>
+            getPullRequest(owner, name, issueId).map {
+              case (issue, pullreq) =>
+                using(Git.open(getRepositoryDir(owner, name))) {
+                  git =>
                     // mark issue as merged and close.
                     val loginAccount = context.loginAccount.get
                     val commentId = createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
@@ -258,21 +408,61 @@ trait PullRequestsControllerBase extends ControllerBase {
                     // record activity
                     recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
 
-            // merge git repository
+                    val (commits, _) = getRequestCompareInfo(
-            mergePullRequest(git, pullreq.branch, issueId,
+                      owner,
-              s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" + form.message,
+                      name,
-               new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+                      pullreq.commitIdFrom,
+                      pullreq.requestUserName,
+                      pullreq.requestRepositoryName,
+                      pullreq.commitIdTo
+                    )
 
-            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
+                    val revCommits = using(new RevWalk(git.getRepository)) { revWalk =>
-              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
+                      commits.flatten.map { commit =>
+                        revWalk.parseCommit(git.getRepository.resolve(commit.id))
+                      }
+                    }.reverse
+
+                    // merge git repository
+                    form.strategy match {
+                      case "merge-commit" =>
+                        mergePullRequest(
+                          git,
+                          pullreq.branch,
+                          issueId,
+                          s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" + form.message,
+                          new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+                        )
+                      case "rebase" =>
+                        rebasePullRequest(
+                          git,
+                          pullreq.branch,
+                          issueId,
+                          revCommits,
+                          new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+                        )
+                      case "squash" =>
+                        squashPullRequest(
+                          git,
+                          pullreq.branch,
+                          issueId,
+                          s"${issue.title} (#${issueId})\n\n" + form.message,
+                          new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+                        )
+                    }
 
                     // close issue by content of pull request
                     val defaultBranch = getRepository(owner, name).get.repository.defaultBranch
-            if(pullreq.branch == defaultBranch){
+                    if (pullreq.branch == defaultBranch) {
                       commits.flatten.foreach { commit =>
                         closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
                       }
-              closeIssuesFromMessage(issue.title + " " + issue.content.getOrElse(""), loginAccount.userName, owner, name)
+                      closeIssuesFromMessage(
+                        issue.title + " " + issue.content.getOrElse(""),
+                        loginAccount.userName,
+                        owner,
+                        name
+                      )
                       closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
                     }
 
@@ -282,7 +472,7 @@ trait PullRequestsControllerBase extends ControllerBase {
                     callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
 
                     // call hooks
-            PluginRegistry().getPullRequestHooks.foreach{ h =>
+                    PluginRegistry().getPullRequestHooks.foreach { h =>
                       h.addedComment(commentId, form.message, issue, repository)
                       h.merged(issue, repository)
                     }
@@ -291,29 +481,38 @@ trait PullRequestsControllerBase extends ControllerBase {
                 }
             }
           }
+        } else Some(BadRequest())
     } getOrElse NotFound()
   })
 
   get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
-    val headBranch:Option[String] = params.get("head")
+    val headBranch: Option[String] = params.get("head")
     (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
       case (Some(originUserName), Some(originRepositoryName)) => {
-        getRepository(originUserName, originRepositoryName).map { originRepository =>
+        getRepository(originUserName, originRepositoryName).map {
+          originRepository =>
             using(
               Git.open(getRepositoryDir(originUserName, originRepositoryName)),
               Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
-          ){ (oldGit, newGit) =>
+            ) { (oldGit, newGit) =>
               val newBranch = headBranch.getOrElse(JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2)
-            val oldBranch = originRepository.branchList.find( _ == newBranch).getOrElse(JGitUtil.getDefaultBranch(oldGit, originRepository).get._2)
+              val oldBranch = originRepository.branchList
+                .find(_ == newBranch)
+                .getOrElse(JGitUtil.getDefaultBranch(oldGit, originRepository).get._2)
 
-            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}")
+              redirect(
+                s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}"
+              )
             }
         } getOrElse NotFound()
       }
       case _ => {
-        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
+        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))) { git =>
-          JGitUtil.getDefaultBranch(git, forkedRepository).map { case (_, defaultBranch) =>
+          JGitUtil.getDefaultBranch(git, forkedRepository).map {
-            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${headBranch.getOrElse(defaultBranch)}")
+            case (_, defaultBranch) =>
+              redirect(
+                s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${headBranch.getOrElse(defaultBranch)}"
+              )
           } getOrElse {
             redirect(s"/${forkedRepository.owner}/${forkedRepository.name}")
           }
@@ -324,52 +523,74 @@ trait PullRequestsControllerBase extends ControllerBase {
 
   get("/:owner/:repository/compare/*...*")(referrersOnly { forkedRepository =>
     val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, originId) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (originOwner, originId) = parseCompareIdentifier(origin, forkedRepository.owner)
-    val (forkedOwner, forkedId) = parseCompareIdentifie(forked, forkedRepository.owner)
+    val (forkedOwner, forkedId) = parseCompareIdentifier(forked, forkedRepository.owner)
 
-    (for(
+    (for (originRepositoryName <- if (originOwner == forkedOwner) {
-      originRepositoryName <- if(originOwner == forkedOwner) {
             // Self repository
             Some(forkedRepository.name)
-      } else if(forkedRepository.repository.originUserName.isEmpty){
+          } else if (forkedRepository.repository.originUserName.isEmpty) {
             // when ForkedRepository is the original repository
-        getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
+            getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-      } else if(Some(originOwner) == forkedRepository.repository.originUserName){
+              .find(_.userName == originOwner)
+              .map(_.repositoryName)
+          } else if (Some(originOwner) == forkedRepository.repository.originUserName) {
             // Original repository
             forkedRepository.repository.originRepositoryName
           } else {
             // Sibling repository
-        getUserRepositories(originOwner).find { x =>
+            getUserRepositories(originOwner)
+              .find { x =>
                 x.repository.originUserName == forkedRepository.repository.originUserName &&
                 x.repository.originRepositoryName == forkedRepository.repository.originRepositoryName
-        }.map(_.repository.repositoryName)
+              }
+              .map(_.repository.repositoryName)
           };
-      originRepository <- getRepository(originOwner, originRepositoryName)
+          originRepository <- getRepository(originOwner, originRepositoryName)) yield {
-    ) yield {
       using(
         Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
         Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
-      ){ case (oldGit, newGit) =>
+      ) {
+        case (oldGit, newGit) =>
           val (oldId, newId) =
-          if(originRepository.branchList.contains(originId) && forkedRepository.branchList.contains(forkedId)){
+            if (originRepository.branchList.contains(originId)) {
-            // Branch name
+              val forkedId2 =
-            val rootId = JGitUtil.getForkedCommitId(oldGit, newGit,
+                forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
-              originRepository.owner, originRepository.name, originId,
+
-              forkedRepository.owner, forkedRepository.name, forkedId)
+              val originId2 = JGitUtil.getForkedCommitId(
+                oldGit,
+                newGit,
+                originRepository.owner,
+                originRepository.name,
+                originId,
+                forkedRepository.owner,
+                forkedRepository.name,
+                forkedId2
+              )
+
+              (Option(oldGit.getRepository.resolve(originId2)), Option(newGit.getRepository.resolve(forkedId2)))
 
-            (Option(oldGit.getRepository.resolve(rootId)),  Option(newGit.getRepository.resolve(forkedId)))
             } else {
-            // Commit id
+              val originId2 =
-            (Option(oldGit.getRepository.resolve(originId)), Option(newGit.getRepository.resolve(forkedId)))
+                originRepository.tags.collectFirst { case x if x.name == originId => x.id }.getOrElse(originId)
+              val forkedId2 =
+                forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
+
+              (Option(oldGit.getRepository.resolve(originId2)), Option(newGit.getRepository.resolve(forkedId2)))
             }
 
           (oldId, newId) match {
             case (Some(oldId), Some(newId)) => {
               val (commits, diffs) = getRequestCompareInfo(
-              originRepository.owner, originRepository.name, oldId.getName,
+                originRepository.owner,
-              forkedRepository.owner, forkedRepository.name, newId.getName)
+                originRepository.name,
+                oldId.getName,
+                forkedRepository.owner,
+                forkedRepository.name,
+                newId.getName
+              )
 
-            val title = if(commits.flatten.length == 1){
+              val title = if (commits.flatten.length == 1) {
                 commits.flatten.head.shortMessage
               } else {
                 val text = forkedId.replaceAll("[\\-_]", " ")
@@ -381,10 +602,20 @@ trait PullRequestsControllerBase extends ControllerBase {
                 commits,
                 diffs,
                 ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
-                case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
+                  case (Some(userName), Some(repositoryName)) =>
-                case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+                    getRepository(userName, repositoryName) match {
-              }).filter { case (owner, name) => hasGuestRole(owner, name, context.loginAccount) },
+                      case Some(x) => x.repository :: getForkedRepositories(userName, repositoryName)
-              commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList,
+                      case None    => getForkedRepositories(userName, repositoryName)
+                    }
+                  case _ =>
+                    forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+                }).map { repository =>
+                  (repository.userName, repository.repositoryName)
+                },
+                commits.flatten
+                  .map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false))
+                  .flatten
+                  .toList,
                 originId,
                 forkedId,
                 oldId.getName,
@@ -401,9 +632,11 @@ trait PullRequestsControllerBase extends ControllerBase {
               )
             }
             case (oldId, newId) =>
-            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/" +
+              redirect(
+                s"/${forkedRepository.owner}/${forkedRepository.name}/compare/" +
                   s"${originOwner}:${oldId.map(_ => originId).getOrElse(originRepository.repository.defaultBranch)}..." +
-                     s"${forkedOwner}:${newId.map(_ => forkedId).getOrElse(forkedRepository.repository.defaultBranch)}")
+                  s"${forkedOwner}:${newId.map(_ => forkedId).getOrElse(forkedRepository.repository.defaultBranch)}"
+              )
           }
       }
     }) getOrElse NotFound()
@@ -411,36 +644,44 @@ trait PullRequestsControllerBase extends ControllerBase {
 
   ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(readableUsersOnly { forkedRepository =>
     val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifier(origin, forkedRepository.owner)
-    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifier(forked, forkedRepository.owner)
 
-    (for(
+    (for (originRepositoryName <- if (originOwner == forkedOwner) {
-      originRepositoryName <- if(originOwner == forkedOwner){
             Some(forkedRepository.name)
           } else {
             forkedRepository.repository.originRepositoryName.orElse {
-          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
+              getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+                .find(_.userName == originOwner)
+                .map(_.repositoryName)
             }
           };
-      originRepository <- getRepository(originOwner, originRepositoryName)
+          originRepository <- getRepository(originOwner, originRepositoryName)) yield {
-    ) yield {
       using(
         Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
         Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
-      ){ case (oldGit, newGit) =>
+      ) {
+        case (oldGit, newGit) =>
           val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
           val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
-        val conflict = LockUtil.lock(s"${originRepository.owner}/${originRepository.name}"){
+          val conflict = LockUtil.lock(s"${originRepository.owner}/${originRepository.name}") {
-          checkConflict(originRepository.owner, originRepository.name, originBranch,
+            checkConflict(
-                        forkedRepository.owner, forkedRepository.name, forkedBranch)
+              originRepository.owner,
+              originRepository.name,
+              originBranch,
+              forkedRepository.owner,
+              forkedRepository.name,
+              forkedBranch
+            )
           }
-        html.mergecheck(conflict)
+          html.mergecheck(conflict.isDefined)
       }
     }) getOrElse NotFound()
   })
 
   post("/:owner/:repository/pulls/new", pullRequestForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
         val manageable = isManageable(repository)
         val loginUserName = context.loginAccount.get.userName
 
@@ -453,7 +694,8 @@ trait PullRequestsControllerBase extends ControllerBase {
           assignedUserName = if (manageable) form.assignedUserName else None,
           milestoneId = if (manageable) form.milestoneId else None,
           priorityId = if (manageable) form.priorityId else None,
-        isPullRequest = true)
+          isPullRequest = true
+        )
 
         createPullRequest(
           originUserName = repository.owner,
@@ -464,7 +706,8 @@ trait PullRequestsControllerBase extends ControllerBase {
           requestRepositoryName = form.requestRepositoryName,
           requestBranch = form.requestBranch,
           commitIdFrom = form.commitIdFrom,
-        commitIdTo = form.commitIdTo)
+          commitIdTo = form.commitIdTo
+        )
 
         // insert labels
         if (manageable) {
@@ -489,7 +732,13 @@ trait PullRequestsControllerBase extends ControllerBase {
 
         getIssue(owner, name, issueId.toString) foreach { issue =>
           // extract references and create refer comment
-        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)
+          createReferComment(
+            owner,
+            name,
+            issue,
+            form.title + " " + form.content.getOrElse(""),
+            context.loginAccount.get
+          )
 
           // call hooks
           PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
@@ -499,14 +748,44 @@ trait PullRequestsControllerBase extends ControllerBase {
     }
   })
 
+  ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository =>
+    val branches = JGitUtil
+      .getBranches(
+        owner = repository.owner,
+        name = repository.name,
+        defaultBranch = repository.repository.defaultBranch,
+        origin = repository.repository.originUserName.isEmpty
+      )
+      .filter(x => x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0)
+      .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+      .map(_.name)
+      .reverse
+
+    val targetRepository = (for {
+      parentUserName <- repository.repository.parentUserName
+      parentRepoName <- repository.repository.parentRepositoryName
+      parentRepository <- getRepository(parentUserName, parentRepoName)
+    } yield {
+      parentRepository
+    }).getOrElse {
+      repository
+    }
+
+    val proposedBranches = branches.filter { branch =>
+      getPullRequestsByRequest(repository.owner, repository.name, branch, None).isEmpty
+    }
+
+    html.proposals(proposedBranches, targetRepository, repository)
+  })
+
   /**
    * Parses branch identifier and extracts owner and branch name as tuple.
    *
    * - "owner:branch" to ("owner", "branch")
    * - "branch" to ("defaultOwner", "branch")
    */
-  private def parseCompareIdentifie(value: String, defaultOwner: String): (String, String) =
+  private def parseCompareIdentifier(value: String, defaultOwner: String): (String, String) =
-    if(value.contains(':')){
+    if (value.contains(':')) {
       val array = value.split(":")
       (array(0), array(1))
     } else {
@@ -514,7 +793,8 @@ trait PullRequestsControllerBase extends ControllerBase {
     }
 
   private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
-    defining(repository.owner, repository.name){ case (owner, repoName) =>
+    defining(repository.owner, repository.name) {
+      case (owner, repoName) =>
         val page = IssueSearchCondition.page(request)
 
         // retrieve search condition
@@ -528,12 +808,13 @@ trait PullRequestsControllerBase extends ControllerBase {
           getMilestones(owner, repoName),
           getPriorities(owner, repoName),
           getLabels(owner, repoName),
-        countIssue(condition.copy(state = "open"  ), true, owner -> repoName),
+          countIssue(condition.copy(state = "open"), true, owner -> repoName),
           countIssue(condition.copy(state = "closed"), true, owner -> repoName),
           condition,
           repository,
           isEditable(repository),
-        isManageable(repository))
+          isManageable(repository)
+        )
     }
 
   /**

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

@@ -0,0 +1,192 @@
+package gitbucket.core.controller
+
+import java.io.File
+
+import gitbucket.core.service.{AccountService, ActivityService, ReleaseService, RepositoryService}
+import gitbucket.core.util.{FileUtil, ReadableUsersAuthenticator, ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.Implicits._
+import org.scalatra.forms._
+import gitbucket.core.releases.html
+import org.apache.commons.io.FileUtils
+import scala.collection.JavaConverters._
+
+class ReleaseController
+    extends ReleaseControllerBase
+    with RepositoryService
+    with AccountService
+    with ReleaseService
+    with ActivityService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+
+trait ReleaseControllerBase extends ControllerBase {
+  self: RepositoryService
+    with AccountService
+    with ReleaseService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+    with ActivityService =>
+
+  case class ReleaseForm(
+    name: String,
+    content: Option[String]
+  )
+
+  val releaseForm = mapping(
+    "name" -> trim(text(required)),
+    "content" -> trim(optional(text()))
+  )(ReleaseForm.apply)
+
+  get("/:owner/:repository/releases")(referrersOnly { repository =>
+    val releases = getReleases(repository.owner, repository.name)
+    val assets = getReleaseAssetsMap(repository.owner, repository.name)
+
+    html.list(
+      repository,
+      repository.tags.reverse.map { tag =>
+        (tag, releases.find(_.tag == tag.name).map { release =>
+          (release, assets(release))
+        })
+      },
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+    )
+  })
+
+  get("/:owner/:repository/releases/:tag")(referrersOnly { repository =>
+    val tagName = params("tag")
+    getRelease(repository.owner, repository.name, tagName)
+      .map { release =>
+        html.release(
+          release,
+          getReleaseAssets(repository.owner, repository.name, tagName),
+          hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+          repository
+        )
+      }
+      .getOrElse(NotFound())
+  })
+
+  get("/:owner/:repository/releases/:tag/assets/:fileId")(referrersOnly { repository =>
+    val tagName = params("tag")
+    val fileId = params("fileId")
+    (for {
+      _ <- repository.tags.find(_.name == tagName)
+      _ <- getRelease(repository.owner, repository.name, tagName)
+      asset <- getReleaseAsset(repository.owner, repository.name, tagName, fileId)
+    } yield {
+      response.setHeader("Content-Disposition", s"attachment; filename=${asset.label}")
+      RawData(
+        FileUtil.getMimeType(asset.label),
+        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(tagName + "/" + fileId))
+      )
+    }).getOrElse(NotFound())
+  })
+
+  get("/:owner/:repository/releases/:tag/create")(writableUsersOnly { repository =>
+    val tagName = params("tag")
+    repository.tags
+      .find(_.name == tagName)
+      .map { tag =>
+        html.form(repository, tag, None)
+      }
+      .getOrElse(NotFound())
+  })
+
+  post("/:owner/:repository/releases/:tag/create", releaseForm)(writableUsersOnly { (form, repository) =>
+    val tagName = params("tag")
+    val loginAccount = context.loginAccount.get
+
+    // Insert into RELEASE
+    createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
+
+    // Insert into RELEASE_ASSET
+    val files = params.collect {
+      case (name, value) if name.startsWith("file:") =>
+        val Array(_, fileId) = name.split(":")
+        (fileId, value)
+    }
+    files.foreach {
+      case (fileId, fileName) =>
+        val size =
+          new File(
+            getReleaseFilesDir(repository.owner, repository.name),
+            FileUtil.checkFilename(tagName + "/" + fileId)
+          ).length
+        createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+    }
+
+    recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name)
+
+    redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
+  })
+
+  get("/:owner/:repository/releases/:tag/edit")(writableUsersOnly { repository =>
+    val tagName = params("tag")
+
+    (for {
+      release <- getRelease(repository.owner, repository.name, tagName)
+      tag <- repository.tags.find(_.name == tagName)
+    } yield {
+      html.form(repository, tag, Some(release, getReleaseAssets(repository.owner, repository.name, tagName)))
+    }).getOrElse(NotFound())
+  })
+
+  post("/:owner/:repository/releases/:tag/edit", releaseForm)(writableUsersOnly {
+    (form, repository) =>
+      val tagName = params("tag")
+      val loginAccount = context.loginAccount.get
+
+      getRelease(repository.owner, repository.name, tagName)
+        .map { release =>
+          // Update RELEASE
+          updateRelease(repository.owner, repository.name, tagName, form.name, form.content)
+
+          // Delete and Insert RELEASE_ASSET
+          val assets = getReleaseAssets(repository.owner, repository.name, tagName)
+          deleteReleaseAssets(repository.owner, repository.name, tagName)
+
+          val files = params.collect {
+            case (name, value) if name.startsWith("file:") =>
+              val Array(_, fileId) = name.split(":")
+              (fileId, value)
+          }
+          files.foreach {
+            case (fileId, fileName) =>
+              val size =
+                new File(
+                  getReleaseFilesDir(repository.owner, repository.name),
+                  FileUtil.checkFilename(tagName + "/" + fileId)
+                ).length
+              createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+          }
+
+          assets.foreach { asset =>
+            if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
+              val file = new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(release.tag + "/" + asset.fileName)
+              )
+              FileUtils.forceDelete(file)
+            }
+          }
+
+          redirect(s"/${release.userName}/${release.repositoryName}/releases/${tagName}")
+        }
+        .getOrElse(NotFound())
+  })
+
+  post("/:owner/:repository/releases/:tag/delete")(writableUsersOnly { repository =>
+    val tagName = params("tag")
+    getRelease(repository.owner, repository.name, tagName).foreach { release =>
+      FileUtils.deleteDirectory(
+        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(release.tag))
+      )
+    }
+    deleteRelease(repository.owner, repository.name, tagName)
+    redirect(s"/${repository.owner}/${repository.name}/releases")
+  })
+
+}

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

@@ -1,7 +1,10 @@
 package gitbucket.core.controller
 
+import java.time.{LocalDateTime, ZoneId, ZoneOffset}
+import java.util.Date
+
 import gitbucket.core.settings.html
-import gitbucket.core.model.{WebHook, RepositoryWebHook}
+import gitbucket.core.model.{RepositoryWebHook, WebHook}
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.util._
@@ -9,7 +12,7 @@ import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import io.github.gitbucket.scalatra.forms._
+import org.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.eclipse.jgit.api.Git
@@ -18,14 +21,26 @@ import org.eclipse.jgit.lib.ObjectId
 import gitbucket.core.model.WebHookContentType
 import gitbucket.core.plugin.PluginRegistry
 
-
+class RepositorySettingsController
-class RepositorySettingsController extends RepositorySettingsControllerBase
+    extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
+    with RepositoryService
-  with OwnerAuthenticator with UsersAuthenticator
+    with AccountService
+    with WebHookService
+    with ProtectedBranchService
+    with CommitStatusService
+    with DeployKeyService
+    with OwnerAuthenticator
+    with UsersAuthenticator
 
 trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
+  self: RepositoryService
-    with OwnerAuthenticator with UsersAuthenticator =>
+    with AccountService
+    with WebHookService
+    with ProtectedBranchService
+    with CommitStatusService
+    with DeployKeyService
+    with OwnerAuthenticator
+    with UsersAuthenticator =>
 
   // for repository options
   case class OptionsForm(
@@ -36,41 +51,51 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     externalIssuesUrl: Option[String],
     wikiOption: String,
     externalWikiUrl: Option[String],
-    allowFork: Boolean
+    allowFork: Boolean,
+    mergeOptions: Seq[String],
+    defaultMergeOption: String
   )
 
   val optionsForm = mapping(
-    "repositoryName"    -> trim(label("Repository Name"    , text(required, maxlength(100), repository, renameRepositoryName))),
+    "repositoryName" -> trim(
-    "description"       -> trim(label("Description"        , optional(text()))),
+      label("Repository Name", text(required, maxlength(100), repository, renameRepositoryName))
-    "isPrivate"         -> trim(label("Repository Type"    , boolean())),
+    ),
-    "issuesOption"      -> trim(label("Issues Option"      , text(required, featureOption))),
+    "description" -> trim(label("Description", optional(text()))),
+    "isPrivate" -> trim(label("Repository Type", boolean())),
+    "issuesOption" -> trim(label("Issues Option", text(required, featureOption))),
     "externalIssuesUrl" -> trim(label("External Issues URL", optional(text(maxlength(200))))),
-    "wikiOption"        -> trim(label("Wiki Option"        , text(required, featureOption))),
+    "wikiOption" -> trim(label("Wiki Option", text(required, featureOption))),
-    "externalWikiUrl"   -> trim(label("External Wiki URL"  , optional(text(maxlength(200))))),
+    "externalWikiUrl" -> trim(label("External Wiki URL", optional(text(maxlength(200))))),
-    "allowFork"         -> trim(label("Allow Forking"      , boolean()))
+    "allowFork" -> trim(label("Allow Forking", boolean())),
-  )(OptionsForm.apply)
+    "mergeOptions" -> mergeOptions,
+    "defaultMergeOption" -> trim(label("Default merge strategy", text(required)))
+  )(OptionsForm.apply).verifying { form =>
+    if (!form.mergeOptions.contains(form.defaultMergeOption)) {
+      Seq("defaultMergeOption" -> s"This merge strategy isn't enabled.")
+    } else Nil
+  }
 
   // for default branch
   case class DefaultBranchForm(defaultBranch: String)
 
   val defaultBranchForm = mapping(
-    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100))))
+    "defaultBranch" -> trim(label("Default Branch", text(required, maxlength(100))))
   )(DefaultBranchForm.apply)
 
-
   // for deploy key
   case class DeployKeyForm(title: String, publicKey: String, allowWrite: Boolean)
 
   val deployKeyForm = mapping(
     "title" -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey"  -> trim2(label("Key" , text(required))), // TODO duplication check in the repository?
+    "publicKey" -> trim2(label("Key", text(required))), // TODO duplication check in the repository?
-    "allowWrite" -> trim(label("Key"  , boolean()))
+    "allowWrite" -> trim(label("Key", boolean()))
   )(DeployKeyForm.apply)
 
   // for web hook url addition
   case class WebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
 
-  def webHookForm(update:Boolean) = mapping(
+  def webHookForm(update: Boolean) =
+    mapping(
       "url" -> trim(label("url", text(required, webHook(update)))),
       "events" -> webhookEvents,
       "ctype" -> label("ctype", text()),
@@ -115,30 +140,35 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       form.externalIssuesUrl,
       form.wikiOption,
       form.externalWikiUrl,
-      form.allowFork
+      form.allowFork,
+      form.mergeOptions,
+      form.defaultMergeOption
     )
     // Change repository name
-    if(repository.name != form.repositoryName){
+    if (repository.name != form.repositoryName) {
       // Update database
       renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
       // Move git repository
-      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+      defining(getRepositoryDir(repository.owner, repository.name)) { dir =>
-        if(dir.isDirectory){
+        if (dir.isDirectory) {
           FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
         }
       }
       // Move wiki repository
-      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+      defining(getWikiRepositoryDir(repository.owner, repository.name)) { dir =>
-        if(dir.isDirectory) {
+        if (dir.isDirectory) {
           FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
         }
       }
       // Move files directory
-      defining(getRepositoryFilesDir(repository.owner, repository.name)){ dir =>
+      defining(getRepositoryFilesDir(repository.owner, repository.name)) { dir =>
-        if(dir.isDirectory) {
+        if (dir.isDirectory) {
           FileUtils.moveDirectory(dir, getRepositoryFilesDir(repository.owner, form.repositoryName))
         }
       }
+      // Delete parent directory
+      FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
+
       // Call hooks
       PluginRegistry().getRepositoryHooks.foreach(_.renamed(repository.owner, repository.name, form.repositoryName))
     }
@@ -154,7 +184,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
 
   /** Update default branch */
   post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) =>
-    if(!repository.branchList.contains(form.defaultBranch)){
+    if (!repository.branchList.contains(form.defaultBranch)) {
       redirect(s"/${repository.owner}/${repository.name}/settings/options")
     } else {
       saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch)
@@ -171,11 +201,15 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository =>
     import gitbucket.core.api._
     val branch = params("branch")
-    if(!repository.branchList.contains(branch)){
+    if (!repository.branchList.contains(branch)) {
       redirect(s"/${repository.owner}/${repository.name}/settings/branches")
     } else {
       val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch))
-      val lastWeeks = getRecentStatuesContexts(repository.owner, repository.name, org.joda.time.LocalDateTime.now.minusWeeks(1).toDate).toSet
+      val lastWeeks = getRecentStatuesContexts(
+        repository.owner,
+        repository.name,
+        Date.from(LocalDateTime.now.minusWeeks(1).toInstant(ZoneOffset.UTC))
+      ).toSet
       val knownContexts = (lastWeeks ++ protection.status.contexts).toSeq.sortBy(identity)
       html.branchprotection(repository, branch, protection, knownContexts, flash.get("info"))
     }
@@ -188,7 +222,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     html.collaborators(
       getCollaborators(repository.owner, repository.name),
       getAccountByUserName(repository.owner).get.isGroupAccount,
-      repository)
+      repository
+    )
   })
 
   post("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
@@ -238,9 +273,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Send the test request to registered web hook URLs.
    */
   ajaxPost("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
-    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h => Array(h.getName, h.getValue) }
+    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h =>
+      Array(h.getName, h.getValue)
+    }
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
         import scala.collection.JavaConverters._
         import scala.concurrent.duration._
         import scala.concurrent._
@@ -254,10 +292,17 @@ trait RepositorySettingsControllerBase extends ControllerBase {
         val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
         val dummyPayload = {
           val ownerAccount = getAccountByUserName(repository.owner).get
-        val commits = if(JGitUtil.isEmpty(git)) List.empty else git.log
+          val commits =
+            if (JGitUtil.isEmpty(git)) List.empty
+            else
+              git.log
                 .add(git.getRepository.resolve(repository.repository.defaultBranch))
                 .setMaxCount(4)
-          .call.iterator.asScala.map(new CommitInfo(_)).toList
+                .call
+                .iterator
+                .asScala
+                .map(new CommitInfo(_))
+                .toList
           val pushedCommit = commits.drop(1)
 
           WebHookPushPayload(
@@ -274,26 +319,44 @@ trait RepositorySettingsControllerBase extends ControllerBase {
 
         val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
 
-      val toErrorMap: PartialFunction[Throwable, Map[String,String]] = {
+        val toErrorMap: PartialFunction[Throwable, Map[String, String]] = {
-        case e: java.net.UnknownHostException => Map("error"-> ("Unknown host " + e.getMessage))
+          case e: java.net.UnknownHostException                  => Map("error" -> ("Unknown host " + e.getMessage))
-        case e: java.lang.IllegalArgumentException => Map("error"-> ("invalid url"))
+          case e: java.lang.IllegalArgumentException             => Map("error" -> ("invalid url"))
-        case e: org.apache.http.client.ClientProtocolException => Map("error"-> ("invalid url"))
+          case e: org.apache.http.client.ClientProtocolException => Map("error" -> ("invalid url"))
-        case NonFatal(e) => Map("error"-> (e.getClass + " "+ e.getMessage))
+          case NonFatal(e)                                       => Map("error" -> (e.getClass + " " + e.getMessage))
         }
 
         contentType = formats("json")
-      org.json4s.jackson.Serialization.write(Map(
+        org.json4s.jackson.Serialization.write(
+          Map(
             "url" -> url,
-        "request" -> Await.result(reqFuture.map(req => Map(
+            "request" -> Await.result(
+              reqFuture
+                .map(
+                  req =>
+                    Map(
                       "headers" -> _headers(req.getAllHeaders),
                       "payload" -> json
-        )).recover(toErrorMap), 20 seconds),
+                  )
-        "response" -> Await.result(resFuture.map(res => Map(
+                )
+                .recover(toErrorMap),
+              20 seconds
+            ),
+            "response" -> Await.result(
+              resFuture
+                .map(
+                  res =>
+                    Map(
                       "status" -> res.getStatusLine(),
                       "body" -> EntityUtils.toString(res.getEntity()),
                       "headers" -> _headers(res.getAllHeaders())
-        )).recover(toErrorMap), 20 seconds)
+                  )
-      ))
+                )
+                .recover(toErrorMap),
+              20 seconds
+            )
+          )
+        )
     }
   })
 
@@ -301,7 +364,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Display the web hook edit page.
    */
   get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
-    getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
+    getWebHook(repository.owner, repository.name, params("url")).map {
+      case (webhook, events) =>
         html.edithook(webhook, events, repository, false)
     } getOrElse NotFound()
   })
@@ -327,36 +391,28 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
     // Change repository owner
-    if(repository.owner != form.newOwner){
+    if (repository.owner != form.newOwner) {
-      LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      LockUtil.lock(s"${repository.owner}/${repository.name}") {
         // Update database
         renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
         // Move git repository
-        defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        defining(getRepositoryDir(repository.owner, repository.name)) { dir =>
-          if(dir.isDirectory){
+          if (dir.isDirectory) {
             FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
           }
         }
         // Move wiki repository
-        defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        defining(getWikiRepositoryDir(repository.owner, repository.name)) { dir =>
-          if(dir.isDirectory) {
+          if (dir.isDirectory) {
             FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
           }
         }
-        // Move lfs directory
+        // Move files directory
-        defining(getLfsDir(repository.owner, repository.name)){ dir =>
+        defining(getRepositoryFilesDir(repository.owner, repository.name)) { dir =>
-          if(dir.isDirectory()) {
+          if (dir.isDirectory) {
-            FileUtils.moveDirectory(dir, getLfsDir(form.newOwner, repository.name))
+            FileUtils.moveDirectory(dir, getRepositoryFilesDir(form.newOwner, repository.name))
           }
         }
-        // Move attached directory
-        defining(getAttachedDir(repository.owner, repository.name)){ dir =>
-          if(dir.isDirectory) {
-            FileUtils.moveDirectory(dir, getAttachedDir(form.newOwner, repository.name))
-          }
-        }
-        // Delete parent directory
-        FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
 
         // Call hooks
         PluginRegistry().getRepositoryHooks.foreach(_.transferred(repository.owner, form.newOwner, repository.name))
@@ -369,16 +425,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Delete the repository.
    */
   post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
-    LockUtil.lock(s"${repository.owner}/${repository.name}"){
+    LockUtil.lock(s"${repository.owner}/${repository.name}") {
       // Delete the repository and related files
       deleteRepository(repository.owner, repository.name)
 
       FileUtils.deleteDirectory(getRepositoryDir(repository.owner, repository.name))
       FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
       FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
-      val lfsDir = getLfsDir(repository.owner, repository.name)
+      FileUtils.deleteDirectory(getRepositoryFilesDir(repository.owner, repository.name))
-      FileUtils.deleteDirectory(lfsDir)
-      FileUtil.deleteDirectoryIfEmpty(lfsDir.getParentFile())
 
       // Call hooks
       PluginRegistry().getRepositoryHooks.foreach(_.deleted(repository.owner, repository.name))
@@ -393,7 +447,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   post("/:owner/:repository/settings/gc")(ownerOnly { repository =>
     LockUtil.lock(s"${repository.owner}/${repository.name}") {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        git.gc()
+        git.gc().call()
       }
     }
     flash += "info" -> "Garbage collection has been executed."
@@ -421,10 +475,10 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    * Provides duplication check for web hook url.
    */
-  private def webHook(needExists: Boolean): Constraint = new Constraint(){
+  private def webHook(needExists: Boolean): Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(getWebHook(params("owner"), params("repository"), value).isDefined != needExists){
+      if (getWebHook(params("owner"), params("repository"), value).isDefined != needExists) {
-        Some(if(needExists){
+        Some(if (needExists) {
           "URL had not been registered yet."
         } else {
           "URL had been registered already."
@@ -434,13 +488,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       }
   }
 
-  private def webhookEvents = new ValueType[Set[WebHook.Event]]{
+  private def webhookEvents = new ValueType[Set[WebHook.Event]] {
-    def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
+    def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
       WebHook.Event.values.flatMap { t =>
         params.get(name + "." + t.name).map(_ => t)
       }.toSet
     }
-    def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+    def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
+      if (convert(name, params, messages).isEmpty) {
         Seq(name -> messages("error.required").format(name))
       } else {
         Nil
@@ -465,11 +520,19 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    * Duplicate check for the rename repository name.
    */
-  private def renameRepositoryName: Constraint = new Constraint(){
+  private def renameRepositoryName: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+    override def validate(
-      params.get("repository").filter(_ != value).flatMap { _ =>
+      name: String,
-        params.get("owner").flatMap { userName =>
+      value: String,
-          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] = {
+      for {
+        repoName <- params.optionValue("repository") if repoName != value
+        userName <- params.optionValue("owner")
+        _ <- getRepositoryNamesOfUser(userName).find(_ == value)
+      } yield {
+        "Repository already exists."
       }
     }
   }
@@ -477,26 +540,50 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   /**
    *
    */
-  private def featureOption: Constraint = new Constraint(){
+  private def featureOption: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+    override def validate(
-      if(Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] =
+      if (Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
   }
 
-
   /**
    * Provides Constraint to validate the repository transfer user.
    */
-  private def transferUser: Constraint = new Constraint(){
+  private def transferUser: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       getAccountByUserName(value) match {
         case None => Some("User does not exist.")
-        case Some(x) => if(x.userName == params("owner")){
+        case Some(x) =>
+          if (x.userName == params("owner")) {
             Some("This is current repository owner.")
           } else {
             params.get("repository").flatMap { repositoryName =>
-            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
+              getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map { _ =>
+                "User already has same repository."
               }
             }
           }
       }
+  }
+
+  private def mergeOptions = new ValueType[Seq[String]] {
+    override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = {
+      params.get("mergeOptions").getOrElse(Nil)
+    }
+    override def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = {
+      val mergeOptions = params.get("mergeOptions").getOrElse(Nil)
+      if (mergeOptions.isEmpty) {
+        Seq("mergeOptions" -> "At least one option must be enabled.")
+      } else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) {
+        Seq("mergeOptions" -> "mergeOptions are invalid.")
+      } else {
+        Nil
+      }
+    }
+  }
+
 }

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

@@ -17,29 +17,56 @@ import gitbucket.core.model.{Account, CommitState, CommitStatus, WebHook}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers
-import io.github.gitbucket.scalatra.forms._
+import org.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.{ArchiveCommand, Git}
 import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
 import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib._
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
+import org.json4s.jackson.Serialization
 import org.scalatra._
 import org.scalatra.i18n.Messages
 
-
+class RepositoryViewerController
-class RepositoryViewerController extends RepositoryViewerControllerBase
+    extends RepositoryViewerControllerBase
-  with RepositoryService with AccountService with ActivityService with IssuesService with WebHookService with CommitsService
+    with RepositoryService
-  with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator with PullRequestService with CommitStatusService
+    with AccountService
-  with WebHookPullRequestService with WebHookPullRequestReviewCommentService with ProtectedBranchService
+    with ActivityService
+    with IssuesService
+    with WebHookService
+    with CommitsService
+    with LabelsService
+    with MilestonesService
+    with PrioritiesService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+    with PullRequestService
+    with CommitStatusService
+    with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
+    with ProtectedBranchService
 
 /**
  * The repository viewer.
  */
 trait RepositoryViewerControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with ActivityService with IssuesService with WebHookService with CommitsService
+  self: RepositoryService
-    with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator with PullRequestService with CommitStatusService
+    with AccountService
-    with WebHookPullRequestService with WebHookPullRequestReviewCommentService with ProtectedBranchService =>
+    with ActivityService
+    with IssuesService
+    with WebHookService
+    with CommitsService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
+    with WritableUsersAuthenticator
+    with PullRequestService
+    with CommitStatusService
+    with WebHookPullRequestService
+    with WebHookPullRequestReviewCommentService
+    with ProtectedBranchService =>
 
   ArchiveCommand.registerFormat("zip", new ZipFormat)
   ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
@@ -76,7 +103,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     oldLineNumber: Option[Int],
     newLineNumber: Option[Int],
     content: String,
-    issueId: Option[Int]
+    issueId: Option[Int],
+    diff: Option[String]
   )
 
   val uploadForm = mapping(
@@ -111,7 +139,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "oldLineNumber" -> trim(label("Old line number", optional(number()))),
     "newLineNumber" -> trim(label("New line number", optional(number()))),
     "content" -> trim(label("Content", text(required))),
-    "issueId"       -> trim(label("Issue Id", optional(number())))
+    "issueId" -> trim(label("Issue Id", optional(number()))),
+    "diff" -> optional(text())
   )(CommentForm.apply)
 
   /**
@@ -121,7 +150,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     contentType = "text/html"
     val filename = params.get("filename")
     filename match {
-      case Some(f) => helpers.renderMarkup(
+      case Some(f) =>
+        helpers.renderMarkup(
           filePath = List(f),
           fileContent = params("content"),
           branch = "master",
@@ -130,7 +160,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           enableRefsLink = params("enableRefsLink").toBoolean,
           enableAnchor = false
         )
-      case None => helpers.markdown(
+      case None =>
+        helpers.markdown(
           markdown = params("content"),
           repository = repository,
           enableWikiLink = params("enableWikiLink").toBoolean,
@@ -147,20 +178,41 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Displays the file list of the repository root and the default branch.
    */
   get("/:owner/:repository") {
+    val owner = params("owner")
+    val repository = params("repository")
+
+    if (RepositoryCreationService.isCreating(owner, repository)) {
+      gitbucket.core.repo.html.creating(owner, repository)
+    } else {
       params.get("go-get") match {
-      case Some("1") => defining(request.paths){ paths =>
+        case Some("1") =>
-        getRepository(paths(0), paths(1)).map(gitbucket.core.html.goget(_))getOrElse NotFound()
+          defining(request.paths) { paths =>
+            getRepository(owner, repository).map(gitbucket.core.html.goget(_)) getOrElse NotFound()
           }
         case _ => referrersOnly(fileList(_))
       }
     }
+  }
+
+  ajaxGet("/:owner/:repository/creating") {
+    val owner = params("owner")
+    val repository = params("repository")
+    contentType = formats("json")
+    val creating = RepositoryCreationService.isCreating(owner, repository)
+    Serialization.write(
+      Map(
+        "creating" -> creating,
+        "error" -> (if (creating) None else RepositoryCreationService.getCreationError(owner, repository))
+      )
+    )
+  }
 
   /**
    * Displays the file list of the specified path and branch.
    */
   get("/:owner/:repository/tree/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
-    if(path.isEmpty){
+    if (path.isEmpty) {
       fileList(repository, id)
     } else {
       fileList(repository, id, path)
@@ -181,17 +233,32 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     def getSummary(statuses: List[CommitStatus]): (CommitState, String) = {
       val stateMap = statuses.groupBy(_.state)
       val state = CommitState.combine(stateMap.keySet)
-      val summary = stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ")
+      val summary = stateMap.map { case (keyState, states) => states.size + " " + keyState.name }.mkString(", ")
       state -> summary
     }
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
+        def getTags(sha: String): List[String] = {
+          JGitUtil.getTagsOnCommit(git, sha)
+        }
+
         JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
           case Right((logs, hasNext)) =>
-          html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
+            html.commits(
-            logs.splitWith{ (commit1, commit2) =>
+              if (path.isEmpty) Nil else path.split("/").toList,
+              branchName,
+              repository,
+              logs.splitWith { (commit1, commit2) =>
                 view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
-            }, page, hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), getStatuses, getSummary)
+              },
+              page,
+              hasNext,
+              hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+              getStatuses,
+              getSummary,
+              getTags
+            )
           case Left(_) => NotFound()
         }
     }
@@ -199,7 +266,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   get("/:owner/:repository/new/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
-    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
+    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
+      .needStatusCheck(context.loginAccount.get.userName)
 
     using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
@@ -218,8 +286,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   get("/:owner/:repository/upload/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
-    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
+    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
-    html.upload(branch, repository, if(path.length == 0) Nil else path.split("/").toList, protectedBranch)
+      .needStatusCheck(context.loginAccount.get.userName)
+    html.upload(branch, repository, if (path.length == 0) Nil else path.split("/").toList, protectedBranch)
   })
 
   post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
@@ -236,19 +305,20 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       message = form.message.getOrElse("Add files via upload")
     )
 
-    if(form.path.length == 0){
+    if (form.path.length == 0) {
       redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
     } else {
       redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
     }
   })
 
-
   get("/:owner/:repository/edit/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
-    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
+    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
+      .needStatusCheck(context.loginAccount.get.userName)
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
 
         getPathObjectId(git, path, revCommit).map { objectId =>
@@ -268,7 +338,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   get("/:owner/:repository/remove/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
 
         getPathObjectId(git, path, revCommit).map { objectId =>
@@ -298,9 +369,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       commit = form.commit
     )
 
-    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+    redirect(
-      if(form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
+      s"/${repository.owner}/${repository.name}/blob/${form.branch}/${if (form.path.length == 0) urlEncode(form.newFileName)
-    }")
+      else s"${form.path}/${urlEncode(form.newFileName)}"}"
+    )
   })
 
   post("/:owner/:repository/update", editorForm)(writableUsersOnly { (form, repository) =>
@@ -320,9 +392,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       commit = form.commit
     )
 
-    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+    redirect(
-      if (form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
+      s"/${repository.owner}/${repository.name}/blob/${urlEncode(form.branch)}/${if (form.path.length == 0) urlEncode(form.newFileName)
-    }")
+      else s"${form.path}/${urlEncode(form.newFileName)}"}"
+    )
   })
 
   post("/:owner/:repository/remove", deleteForm)(writableUsersOnly { (form, repository) =>
@@ -338,12 +411,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       commit = form.commit
     )
 
-    redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}${if(form.path.length == 0) "" else form.path}")
+    redirect(
+      s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) "" else form.path}"
+    )
   })
 
   get("/:owner/:repository/raw/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
 
       getPathObjectId(git, path, revCommit).map { objectId =>
@@ -358,10 +433,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   val blobRoute = get("/:owner/:repository/blob/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
     val raw = params.get("raw").getOrElse("false").toBoolean
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-      getPathObjectId(git, path, revCommit).map { objectId =>
+        getPathObjectId(git, path, revCommit).map {
-        if(raw){
+          objectId =>
+            if (raw) {
               // Download (This route is left for backword compatibility)
               responseRawFile(git, objectId, path, repository)
             } else {
@@ -381,16 +458,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   private def isLfsFile(git: Git, objectId: ObjectId): Boolean = {
-    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+    JGitUtil.getObjectLoaderFromId(git, objectId)(JGitUtil.isLfsPointer).getOrElse(false)
-      if(loader.isLarge){
-        false
-      } else {
-        new String(loader.getCachedBytes, "UTF-8").startsWith("version https://git-lfs.github.com/spec/v1")
-      }
-    }.getOrElse(false)
   }
 
-  get("/:owner/:repository/blame/*"){
+  get("/:owner/:repository/blame/*") {
     blobRoute.action()
   }
 
@@ -400,14 +471,17 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ajaxGet("/:owner/:repository/get-blame/*")(referrersOnly { repository =>
     val (id, path) = repository.splitPath(multiParams("splat").head)
     contentType = formats("json")
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
         val last = git.log.add(git.getRepository.resolve(id)).addPath(path).setMaxCount(1).call.iterator.next.name
+        Serialization.write(
           Map(
             "root" -> s"${context.baseUrl}/${repository.owner}/${repository.name}",
             "id" -> id,
             "path" -> path,
             "last" -> last,
-        "blame" -> JGitUtil.getBlame(git, id, path).map{ blame =>
+            "blame" -> JGitUtil.getBlame(git, id, path).map {
+              blame =>
                 Map(
                   "id" -> blame.id,
                   "author" -> view.helpers.user(blame.authorName, blame.authorEmailAddress).toString,
@@ -417,8 +491,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                   "prevPath" -> blame.prevPath,
                   "commited" -> blame.commitTime.getTime,
                   "message" -> blame.message,
-            "lines"    -> blame.lines)
+                  "lines" -> blame.lines
-        })
+                )
+            }
+          )
+        )
     }
   })
 
@@ -429,30 +506,102 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val id = params("id")
 
     try {
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) {
-        defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) { revCommit =>
+        git =>
-          JGitUtil.getDiffs(git, id) match {
+          defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) {
-            case (diffs, oldCommitId) =>
+            revCommit =>
-              html.commit(id, new JGitUtil.CommitInfo(revCommit),
+              val diffs = JGitUtil.getDiffs(git, None, id, true, false)
+              val oldCommitId = JGitUtil.getParentCommitId(git, id)
+
+              html.commit(
+                id,
+                new JGitUtil.CommitInfo(revCommit),
                 JGitUtil.getBranchesOfCommit(git, revCommit.getName),
                 JGitUtil.getTagsOfCommit(git, revCommit.getName),
                 getCommitComments(repository.owner, repository.name, id, true),
-                repository, diffs, oldCommitId, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+                repository,
-          }
+                diffs,
+                oldCommitId,
+                hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+              )
           }
       }
     } catch {
-      case e:MissingObjectException => NotFound()
+      case e: MissingObjectException => NotFound()
+    }
+  })
+
+  get("/:owner/:repository/patch/:id")(referrersOnly { repository =>
+    try {
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        val diff = JGitUtil.getPatch(git, None, params("id"))
+        contentType = formats("txt")
+        diff
+      }
+    } catch {
+      case e: MissingObjectException => NotFound()
+    }
+  })
+
+  get("/:owner/:repository/patch/*...*")(referrersOnly { repository =>
+    try {
+      val Seq(fromId, toId) = multiParams("splat")
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        val diff = JGitUtil.getPatch(git, Some(fromId), toId)
+        contentType = formats("txt")
+        diff
+      }
+    } catch {
+      case e: MissingObjectException => NotFound()
     }
   })
 
   post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
     val id = params("id")
-    createCommitComment(repository.owner, repository.name, id, context.loginAccount.get.userName, form.content,
+    createCommitComment(
-      form.fileName, form.oldLineNumber, form.newLineNumber, form.issueId)
+      repository.owner,
+      repository.name,
+      id,
+      context.loginAccount.get.userName,
+      form.content,
+      form.fileName,
+      form.oldLineNumber,
+      form.newLineNumber,
+      form.issueId
+    )
+
+    for {
+      fileName <- form.fileName
+      diff <- form.diff
+    } {
+      saveCommitCommentDiff(
+        repository.owner,
+        repository.name,
+        id,
+        fileName,
+        form.oldLineNumber,
+        form.newLineNumber,
+        diff
+      )
+    }
+
     form.issueId match {
-      case Some(issueId) => recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content)
+      case Some(issueId) =>
-      case None => recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content)
+        recordCommentPullRequestActivity(
+          repository.owner,
+          repository.name,
+          context.loginAccount.get.userName,
+          issueId,
+          form.content
+        )
+      case None =>
+        recordCommentCommitActivity(
+          repository.owner,
+          repository.name,
+          context.loginAccount.get.userName,
+          id,
+          form.content
+        )
     }
     redirect(s"/${repository.owner}/${repository.name}/commit/${id}")
   })
@@ -465,7 +614,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val issueId = params.get("issueId") map (_.toInt)
     html.commentform(
       commitId = id,
-      fileName, oldLineNumber, newLineNumber, issueId,
+      fileName,
+      oldLineNumber,
+      newLineNumber,
+      issueId,
       hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
       repository = repository
     )
@@ -473,21 +625,73 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   ajaxPost("/:owner/:repository/commit/:id/comment/_data/new", commentForm)(readableUsersOnly { (form, repository) =>
     val id = params("id")
-    val commentId = createCommitComment(repository.owner, repository.name, id, context.loginAccount.get.userName,
+    val commentId = createCommitComment(
-      form.content, form.fileName, form.oldLineNumber, form.newLineNumber, form.issueId)
+      repository.owner,
+      repository.name,
+      id,
+      context.loginAccount.get.userName,
+      form.content,
+      form.fileName,
+      form.oldLineNumber,
+      form.newLineNumber,
+      form.issueId
+    )
+
+    for {
+      fileName <- form.fileName
+      diff <- form.diff
+    } {
+      saveCommitCommentDiff(
+        repository.owner,
+        repository.name,
+        id,
+        fileName,
+        form.oldLineNumber,
+        form.newLineNumber,
+        diff
+      )
+    }
+
     val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
     form.issueId match {
       case Some(issueId) =>
-        recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content)
+        getPullRequest(repository.owner, repository.name, issueId).foreach {
-        callPullRequestReviewCommentWebHook("create", comment, repository, issueId, context.baseUrl, context.loginAccount.get)
+          case (issue, pullRequest) =>
-      case None => recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content)
+            recordCommentPullRequestActivity(
+              repository.owner,
+              repository.name,
+              context.loginAccount.get.userName,
+              issueId,
+              form.content
+            )
+            PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId, form.content, issue, repository))
+            callPullRequestReviewCommentWebHook(
+              "create",
+              comment,
+              repository,
+              issue,
+              pullRequest,
+              context.baseUrl,
+              context.loginAccount.get
+            )
         }
-    helper.html.commitcomment(comment, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
+      case None =>
+        recordCommentCommitActivity(
+          repository.owner,
+          repository.name,
+          context.loginAccount.get.userName,
+          id,
+          form.content
+        )
+    }
+    helper.html
+      .commitcomment(comment, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
   })
 
   ajaxGet("/:owner/:repository/commit_comments/_data/:id")(readableUsersOnly { repository =>
-    getCommitComment(repository.owner, repository.name, params("id")) map { x =>
+    getCommitComment(repository.owner, repository.name, params("id")) map {
-      if(isEditable(x.userName, x.repositoryName, x.commentedUserName)){
+      x =>
+        if (isEditable(x.userName, x.repositoryName, x.commentedUserName)) {
           params.get("dataType") collect {
             case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
           } getOrElse {
@@ -503,16 +707,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                   enableLineBreaks = true,
                   hasWritePermission = true
                 )
-            ))
+              )
+            )
           }
         } else Unauthorized()
     } getOrElse NotFound()
   })
 
   ajaxPost("/:owner/:repository/commit_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
         getCommitComment(owner, name, params("id")).map { comment =>
-        if(isEditable(owner, name, comment.commentedUserName)){
+          if (isEditable(owner, name, comment.commentedUserName)) {
             updateCommitComment(comment.commentId, form.content)
             redirect(s"/${owner}/${name}/commit_comments/_data/${comment.commentId}")
           } else Unauthorized()
@@ -521,9 +727,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/commit_comments/delete/:id")(readableUsersOnly { repository =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
+    defining(repository.owner, repository.name) {
+      case (owner, name) =>
         getCommitComment(owner, name, params("id")).map { comment =>
-        if(isEditable(owner, name, comment.commentedUserName)){
+          if (isEditable(owner, name, comment.commentedUserName)) {
             Ok(deleteCommitComment(comment.commentId))
           } else Unauthorized()
         } getOrElse NotFound()
@@ -535,14 +742,28 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/branches")(referrersOnly { repository =>
     val protectedBranches = getProtectedBranchList(repository.owner, repository.name).toSet
-    val branches = JGitUtil.getBranches(
+    val branches = JGitUtil
+      .getBranches(
         owner = repository.owner,
         name = repository.name,
         defaultBranch = repository.repository.defaultBranch,
         origin = repository.repository.originUserName.isEmpty
       )
       .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
-    .map(br => (br, getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId), protectedBranches.contains(br.name)))
+      .map(
+        br =>
+          (
+            br,
+            getPullRequestByRequestCommit(
+              repository.owner,
+              repository.name,
+              repository.repository.defaultBranch,
+              br.name,
+              br.commitId
+            ),
+            protectedBranches.contains(br.name)
+        )
+      )
       .reverse
 
     html.branches(branches, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
@@ -554,12 +775,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   post("/:owner/:repository/branches")(writableUsersOnly { repository =>
     val newBranchName = params.getOrElse("new", halt(400))
     val fromBranchName = params.getOrElse("from", halt(400))
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.createBranch(git, fromBranchName, newBranchName)
     } match {
       case Right(message) =>
         flash += "info" -> message
-        redirect(s"/${repository.owner}/${repository.name}/tree/${StringUtil.urlEncode(newBranchName).replace("%2F", "/")}")
+        redirect(
+          s"/${repository.owner}/${repository.name}/tree/${StringUtil.urlEncode(newBranchName).replace("%2F", "/")}"
+        )
       case Left(message) =>
         flash += "error" -> message
         redirect(s"/${repository.owner}/${repository.name}/tree/${fromBranchName}")
@@ -572,8 +795,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository/delete/*")(writableUsersOnly { repository =>
     val branchName = multiParams("splat").head
     val userName = context.loginAccount.get.userName
-    if(repository.repository.defaultBranch != branchName){
+    if (repository.repository.defaultBranch != branchName) {
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         git.branchDelete().setForce(true).setBranchNames(branchName).call()
         recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
       }
@@ -584,8 +807,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   /**
    * Displays tags.
    */
-  get("/:owner/:repository/tags")(referrersOnly {
+  get("/:owner/:repository/tags")(referrersOnly { repository =>
-    html.tags(_)
+    redirect(s"${repository.owner}/${repository.name}/releases")
   })
 
   /**
@@ -602,19 +825,24 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/network/members")(referrersOnly { repository =>
-    if(repository.repository.options.allowFork) {
+    if (repository.repository.options.allowFork) {
       html.forked(
         getRepository(
           repository.repository.originUserName.getOrElse(repository.owner),
-          repository.repository.originRepositoryName.getOrElse(repository.name)),
+          repository.repository.originRepositoryName.getOrElse(repository.name)
+        ),
         getForkedRepositories(
           repository.repository.originUserName.getOrElse(repository.owner),
-          repository.repository.originRepositoryName.getOrElse(repository.name)),
+          repository.repository.originRepositoryName.getOrElse(repository.name)
+        ).map { repository =>
+          (repository.userName, repository.repositoryName)
+        },
         context.loginAccount match {
           case None                     => List()
           case account: Option[Account] => getGroupsByUserName(account.get.userName)
         }, // groups of current user
-        repository)
+        repository
+      )
     } else BadRequest()
   })
 
@@ -622,9 +850,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Displays the file find of branch.
    */
   get("/:owner/:repository/find/*")(referrersOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val ref = multiParams("splat").head
-      JGitUtil.getTreeId(git, ref).map{ treeId =>
+      JGitUtil.getTreeId(git, ref).map { treeId =>
         html.find(ref, treeId, repository)
       } getOrElse NotFound()
     }
@@ -634,73 +862,97 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Get all file list of branch.
    */
   ajaxGet("/:owner/:repository/tree-list/:tree")(referrersOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val treeId = params("tree")
       contentType = formats("json")
       Map("paths" -> JGitUtil.getAllFileListByTreeId(git, treeId))
     }
   })
 
-  case class UploadFiles(branch: String, path: String, fileIds: Map[String,String], message: String) {
+  case class UploadFiles(branch: String, path: String, fileIds: Map[String, String], message: String) {
     lazy val isValid: Boolean = fileIds.nonEmpty
   }
 
   case class CommitFile(id: String, name: String)
 
-  private def commitFiles(repository: RepositoryService.RepositoryInfo,
+  private def commitFiles(
+    repository: RepositoryService.RepositoryInfo,
     files: Seq[CommitFile],
-                          branch: String, path: String, message: String) = {
+    branch: String,
+    path: String,
+    message: String
+  ) = {
     // prepend path to the filename
     val newFiles = files.map { file =>
-      file.copy(name = if(path.length == 0) file.name else s"${path}/${file.name}")
+      file.copy(name = if (path.length == 0) file.name else s"${path}/${file.name}")
     }
 
-    _commitFile(repository, branch, message) { case (git, headTip, builder, inserter) =>
+    _commitFile(repository, branch, message) {
+      case (git, headTip, builder, inserter) =>
         JGitUtil.processTree(git, headTip) { (path, tree) =>
-        if(!newFiles.exists(_.name.contains(path))) {
+          if (!newFiles.exists(_.name.contains(path))) {
             builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
           }
         }
 
         newFiles.foreach { file =>
-        val bytes = FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), file.id))
+          val bytes =
-        builder.add(JGitUtil.createDirCacheEntry(file.name,
+            FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(file.id)))
-          FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
+          builder.add(
+            JGitUtil.createDirCacheEntry(file.name, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes))
+          )
           builder.finish()
         }
     }
   }
 
-  private def commitFile(repository: RepositoryService.RepositoryInfo,
+  private def commitFile(
-    branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
+    repository: RepositoryService.RepositoryInfo,
-    content: String, charset: String, message: String, commit: String) = {
+    branch: String,
+    path: String,
+    newFileName: Option[String],
+    oldFileName: Option[String],
+    content: String,
+    charset: String,
+    message: String,
+    commit: String
+  ) = {
 
-    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
+    val newPath = newFileName.map { newFileName =>
-    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
+      if (path.length == 0) newFileName else s"${path}/${newFileName}"
+    }
+    val oldPath = oldFileName.map { oldFileName =>
+      if (path.length == 0) oldFileName else s"${path}/${oldFileName}"
+    }
 
-    _commitFile(repository, branch, message){ case (git, headTip, builder, inserter) =>
+    _commitFile(repository, branch, message) {
-      if(headTip.getName == commit){
+      case (git, headTip, builder, inserter) =>
-        val permission = JGitUtil.processTree(git, headTip) { (path, tree) =>
+        if (headTip.getName == commit) {
+          val permission = JGitUtil
+            .processTree(git, headTip) { (path, tree) =>
               // Add all entries except the editing file
               if (!newPath.contains(path) && !oldPath.contains(path)) {
                 builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
               }
               // Retrieve permission if file exists to keep it
               oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
-        }.flatten.headOption
+            }
+            .flatten
+            .headOption
 
           newPath.foreach { newPath =>
-          builder.add(JGitUtil.createDirCacheEntry(newPath,
+            builder.add(JGitUtil.createDirCacheEntry(newPath, permission.map { bits =>
-            permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
+              FileMode.fromBits(bits)
-            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
+            } getOrElse FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
           }
           builder.finish()
         }
     }
   }
 
-  private def _commitFile(repository: RepositoryService.RepositoryInfo,
+  private def _commitFile(repository: RepositoryService.RepositoryInfo, branch: String, message: String)(
-    branch: String, message: String)(f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit) = {
+    f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit
+  ) = {
 
     LockUtil.lock(s"${repository.owner}/${repository.name}") {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
@@ -712,12 +964,38 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
         f(git, headTip, builder, inserter)
 
-        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+        val commitId = JGitUtil.createNewCommit(
-          headName, loginAccount.userName, loginAccount.mailAddress, message)
+          git,
+          inserter,
+          headTip,
+          builder.getDirCache.writeTree(inserter),
+          headName,
+          loginAccount.fullName,
+          loginAccount.mailAddress,
+          message
+        )
 
         inserter.flush()
         inserter.close()
 
+        val receivePack = new ReceivePack(git.getRepository)
+        val receiveCommand = new ReceiveCommand(headTip, commitId, headName)
+
+        // call post commit hook
+        val error = PluginRegistry().getReceiveHooks.flatMap { hook =>
+          hook.preReceive(repository.owner, repository.name, receivePack, receiveCommand, loginAccount.userName)
+        }.headOption
+
+        error match {
+          case Some(error) =>
+            // commit is rejected
+            // TODO Notify commit failure to edited user
+            val refUpdate = git.getRepository.updateRef(headName)
+            refUpdate.setNewObjectId(headTip)
+            refUpdate.setForceUpdate(true)
+            refUpdate.update()
+
+          case None =>
             // update refs
             val refUpdate = git.getRepository.updateRef(headName)
             refUpdate.setNewObjectId(commitId)
@@ -736,15 +1014,31 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             createIssueComment(repository.owner, repository.name, commitInfo)
 
             // close issue by commit message
+            if (branch == repository.repository.defaultBranch) {
               closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+            }
+
+            // call post commit hook
+            PluginRegistry().getReceiveHooks.foreach { hook =>
+              hook.postReceive(repository.owner, repository.name, receivePack, receiveCommand, loginAccount.userName)
+            }
 
             //call web hook
             callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
             val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
             callWebHookOf(repository.owner, repository.name, WebHook.Push) {
-          getAccountByUserName(repository.owner).map{ ownerAccount =>
+              getAccountByUserName(repository.owner).map { ownerAccount =>
-            WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
+                WebHookPushPayload(
-              oldId = headTip, newId = commitId)
+                  git,
+                  loginAccount,
+                  headName,
+                  repository,
+                  List(commit),
+                  ownerAccount,
+                  oldId = headTip,
+                  newId = commitId
+                )
+              }
             }
         }
       }
@@ -764,34 +1058,48 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * @return HTML of the file list
    */
   private def fileList(repository: RepositoryService.RepositoryInfo, revstr: String = "", path: String = ".") = {
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      if(JGitUtil.isEmpty(git)){
+      if (JGitUtil.isEmpty(git)) {
         html.guide(repository, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
       } else {
         // get specified commit
-        JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
+        JGitUtil.getDefaultBranch(git, repository, revstr).map {
+          case (objectId, revision) =>
             defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
-            val lastModifiedCommit = if(path == ".") revCommit else JGitUtil.getLastModifiedCommit(git, revCommit, path)
+              val lastModifiedCommit =
+                if (path == ".") revCommit else JGitUtil.getLastModifiedCommit(git, revCommit, path)
               // get files
-            val files = JGitUtil.getFileList(git, revision, path)
+              val files = JGitUtil.getFileList(git, revision, path, context.settings.baseUrl)
               val parentPath = if (path == ".") Nil else path.split("/").toList
               // process README.md or README.markdown
-            val readme = files.find { file =>
+              val readme = files
+                .find { file =>
                   !file.isDirectory && readmeFiles.contains(file.name.toLowerCase)
-            }.map { file =>
+                }
+                .map { file =>
                   val path = (file.name :: parentPath.reverse).reverse
-              path -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
+                  path -> StringUtil.convertFromByteArray(
-                Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
+                    JGitUtil
+                      .getContentFromId(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true)
+                      .get
+                  )
                 }
 
-            html.files(revision, repository,
+              html.files(
-              if(path == ".") Nil else path.split("/").toList, // current path
+                revision,
+                repository,
+                if (path == ".") Nil else path.split("/").toList, // current path
                 new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
                 JGitUtil.getCommitCount(repository.owner, repository.name, lastModifiedCommit.getName),
                 files,
                 readme,
                 hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-              getPullRequestFromBranch(repository.owner, repository.name, revstr, repository.repository.defaultBranch),
+                getPullRequestFromBranch(
+                  repository.owner,
+                  repository.name,
+                  revstr,
+                  repository.repository.defaultBranch
+                ),
                 flash.get("info"),
                 flash.get("error")
               )
@@ -804,11 +1112,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = {
     val revision = name.stripSuffix(suffix)
 
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val oid = git.getRepository.resolve(revision)
       val revCommit = JGitUtil.getRevCommitFromId(git, oid)
       val sha1 = oid.getName()
-      val repositorySuffix = (if(sha1.startsWith(revision)) sha1 else revision).replace('/','-')
+      val repositorySuffix = (if (sha1.startsWith(revision)) sha1 else revision).replace('/', '-')
       val filename = repository.name + "-" + repositorySuffix + suffix
 
       contentType = "application/octet-stream"
@@ -827,7 +1135,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 
-  private def conflict: Constraint = new Constraint(){
+  private def conflict: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       val owner = params("owner")
       val repository = params("repository")
@@ -837,7 +1145,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         using(Git.open(getRepositoryDir(owner, repository))) { git =>
           val headName = s"refs/heads/${branch}"
           val headTip = git.getRepository.resolve(headName)
-          if(headTip.getName != value){
+          if (headTip.getName != value) {
             Some("Someone pushed new commits before you. Please reload this page and re-apply your changes.")
           } else {
             None
@@ -847,7 +1155,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
 
-  override protected def renderUncaughtException(e: Throwable)(implicit request: HttpServletRequest, response: HttpServletResponse): Unit = {
+  override protected def renderUncaughtException(
+    e: Throwable
+  )(implicit request: HttpServletRequest, response: HttpServletResponse): Unit = {
     e.printStackTrace()
   }
 

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

@@ -2,26 +2,35 @@ package gitbucket.core.controller
 
 import java.io.FileInputStream
 
-import gitbucket.core.admin.html
-import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
-import gitbucket.core.util.{AdminAuthenticator, Mailer}
-import gitbucket.core.ssh.SshServer
-import gitbucket.core.plugin.{PluginInfoBase, PluginRegistry, PluginRepository}
-import SystemSettingsService._
-import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.Directory._
-import gitbucket.core.util.StringUtil._
-import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.io.{FileUtils, IOUtils}
-import org.scalatra.i18n.Messages
 import com.github.zafarkhaja.semver.{Version => Semver}
 import gitbucket.core.GitBucketCoreModule
+import gitbucket.core.admin.html
+import gitbucket.core.plugin.{PluginInfoBase, PluginRegistry, PluginRepository}
+import gitbucket.core.service.SystemSettingsService._
+import gitbucket.core.service.{AccountService, RepositoryService}
+import gitbucket.core.ssh.SshServer
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.StringUtil._
+import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.{AdminAuthenticator, Mailer}
+import org.apache.commons.io.IOUtils
+import org.json4s.jackson.Serialization
+import org.scalatra._
+import org.scalatra.forms._
+import org.scalatra.i18n.Messages
+
 import scala.collection.JavaConverters._
+import scala.collection.mutable.ListBuffer
 
+class SystemSettingsController
+    extends SystemSettingsControllerBase
+    with AccountService
+    with RepositoryService
+    with AdminAuthenticator
 
-class SystemSettingsController extends SystemSettingsControllerBase
+case class Table(name: String, columns: Seq[Column])
-  with AccountService with RepositoryService with AdminAuthenticator
+case class Column(name: String, primaryKey: Boolean)
 
 trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with AdminAuthenticator =>
@@ -39,7 +48,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     "sshHost" -> trim(label("SSH host", optional(text()))),
     "sshPort" -> trim(label("SSH port", optional(number()))),
     "useSMTP" -> trim(label("SMTP", boolean())),
-    "smtp"                     -> optionalIfNotChecked("useSMTP", mapping(
+    "smtp" -> optionalIfNotChecked(
+      "useSMTP",
+      mapping(
         "host" -> trim(label("SMTP Host", text(required))),
         "port" -> trim(label("SMTP Port", optional(number()))),
         "user" -> trim(label("SMTP User", optional(text()))),
@@ -48,29 +59,43 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         "starttls" -> trim(label("Enable STARTTLS", optional(boolean()))),
         "fromAddress" -> trim(label("FROM Address", optional(text()))),
         "fromName" -> trim(label("FROM Name", optional(text())))
-    )(Smtp.apply)),
+      )(Smtp.apply)
+    ),
     "ldapAuthentication" -> trim(label("LDAP", boolean())),
-    "ldap"                     -> optionalIfNotChecked("ldapAuthentication", mapping(
+    "ldap" -> optionalIfNotChecked(
+      "ldapAuthentication",
+      mapping(
         "host" -> trim(label("LDAP host", text(required))),
         "port" -> trim(label("LDAP port", optional(number()))),
         "bindDN" -> trim(label("Bind DN", optional(text()))),
         "bindPassword" -> trim(label("Bind Password", optional(text()))),
         "baseDN" -> trim(label("Base DN", text(required))),
         "userNameAttribute" -> trim(label("User name attribute", text(required))),
-        "additionalFilterCondition"-> trim(label("Additional filter condition", optional(text()))),
+        "additionalFilterCondition" -> trim(label("Additional filter condition", optional(text()))),
         "fullNameAttribute" -> trim(label("Full name attribute", optional(text()))),
         "mailAttribute" -> trim(label("Mail address attribute", optional(text()))),
         "tls" -> trim(label("Enable TLS", optional(boolean()))),
         "ssl" -> trim(label("Enable SSL", optional(boolean()))),
         "keystore" -> trim(label("Keystore", optional(text())))
-    )(Ldap.apply)),
+      )(Ldap.apply)
+    ),
+    "oidcAuthentication" -> trim(label("OIDC", boolean())),
+    "oidc" -> optionalIfNotChecked(
+      "oidcAuthentication",
+      mapping(
+        "issuer" -> trim(label("Issuer", text(required))),
+        "clientID" -> trim(label("Client ID", text(required))),
+        "clientSecret" -> trim(label("Client secret", text(required))),
+        "jwsAlgorithm" -> trim(label("Signature algorithm", optional(text())))
+      )(OIDC.apply)
+    ),
     "skinName" -> trim(label("AdminLTE skin name", text(required)))
   )(SystemSettings.apply).verifying { settings =>
     Vector(
-      if(settings.ssh && settings.baseUrl.isEmpty){
+      if (settings.ssh && settings.baseUrl.isEmpty) {
         Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
       } else None,
-      if(settings.ssh && settings.sshHost.isEmpty){
+      if (settings.ssh && settings.sshHost.isEmpty) {
         Some("sshHost" -> "SSH host is required if SSH access is enabled.")
       } else None
     ).flatten
@@ -94,66 +119,169 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   case class DataExportForm(tableNames: List[String])
 
-  case class NewUserForm(userName: String, password: String, fullName: String,
+  case class NewUserForm(
-                         mailAddress: String, isAdmin: Boolean,
+    userName: String,
-                         description: Option[String], url: Option[String], fileId: Option[String])
+    password: String,
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    isAdmin: Boolean,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String]
+  )
 
-  case class EditUserForm(userName: String, password: Option[String], fullName: String,
+  case class EditUserForm(
-                          mailAddress: String, isAdmin: Boolean, description: Option[String], url: Option[String],
+    userName: String,
-                          fileId: Option[String], clearImage: Boolean, isRemoved: Boolean)
+    password: Option[String],
+    fullName: String,
+    mailAddress: String,
+    extraMailAddresses: List[String],
+    isAdmin: Boolean,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    clearImage: Boolean,
+    isRemoved: Boolean
+  )
 
-  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
+  case class NewGroupForm(
-                          members: String)
+    groupName: String,
-
+    description: Option[String],
-  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
+    url: Option[String],
-                           members: String, clearImage: Boolean, isRemoved: Boolean)
+    fileId: Option[String],
+    members: String
+  )
 
+  case class EditGroupForm(
+    groupName: String,
+    description: Option[String],
+    url: Option[String],
+    fileId: Option[String],
+    members: String,
+    clearImage: Boolean,
+    isRemoved: Boolean
+  )
 
   val newUserForm = mapping(
-    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "userName" -> trim(label("Username", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     ,text(required, maxlength(20), password))),
+    "password" -> trim(label("Password", text(required, maxlength(20), password))),
-    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
-    "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "extraMailAddresses" -> list(
-    "description" -> trim(label("bio"          ,optional(text()))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
-    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    ),
-    "fileId"      -> trim(label("File ID"      ,optional(text())))
+    "isAdmin" -> trim(label("User Type", boolean())),
+    "description" -> trim(label("bio", optional(text()))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text())))
   )(NewUserForm.apply)
 
   val editUserForm = mapping(
-    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier))),
+    "userName" -> trim(label("Username", text(required, maxlength(100), identifier))),
-    "password"    -> trim(label("Password"     ,optional(text(maxlength(20), password)))),
+    "password" -> trim(label("Password", optional(text(maxlength(20), password)))),
-    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
+    "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "extraMailAddresses" -> list(
-    "description" -> trim(label("bio"          ,optional(text()))),
+      trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName"))))
-    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    ),
-    "fileId"      -> trim(label("File ID"      ,optional(text()))),
+    "isAdmin" -> trim(label("User Type", boolean())),
-    "clearImage"  -> trim(label("Clear image"  ,boolean())),
+    "description" -> trim(label("bio", optional(text()))),
-    "removed"     -> trim(label("Disable"      ,boolean(disableByNotYourself("userName"))))
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
+    "fileId" -> trim(label("File ID", optional(text()))),
+    "clearImage" -> trim(label("Clear image", boolean())),
+    "removed" -> trim(label("Disable", boolean(disableByNotYourself("userName"))))
   )(EditUserForm.apply)
 
   val newGroupForm = mapping(
-    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"    -> trim(label("File ID"    ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"   -> trim(label("Members"    ,text(required, members)))
+    "members" -> trim(label("Members", text(required, members)))
   )(NewGroupForm.apply)
 
   val editGroupForm = mapping(
-    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "groupName" -> trim(label("Group name", text(required, maxlength(100), identifier))),
     "description" -> trim(label("Group description", optional(text()))),
-    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
+    "url" -> trim(label("URL", optional(text(maxlength(200))))),
-    "fileId"     -> trim(label("File ID"     ,optional(text()))),
+    "fileId" -> trim(label("File ID", optional(text()))),
-    "members"    -> trim(label("Members"     ,text(required, members))),
+    "members" -> trim(label("Members", text(required, members))),
-    "clearImage" -> trim(label("Clear image" ,boolean())),
+    "clearImage" -> trim(label("Clear image", boolean())),
-    "removed"    -> trim(label("Disable"     ,boolean()))
+    "removed" -> trim(label("Disable", boolean()))
   )(EditGroupForm.apply)
 
+  get("/admin/dbviewer")(adminOnly {
+    val conn = request2Session(request).conn
+    val meta = conn.getMetaData
+    val tables = ListBuffer[Table]()
+    using(meta.getTables(null, "%", "%", Array("TABLE", "VIEW"))) {
+      rs =>
+        while (rs.next()) {
+          val tableName = rs.getString("TABLE_NAME")
+
+          val pkColumns = ListBuffer[String]()
+          using(meta.getPrimaryKeys(null, null, tableName)) { rs =>
+            while (rs.next()) {
+              pkColumns += rs.getString("COLUMN_NAME").toUpperCase
+            }
+          }
+
+          val columns = ListBuffer[Column]()
+          using(meta.getColumns(null, "%", tableName, "%")) { rs =>
+            while (rs.next()) {
+              val columnName = rs.getString("COLUMN_NAME").toUpperCase
+              columns += Column(columnName, pkColumns.contains(columnName))
+            }
+          }
+
+          tables += Table(tableName.toUpperCase, columns)
+        }
+    }
+    html.dbviewer(tables)
+  })
+
+  post("/admin/dbviewer/_query")(adminOnly {
+    contentType = formats("json")
+    params.get("query").collectFirst {
+      case query if query.trim.nonEmpty =>
+        val trimmedQuery = query.trim
+        if (trimmedQuery.nonEmpty) {
+          try {
+            val conn = request2Session(request).conn
+            using(conn.prepareStatement(query)) {
+              stmt =>
+                if (trimmedQuery.toUpperCase.startsWith("SELECT")) {
+                  using(stmt.executeQuery()) {
+                    rs =>
+                      val meta = rs.getMetaData
+                      val columns = for (i <- 1 to meta.getColumnCount) yield {
+                        meta.getColumnName(i)
+                      }
+                      val result = ListBuffer[Map[String, String]]()
+                      while (rs.next()) {
+                        val row = columns.map { columnName =>
+                          columnName -> Option(rs.getObject(columnName)).map(_.toString).getOrElse("<NULL>")
+                        }.toMap
+                        result += row
+                      }
+                      Ok(Serialization.write(Map("type" -> "query", "columns" -> columns, "rows" -> result)))
+                  }
+                } else {
+                  val rows = stmt.executeUpdate()
+                  Ok(Serialization.write(Map("type" -> "update", "rows" -> rows)))
+                }
+            }
+          } catch {
+            case e: Exception =>
+              Ok(Serialization.write(Map("type" -> "error", "message" -> e.toString)))
+          }
+        }
+    } getOrElse Ok(Serialization.write(Map("type" -> "error", "message" -> "query is empty")))
+  })
 
   get("/admin/system")(adminOnly {
-    html.system(flash.get("info"))
+    html.settings(flash.get("info"))
   })
 
   post("/admin/system", form)(adminOnly { form =>
@@ -164,8 +292,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
       for {
         sshAddress <- form.sshAddress
         baseUrl <- form.baseUrl
-       }
+      } SshServer.start(sshAddress, baseUrl)
-       SshServer.start(sshAddress, baseUrl)
     }
 
     flash += "info" -> "System settings has been updated."
@@ -174,9 +301,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
     try {
-      new Mailer(form.smtp).send(form.testAddress,
+      new Mailer(context.settings.copy(smtp = Some(form.smtp), notification = true)).send(
-        "Test message from GitBucket", context.loginAccount.get,
+        to = form.testAddress,
-        "This is a test message from GitBucket.", None
+        subject = "Test message from GitBucket",
+        textMsg = "This is a test message from GitBucket.",
+        htmlMsg = None,
+        loginAccount = context.loginAccount
       )
 
       "Test mail has been sent to: " + form.testAddress
@@ -193,14 +323,21 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     val gitbucketVersion = Semver.valueOf(GitBucketCoreModule.getVersions.asScala.last.getVersion)
 
     // Plugins in the local repository
-    val repositoryPlugins = PluginRepository.getPlugins()
+    val repositoryPlugins = PluginRepository
+      .getPlugins()
       .filterNot { meta =>
-        enabledPlugins.exists { plugin => plugin.pluginId == meta.id &&
+        enabledPlugins.exists { plugin =>
+          plugin.pluginId == meta.id &&
           Semver.valueOf(plugin.pluginVersion).greaterThanOrEqualTo(Semver.valueOf(meta.latestVersion.version))
         }
-      }.map { meta =>
+      }
-        (meta, meta.versions.reverse.find { version => gitbucketVersion.satisfies(version.range) })
+      .map { meta =>
-      }.collect { case (meta, Some(version)) =>
+        (meta, meta.versions.reverse.find { version =>
+          gitbucketVersion.satisfies(version.range)
+        })
+      }
+      .collect {
+        case (meta, Some(version)) =>
           new PluginInfoBase(
             pluginId = meta.id,
             pluginName = meta.name,
@@ -224,10 +361,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   post("/admin/plugins/:pluginId/:version/_uninstall")(adminOnly {
     val pluginId = params("pluginId")
     val version = params("version")
-    PluginRegistry().getPlugins()
+    PluginRegistry()
+      .getPlugins()
       .collect { case plugin if (plugin.pluginId == pluginId && plugin.pluginVersion == version) => plugin }
       .foreach { _ =>
-        PluginRegistry.uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
+        PluginRegistry
+          .uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
         flash += "info" -> s"${pluginId} was uninstalled."
       }
     redirect("/admin/plugins")
@@ -237,9 +376,11 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     val pluginId = params("pluginId")
     val version = params("version")
     /// TODO!!!!
-    PluginRepository.getPlugins()
+    PluginRepository
-      .collect { case meta if meta.id == pluginId => (meta, meta.versions.find(_.version == version) )}
+      .getPlugins()
-      .foreach { case (meta, version) =>
+      .collect { case meta if meta.id == pluginId => (meta, meta.versions.find(_.version == version)) }
+      .foreach {
+        case (meta, version) =>
           version.foreach { version =>
             // TODO Install version!
             PluginRegistry.install(
@@ -254,40 +395,52 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     redirect("/admin/plugins")
   })
 
-
   get("/admin/users")(adminOnly {
     val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
-    val users          = getAllUsers(includeRemoved)
+    val includeGroups = params.get("includeGroups").map(_.toBoolean).getOrElse(false)
-    val members        = users.collect { case account if(account.isGroupAccount) =>
+    val users = getAllUsers(includeRemoved, includeGroups)
+    val members = users.collect {
+      case account if (account.isGroupAccount) =>
         account.userName -> getGroupMembers(account.userName).map(_.userName)
     }.toMap
 
-    html.userlist(users, members, includeRemoved)
+    html.userlist(users, members, includeRemoved, includeGroups)
   })
 
   get("/admin/users/_newuser")(adminOnly {
-    html.user(None)
+    html.user(None, Nil)
   })
 
   post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
-    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.description, form.url)
+    createAccount(
+      form.userName,
+      sha1(form.password),
+      form.fullName,
+      form.mailAddress,
+      form.isAdmin,
+      form.description,
+      form.url
+    )
     updateImage(form.userName, form.fileId, false)
+    updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != ""))
     redirect("/admin/users")
   })
 
   get("/admin/users/:userName/_edituser")(adminOnly {
     val userName = params("userName")
-    html.user(getAccountByUserName(userName, true), flash.get("error"))
+    val extraMails = getAccountExtraMailAddresses(userName)
+    html.user(getAccountByUserName(userName, true), extraMails, flash.get("error"))
   })
 
   post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName, true).map { account =>
+    getAccountByUserName(userName, true).map {
-      if(account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)){
+      account =>
+        if (account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)) {
           flash += "error" -> "Account can't be turned off because this is last one administrator."
           redirect(s"/admin/users/${userName}/_edituser")
         } else {
-        if(form.isRemoved){
+          if (form.isRemoved) {
             // Remove repositories
             //        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
             //          deleteRepository(userName, repositoryName)
@@ -299,19 +452,23 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
             removeUserRelatedData(userName)
           }
 
-        updateAccount(account.copy(
+          updateAccount(
+            account.copy(
               password = form.password.map(sha1).getOrElse(account.password),
               fullName = form.fullName,
               mailAddress = form.mailAddress,
               isAdmin = form.isAdmin,
               description = form.description,
               url = form.url,
-          isRemoved    = form.isRemoved))
+              isRemoved = form.isRemoved
+            )
+          )
 
           updateImage(userName, form.fileId, form.clearImage)
+          updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != ""))
 
           // call hooks
-        if(form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+          if (form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
 
           redirect("/admin/users")
         }
@@ -324,31 +481,45 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   post("/admin/users/_newgroup", newGroupForm)(adminOnly { form =>
     createGroup(form.groupName, form.description, form.url)
-    updateGroupMembers(form.groupName, form.members.split(",").map {
+    updateGroupMembers(
+      form.groupName,
+      form.members
+        .split(",")
+        .map {
           _.split(":") match {
             case Array(userName, isManager) => (userName, isManager.toBoolean)
           }
-    }.toList)
+        }
+        .toList
+    )
     updateImage(form.groupName, form.fileId, false)
     redirect("/admin/users")
   })
 
   get("/admin/users/:groupName/_editgroup")(adminOnly {
-    defining(params("groupName")){ groupName =>
+    defining(params("groupName")) { groupName =>
       html.usergroup(getAccountByUserName(groupName, true), getGroupMembers(groupName))
     }
   })
 
   post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    defining(params("groupName"), form.members.split(",").map {
+    defining(
+      params("groupName"),
+      form.members
+        .split(",")
+        .map {
           _.split(":") match {
             case Array(userName, isManager) => (userName, isManager.toBoolean)
           }
-    }.toList){ case (groupName, members) =>
+        }
-      getAccountByUserName(groupName, true).map { account =>
+        .toList
+    ) {
+      case (groupName, members) =>
+        getAccountByUserName(groupName, true).map {
+          account =>
             updateGroup(groupName, form.description, form.url, form.isRemoved)
 
-        if(form.isRemoved){
+            if (form.isRemoved) {
               // Remove from GROUP_MEMBER
               updateGroupMembers(form.groupName, Nil)
 //          // Remove repositories
@@ -391,25 +562,26 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     response.setHeader("Content-Disposition", "attachment; filename=" + file.getName)
     response.setContentLength(file.length.toInt)
 
-    using(new FileInputStream(file)){ in =>
+    using(new FileInputStream(file)) { in =>
       IOUtils.copy(in, response.outputStream)
     }
 
     ()
   })
 
-  private def members: Constraint = new Constraint(){
+  private def members: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      if(value.split(",").exists {
+      if (value.split(",").exists {
             _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
-      }) None else Some("Must select one manager at least.")
+          }) None
+      else Some("Must select one manager at least.")
     }
   }
 
   protected def disableByNotYourself(paramName: String): Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       params.get(paramName).flatMap { userName =>
-        if(userName == context.loginAccount.get.userName && params.get("removed") == Some("true"))
+        if (userName == context.loginAccount.get.userName && params.get("removed") == Some("true"))
           Some("You can't disable your account yourself")
         else
           None

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

@@ -0,0 +1,92 @@
+package gitbucket.core.controller
+
+import org.json4s.{JField, JObject, JString}
+import org.scalatra._
+import org.scalatra.json._
+import org.scalatra.forms._
+import org.scalatra.i18n.I18nSupport
+import org.scalatra.servlet.ServletBase
+
+/**
+ * Extends scalatra-forms to support the client-side validation and Ajax requests as well.
+ */
+trait ValidationSupport extends FormSupport { self: ServletBase with JacksonJsonSupport with I18nSupport =>
+
+  def get[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    registerValidate(path, form)
+    get(path) {
+      validate(form)(errors => BadRequest(), form => action(form))
+    }
+  }
+
+  def post[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    registerValidate(path, form)
+    post(path) {
+      validate(form)(errors => BadRequest(), form => action(form))
+    }
+  }
+
+  def put[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    registerValidate(path, form)
+    put(path) {
+      validate(form)(errors => BadRequest(), form => action(form))
+    }
+  }
+
+  def delete[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    registerValidate(path, form)
+    delete(path) {
+      validate(form)(errors => BadRequest(), form => action(form))
+    }
+  }
+
+  def ajaxGet[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    get(path) {
+      validate(form)(errors => ajaxError(errors), form => action(form))
+    }
+  }
+
+  def ajaxPost[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    post(path) {
+      validate(form)(errors => ajaxError(errors), form => action(form))
+    }
+  }
+
+  def ajaxDelete[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    delete(path) {
+      validate(form)(errors => ajaxError(errors), form => action(form))
+    }
+  }
+
+  def ajaxPut[T](path: String, form: ValueType[T])(action: T => Any): Route = {
+    put(path) {
+      validate(form)(errors => ajaxError(errors), form => action(form))
+    }
+  }
+
+  private def registerValidate[T](path: String, form: ValueType[T]) = {
+    post(path.replaceFirst("/$", "") + "/validate") {
+      contentType = "application/json"
+      toJson(form.validate("", multiParams, messages))
+    }
+  }
+
+  /**
+   * Responds errors for ajax requests.
+   */
+  private def ajaxError(errors: Seq[(String, String)]): JObject = {
+    status = 400
+    contentType = "application/json"
+    toJson(errors)
+  }
+
+  /**
+   * Converts errors to JSON.
+   */
+  private def toJson(errors: Seq[(String, String)]): JObject =
+    JObject(errors.map {
+      case (key, value) =>
+        JField(key, JString(value))
+    }.toList)
+
+}

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

@@ -10,42 +10,64 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import io.github.gitbucket.scalatra.forms._
+import org.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
 
-class WikiController extends WikiControllerBase
+class WikiController
-  with WikiService with RepositoryService with AccountService with ActivityService with WebHookService
+    extends WikiControllerBase
-  with ReadableUsersAuthenticator with ReferrerAuthenticator
+    with WikiService
+    with RepositoryService
+    with AccountService
+    with ActivityService
+    with WebHookService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with AccountService with ActivityService with WebHookService
+  self: WikiService
-    with ReadableUsersAuthenticator with ReferrerAuthenticator =>
+    with RepositoryService
+    with AccountService
+    with ActivityService
+    with WebHookService
+    with ReadableUsersAuthenticator
+    with ReferrerAuthenticator =>
 
-  case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
+  case class WikiPageEditForm(
+    pageName: String,
+    content: String,
+    message: Option[String],
+    currentPageName: String,
+    id: String
+  )
 
   val newForm = mapping(
-    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename, unique))),
+    "pageName" -> trim(label("Page name", text(required, maxlength(40), pagename, unique))),
-    "content"         -> trim(label("Content"           , text(required, conflictForNew))),
+    "content" -> trim(label("Content", text(required, conflictForNew))),
-    "message"         -> trim(label("Message"           , optional(text()))),
+    "message" -> trim(label("Message", optional(text()))),
-    "currentPageName" -> trim(label("Current page name" , text())),
+    "currentPageName" -> trim(label("Current page name", text())),
-    "id"              -> trim(label("Latest commit id"  , text()))
+    "id" -> trim(label("Latest commit id", text()))
   )(WikiPageEditForm.apply)
 
   val editForm = mapping(
-    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename))),
+    "pageName" -> trim(label("Page name", text(required, maxlength(40), pagename))),
-    "content"         -> trim(label("Content"           , text(required, conflictForEdit))),
+    "content" -> trim(label("Content", text(required, conflictForEdit))),
-    "message"         -> trim(label("Message"           , optional(text()))),
+    "message" -> trim(label("Message", optional(text()))),
-    "currentPageName" -> trim(label("Current page name" , text(required))),
+    "currentPageName" -> trim(label("Current page name", text(required))),
-    "id"              -> trim(label("Latest commit id"  , text(required)))
+    "id" -> trim(label("Latest commit id", text(required)))
   )(WikiPageEditForm.apply)
 
   get("/:owner/:repository/wiki")(referrersOnly { repository =>
     getWikiPage(repository.owner, repository.name, "Home").map { page =>
-      html.page("Home", page, getWikiPageList(repository.owner, repository.name),
+      html.page(
-        repository, isEditable(repository),
+        "Home",
+        page,
+        getWikiPageList(repository.owner, repository.name),
+        repository,
+        isEditable(repository),
         getWikiPage(repository.owner, repository.name, "_Sidebar"),
-        getWikiPage(repository.owner, repository.name, "_Footer"))
+        getWikiPage(repository.owner, repository.name, "_Footer")
+      )
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
   })
 
@@ -53,17 +75,22 @@ trait WikiControllerBase extends ControllerBase {
     val pageName = StringUtil.urlDecode(params("page"))
 
     getWikiPage(repository.owner, repository.name, pageName).map { page =>
-      html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
+      html.page(
-        repository, isEditable(repository),
+        pageName,
+        page,
+        getWikiPageList(repository.owner, repository.name),
+        repository,
+        isEditable(repository),
         getWikiPage(repository.owner, repository.name, "_Sidebar"),
-        getWikiPage(repository.owner, repository.name, "_Footer"))
+        getWikiPage(repository.owner, repository.name, "_Footer")
+      )
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
   })
 
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
         case Right((logs, hasNext)) => html.history(Some(pageName), logs, repository, isEditable(repository))
         case Left(_)                => NotFound()
@@ -75,41 +102,57 @@ trait WikiControllerBase extends ControllerBase {
     val pageName = StringUtil.urlDecode(params("page"))
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
-      html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).filter(_.newPath == pageName + ".md"), repository,
+      html.compare(
-        isEditable(repository), flash.get("info"))
+        Some(pageName),
+        from,
+        to,
+        JGitUtil.getDiffs(git, Some(from), to, true, false).filter(_.newPath == pageName + ".md"),
+        repository,
+        isEditable(repository),
+        flash.get("info")
+      )
     }
   })
 
   get("/:owner/:repository/wiki/_compare/:commitId")(referrersOnly { repository =>
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
-      html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
+      html.compare(
-        isEditable(repository), flash.get("info"))
+        None,
+        from,
+        to,
+        JGitUtil.getDiffs(git, Some(from), to, true, false),
+        repository,
+        isEditable(repository),
+        flash.get("info")
+      )
     }
   })
 
   get("/:owner/:repository/wiki/:page/_revert/:commitId")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val pageName = StringUtil.urlDecode(params("page"))
       val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-      if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))){
+      if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))) {
         redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
       } else {
         flash += "info" -> "This patch was not able to be reversed."
-        redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}")
+        redirect(
+          s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
+        )
       }
     } else Unauthorized()
   })
 
   get("/:owner/:repository/wiki/_revert/:commitId")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-      if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)){
+      if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)) {
-        redirect(s"/${repository.owner}/${repository.name}/wiki/")
+        redirect(s"/${repository.owner}/${repository.name}/wiki")
       } else {
         flash += "info" -> "This patch was not able to be reversed."
         redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
@@ -118,15 +161,16 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/:page/_edit")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val pageName = StringUtil.urlDecode(params("page"))
       html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
     } else Unauthorized()
   })
 
   post("/:owner/:repository/wiki/_edit", editForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
-      defining(context.loginAccount.get){ loginAccount =>
+      defining(context.loginAccount.get) {
+        loginAccount =>
           saveWikiPage(
             repository.owner,
             repository.name,
@@ -136,16 +180,23 @@ trait WikiControllerBase extends ControllerBase {
             loginAccount,
             form.message.getOrElse(""),
             Some(form.id)
-        ).map { commitId =>
+          ).map {
+            commitId =>
               updateLastActivityDate(repository.owner, repository.name)
-          recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+              recordEditWikiPageActivity(
-          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+                repository.owner,
+                repository.name,
+                loginAccount.userName,
+                form.pageName,
+                commitId
+              )
+              callWebHookOf(repository.owner, repository.name, WebHook.Gollum) {
                 getAccountByUserName(repository.owner).map { repositoryUser =>
                   WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
                 }
               }
           }
-        if(notReservedPageName(form.pageName)) {
+          if (notReservedPageName(form.pageName)) {
             redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
           } else {
             redirect(s"/${repository.owner}/${repository.name}/wiki")
@@ -155,14 +206,15 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/_new")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       html.edit("", None, repository)
     } else Unauthorized()
   })
 
   post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
-      defining(context.loginAccount.get){ loginAccount =>
+      defining(context.loginAccount.get) {
+        loginAccount =>
           saveWikiPage(
             repository.owner,
             repository.name,
@@ -172,17 +224,18 @@ trait WikiControllerBase extends ControllerBase {
             loginAccount,
             form.message.getOrElse(""),
             None
-        ).map { commitId =>
+          ).map {
+            commitId =>
               updateLastActivityDate(repository.owner, repository.name)
               recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
-          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+              callWebHookOf(repository.owner, repository.name, WebHook.Gollum) {
                 getAccountByUserName(repository.owner).map { repositoryUser =>
                   WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
                 }
               }
           }
 
-        if(notReservedPageName(form.pageName)) {
+          if (notReservedPageName(form.pageName)) {
             redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
           } else {
             redirect(s"/${repository.owner}/${repository.name}/wiki")
@@ -192,11 +245,18 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/:page/_delete")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
+    if (isEditable(repository)) {
       val pageName = StringUtil.urlDecode(params("page"))
 
-      defining(context.loginAccount.get){ loginAccount =>
+      defining(context.loginAccount.get) { loginAccount =>
-        deleteWikiPage(repository.owner, repository.name, pageName, loginAccount.fullName, loginAccount.mailAddress, s"Destroyed ${pageName}")
+        deleteWikiPage(
+          repository.owner,
+          repository.name,
+          pageName,
+          loginAccount.fullName,
+          loginAccount.mailAddress,
+          s"Destroyed ${pageName}"
+        )
         updateLastActivityDate(repository.owner, repository.name)
 
         redirect(s"/${repository.owner}/${repository.name}/wiki")
@@ -209,7 +269,7 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
-    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
       JGitUtil.getCommitLog(git, "master") match {
         case Right((logs, hasNext)) => html.history(None, logs, repository, isEditable(repository))
         case Left(_)                => NotFound()
@@ -219,31 +279,41 @@ trait WikiControllerBase extends ControllerBase {
 
   get("/:owner/:repository/wiki/_blob/*")(referrersOnly { repository =>
     val path = multiParams("splat").head
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve("master"))
 
-    getFileContent(repository.owner, repository.name, path).map { bytes =>
+      getPathObjectId(git, path, revCommit).map { objectId =>
-      RawData(FileUtil.getContentType(path, bytes), bytes)
+        responseRawFile(git, objectId, path, repository)
       } getOrElse NotFound()
+    }
   })
 
-  private def unique: Constraint = new Constraint(){
+  private def unique: Constraint = new Constraint() {
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+    override def validate(
-      getWikiPageList(params("owner"), params("repository")).find(_ == value).map(_ => "Page already exists.")
+      name: String,
+      value: String,
+      params: Map[String, Seq[String]],
+      messages: Messages
+    ): Option[String] =
+      getWikiPageList(params.value("owner"), params.value("repository"))
+        .find(_ == value)
+        .map(_ => "Page already exists.")
   }
 
-  private def pagename: Constraint = new Constraint(){
+  private def pagename: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(value.exists("\\/:*?\"<>|".contains(_))){
+      if (value.exists("\\/:*?\"<>|".contains(_))) {
         Some(s"${name} contains invalid character.")
-      } else if(notReservedPageName(value) && (value.startsWith("_") || value.startsWith("-"))){
+      } else if (notReservedPageName(value) && (value.startsWith("_") || value.startsWith("-"))) {
         Some(s"${name} starts with invalid character.")
       } else {
         None
       }
   }
 
-  private def notReservedPageName(value: String) = ! (Array[String]("_Sidebar","_Footer") contains value)
+  private def notReservedPageName(value: String) = !(Array[String]("_Sidebar", "_Footer") contains value)
 
-  private def conflictForNew: Constraint = new Constraint(){
+  private def conflictForNew: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       targetWikiPage.map { _ =>
         "Someone has created the wiki since you started. Please reload this page and re-apply your changes."
@@ -251,9 +321,9 @@ trait WikiControllerBase extends ControllerBase {
     }
   }
 
-  private def conflictForEdit: Constraint = new Constraint(){
+  private def conflictForEdit: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      targetWikiPage.filter(_.id != params("id")).map{ _ =>
+      targetWikiPage.filter(_.id != params("id")).map { _ =>
         "Someone has edited the wiki since you started. Please reload this page and re-apply your changes."
       }
     }

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

@@ -1,6 +1,5 @@
 package gitbucket.core.model
 
-
 trait AccessTokenComponent { self: Profile =>
   import profile.api._
 

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

@@ -20,7 +20,22 @@ trait AccountComponent { self: Profile =>
     val groupAccount = column[Boolean]("GROUP_ACCOUNT")
     val removed = column[Boolean]("REMOVED")
     val description = column[String]("DESCRIPTION")
-    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed, description.?) <> (Account.tupled, Account.unapply)
+    def * =
+      (
+        userName,
+        fullName,
+        mailAddress,
+        password,
+        isAdmin,
+        url.?,
+        registeredDate,
+        updatedDate,
+        lastLoginDate.?,
+        image.?,
+        groupAccount,
+        removed,
+        description.?
+      ) <> (Account.tupled, Account.unapply)
   }
 }
 

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

@@ -0,0 +1,19 @@
+package gitbucket.core.model
+
+trait AccountExtraMailAddressComponent { self: Profile =>
+  import profile.api._
+
+  lazy val AccountExtraMailAddresses = TableQuery[AccountExtraMailAddresses]
+
+  class AccountExtraMailAddresses(tag: Tag) extends Table[AccountExtraMailAddress](tag, "ACCOUNT_EXTRA_MAIL_ADDRESS") {
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val extraMailAddress = column[String]("EXTRA_MAIL_ADDRESS", O PrimaryKey)
+    def * =
+      (userName, extraMailAddress) <> (AccountExtraMailAddress.tupled, AccountExtraMailAddress.unapply)
+  }
+}
+
+case class AccountExtraMailAddress(
+  userName: String,
+  extraMailAddress: String
+)

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

@@ -0,0 +1,19 @@
+package gitbucket.core.model
+
+trait AccountFederationComponent { self: Profile =>
+  import profile.api._
+
+  lazy val AccountFederations = TableQuery[AccountFederations]
+
+  class AccountFederations(tag: Tag) extends Table[AccountFederation](tag, "ACCOUNT_FEDERATION") {
+    val issuer = column[String]("ISSUER")
+    val subject = column[String]("SUBJECT")
+    val userName = column[String]("USER_NAME")
+    def * = (issuer, subject, userName) <> (AccountFederation.tupled, AccountFederation.unapply)
+
+    def byPrimaryKey(issuer: String, subject: String): Rep[Boolean] =
+      (this.issuer === issuer.bind) && (this.subject === subject.bind)
+  }
+}
+
+case class AccountFederation(issuer: String, subject: String, userName: String)

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

@@ -3,7 +3,8 @@ package gitbucket.core.model
 trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
   import profile.api._
 
-  private implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+  private implicit val whContentTypeColumnType =
+    MappedColumnType.base[WebHookContentType, String](whct => whct.code, code => WebHookContentType.valueOf(code))
 
   lazy val AccountWebHooks = TableQuery[AccountWebHooks]
 

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

@@ -8,7 +8,9 @@ trait AccountWebHookEventComponent extends TemplateComponent {
 
   lazy val AccountWebHookEvents = TableQuery[AccountWebHookEvents]
 
-  class AccountWebHookEvents(tag: Tag) extends Table[AccountWebHookEvent](tag, "ACCOUNT_WEB_HOOK_EVENT") with BasicTemplate {
+  class AccountWebHookEvents(tag: Tag)
+      extends Table[AccountWebHookEvent](tag, "ACCOUNT_WEB_HOOK_EVENT")
+      with BasicTemplate {
     val url = column[String]("URL")
     val event = column[WebHook.Event]("EVENT")
 
@@ -31,4 +33,4 @@ case class AccountWebHookEvent(
   userName: String,
   url: String,
   event: WebHook.Event
-                       )
+)

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

@@ -13,7 +13,8 @@ trait ActivityComponent extends TemplateComponent { self: Profile =>
     val message = column[String]("MESSAGE")
     val additionalInfo = column[String]("ADDITIONAL_INFO")
     val activityDate = column[java.util.Date]("ACTIVITY_DATE")
-    def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
+    def * =
+      (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
   }
 }
 

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

@@ -76,9 +76,11 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(userName, repositoryName) && (this.commitId === commitId)
   }
 
-  trait BranchTemplate extends BasicTemplate{ self: Table[_] =>
+  trait BranchTemplate extends BasicTemplate { self: Table[_] =>
     val branch = column[String]("BRANCH")
-    def byBranch(owner: String, repository: String, branchName: String) = byRepository(owner, repository) && (branch === branchName.bind)
+    def byBranch(owner: String, repository: String, branchName: String) =
-    def byBranch(owner: Rep[String], repository: Rep[String], branchName: Rep[String]) = byRepository(owner, repository) && (this.branch === branchName)
+      byRepository(owner, repository) && (branch === branchName.bind)
+    def byBranch(owner: Rep[String], repository: Rep[String], branchName: Rep[String]) =
+      byRepository(owner, repository) && (this.branch === branchName)
   }
 }

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

@@ -1,6 +1,7 @@
 package gitbucket.core.model
+import java.util.Date
 
-trait Comment {
+sealed trait Comment {
   val commentedUserName: String
   val registeredDate: java.util.Date
 }
@@ -18,13 +19,14 @@ trait IssueCommentComponent extends TemplateComponent { self: Profile =>
     val content = column[String]("CONTENT")
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
-    def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
+    def * =
+      (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
 }
 
-case class IssueComment (
+case class IssueComment(
   userName: String,
   repositoryName: String,
   issueId: Int,
@@ -52,7 +54,21 @@ trait CommitCommentComponent extends TemplateComponent { self: Profile =>
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     val issueId = column[Option[Int]]("ISSUE_ID")
-    def * = (userName, repositoryName, commitId, commentId, commentedUserName, content, fileName, oldLine, newLine, registeredDate, updatedDate, issueId) <> (CommitComment.tupled, CommitComment.unapply)
+    def * =
+      (
+        userName,
+        repositoryName,
+        commitId,
+        commentId,
+        commentedUserName,
+        content,
+        fileName,
+        oldLine,
+        newLine,
+        registeredDate,
+        updatedDate,
+        issueId
+      ) <> (CommitComment.tupled, CommitComment.unapply)
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
@@ -71,4 +87,12 @@ case class CommitComment(
   registeredDate: java.util.Date,
   updatedDate: java.util.Date,
   issueId: Option[Int]
- ) extends Comment
+) extends Comment
+
+case class CommitComments(
+  fileName: String,
+  commentedUserName: String,
+  registeredDate: Date,
+  comments: Seq[CommitComment],
+  diff: Option[String]
+) extends Comment

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

@@ -4,7 +4,7 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
   import profile.api._
   import self._
 
-  implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name , i => CommitState(i))
+  implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name, i => CommitState(i))
 
   lazy val CommitStatuses = TableQuery[CommitStatuses]
   class CommitStatuses(tag: Tag) extends Table[CommitStatus](tag, "COMMIT_STATUS") with CommitTemplate {
@@ -16,12 +16,24 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
     val creator = column[String]("CREATOR")
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
-    def * = (commitStatusId, userName, repositoryName, commitId, context, state, targetUrl, description, creator, registeredDate, updatedDate) <> ((CommitStatus.apply _).tupled, CommitStatus.unapply)
+    def * =
+      (
+        commitStatusId,
+        userName,
+        repositoryName,
+        commitId,
+        context,
+        state,
+        targetUrl,
+        description,
+        creator,
+        registeredDate,
+        updatedDate
+      ) <> ((CommitStatus.apply _).tupled, CommitStatus.unapply)
     def byPrimaryKey(id: Int) = commitStatusId === id.bind
   }
 }
 
-
 case class CommitStatus(
   commitStatusId: Int = 0,
   userName: String,
@@ -36,7 +48,8 @@ case class CommitStatus(
   updatedDate: java.util.Date
 )
 object CommitStatus {
-  def pending(owner: String, repository: String, context: String) = CommitStatus(
+  def pending(owner: String, repository: String, context: String) =
+    CommitStatus(
       commitStatusId = 0,
       userName = owner,
       repositoryName = repository,
@@ -47,12 +60,12 @@ object CommitStatus {
       description = Some("Waiting for status to be reported"),
       creator = "",
       registeredDate = new java.util.Date(),
-    updatedDate = new java.util.Date())
+      updatedDate = new java.util.Date()
+    )
 }
 
 sealed abstract class CommitState(val name: String)
 
-
 object CommitState {
   object ERROR extends CommitState("error")
 
@@ -76,11 +89,11 @@ object CommitState {
    * success if the latest status for all contexts is success
    */
   def combine(statuses: Set[CommitState]): CommitState = {
-    if(statuses.isEmpty){
+    if (statuses.isEmpty) {
       PENDING
-    } else if(statuses.contains(CommitState.ERROR) || statuses.contains(CommitState.FAILURE)) {
+    } else if (statuses.contains(CommitState.ERROR) || statuses.contains(CommitState.FAILURE)) {
       FAILURE
-    } else if(statuses.contains(CommitState.PENDING)) {
+    } else if (statuses.contains(CommitState.PENDING)) {
       PENDING
     } else {
       SUCCESS
@@ -88,4 +101,3 @@ object CommitState {
   }
 
 }
-

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

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

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

@@ -13,13 +13,19 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
   }
 
-  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
+  class IssueOutline(tag: Tag)
+      extends Table[(String, String, Int, Int, Int)](tag, "ISSUE_OUTLINE_VIEW")
+      with IssueTemplate {
     val commentCount = column[Int]("COMMENT_COUNT")
     val priority = column[Int]("PRIORITY")
     def * = (userName, repositoryName, issueId, commentCount, priority)
   }
 
-  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate with PriorityTemplate {
+  class Issues(tag: Tag)
+      extends Table[Issue](tag, "ISSUE")
+      with IssueTemplate
+      with MilestoneTemplate
+      with PriorityTemplate {
     val openedUserName = column[String]("OPENED_USER_NAME")
     val assignedUserName = column[String]("ASSIGNED_USER_NAME")
     val title = column[String]("TITLE")
@@ -28,7 +34,22 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     val pullRequest = column[Boolean]("PULL_REQUEST")
-    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, priorityId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
+    def * =
+      (
+        userName,
+        repositoryName,
+        issueId,
+        openedUserName,
+        milestoneId.?,
+        priorityId.?,
+        assignedUserName.?,
+        title,
+        content.?,
+        closed,
+        registeredDate,
+        updatedDate,
+        pullRequest
+      ) <> (Issue.tupled, Issue.unapply)
 
     def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
   }

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

@@ -12,23 +12,19 @@ trait LabelComponent extends TemplateComponent { self: Profile =>
     def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
 
     def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) = byLabel(userName, repositoryName, labelId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) =
+      byLabel(userName, repositoryName, labelId)
   }
 }
 
-case class Label(
+case class Label(userName: String, repositoryName: String, labelId: Int = 0, labelName: String, color: String) {
-  userName: String,
-  repositoryName: String,
-  labelId: Int = 0,
-  labelName: String,
-  color: String){
 
   val fontColor = {
     val r = color.substring(0, 2)
     val g = color.substring(2, 4)
     val b = color.substring(4, 6)
 
-    if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
+    if (Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408) {
       "000000"
     } else {
       "ffffff"

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

@@ -12,10 +12,12 @@ trait MilestoneComponent extends TemplateComponent { self: Profile =>
     val description = column[Option[String]]("DESCRIPTION")
     val dueDate = column[Option[java.util.Date]]("DUE_DATE")
     val closedDate = column[Option[java.util.Date]]("CLOSED_DATE")
-    def * = (userName, repositoryName, milestoneId, title, description, dueDate, closedDate) <> (Milestone.tupled, Milestone.unapply)
+    def * =
+      (userName, repositoryName, milestoneId, title, description, dueDate, closedDate) <> (Milestone.tupled, Milestone.unapply)
 
     def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) = byMilestone(userName, repositoryName, milestoneId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) =
+      byMilestone(userName, repositoryName, milestoneId)
   }
 }
 

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

@@ -12,14 +12,16 @@ trait PriorityComponent extends TemplateComponent { self: Profile =>
     val ordering = column[Int]("ORDERING")
     val isDefault = column[Boolean]("IS_DEFAULT")
     val color = column[String]("COLOR")
-    def * = (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply)
+    def * =
+      (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply)
 
     def byPrimaryKey(owner: String, repository: String, priorityId: Int) = byPriority(owner, repository, priorityId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) = byPriority(userName, repositoryName, priorityId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) =
+      byPriority(userName, repositoryName, priorityId)
   }
 }
 
-case class Priority (
+case class Priority(
   userName: String,
   repositoryName: String,
   priorityId: Int = 0,
@@ -27,14 +29,15 @@ case class Priority (
   description: Option[String],
   isDefault: Boolean,
   ordering: Int = 0,
-  color: String){
+  color: String
+) {
 
   val fontColor = {
     val r = color.substring(0, 2)
     val g = color.substring(2, 4)
     val b = color.substring(4, 6)
 
-    if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
+    if (Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408) {
       "000000"
     } else {
       "ffffff"

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

@@ -1,7 +1,7 @@
 package gitbucket.core.model
 
-import gitbucket.core.util.DatabaseConfig
 import com.github.takezoe.slick.blocking.BlockingJdbcProfile
+import gitbucket.core.util.DatabaseConfig
 
 trait Profile {
   val profile: BlockingJdbcProfile
@@ -23,8 +23,8 @@ trait Profile {
   /**
    * Extends Column to add conditional condition
    */
-  implicit class RichColumn(c1: Rep[Boolean]){
+  implicit class RichColumn(c1: Rep[Boolean]) {
-    def &&(c2: => Rep[Boolean], guard: => Boolean): Rep[Boolean] = if(guard) c1 && c2 else c1
+    def &&(c2: => Rep[Boolean], guard: => Boolean): Rep[Boolean] = if (guard) c1 && c2 else c1
   }
 
   /**
@@ -40,7 +40,9 @@ trait ProfileProvider { self: Profile =>
 
 }
 
-trait CoreProfile extends ProfileProvider with Profile
+trait CoreProfile
+    extends ProfileProvider
+    with Profile
     with AccessTokenComponent
     with AccountComponent
     with ActivityComponent
@@ -61,7 +63,11 @@ trait CoreProfile extends ProfileProvider with Profile
     with RepositoryWebHookEventComponent
     with AccountWebHookComponent
     with AccountWebHookEventComponent
+    with AccountFederationComponent
     with ProtectedBranchComponent
     with DeployKeyComponent
+    with ReleaseTagComponent
+    with ReleaseAssetComponent
+    with AccountExtraMailAddressComponent
 
 object Profile extends CoreProfile

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

@@ -8,27 +8,22 @@ trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
   class ProtectedBranches(tag: Tag) extends Table[ProtectedBranch](tag, "PROTECTED_BRANCH") with BranchTemplate {
     val statusCheckAdmin = column[Boolean]("STATUS_CHECK_ADMIN")
     def * = (userName, repositoryName, branch, statusCheckAdmin) <> (ProtectedBranch.tupled, ProtectedBranch.unapply)
-    def byPrimaryKey(userName: String, repositoryName: String, branch: String) = byBranch(userName, repositoryName, branch)
+    def byPrimaryKey(userName: String, repositoryName: String, branch: String) =
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], branch: Rep[String]) = byBranch(userName, repositoryName, branch)
+      byBranch(userName, repositoryName, branch)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], branch: Rep[String]) =
+      byBranch(userName, repositoryName, branch)
   }
 
   lazy val ProtectedBranchContexts = TableQuery[ProtectedBranchContexts]
-  class ProtectedBranchContexts(tag: Tag) extends Table[ProtectedBranchContext](tag, "PROTECTED_BRANCH_REQUIRE_CONTEXT") with BranchTemplate {
+  class ProtectedBranchContexts(tag: Tag)
+      extends Table[ProtectedBranchContext](tag, "PROTECTED_BRANCH_REQUIRE_CONTEXT")
+      with BranchTemplate {
     val context = column[String]("CONTEXT")
-    def * = (userName, repositoryName, branch, context) <> (ProtectedBranchContext.tupled, ProtectedBranchContext.unapply)
+    def * =
+      (userName, repositoryName, branch, context) <> (ProtectedBranchContext.tupled, ProtectedBranchContext.unapply)
   }
 }
 
+case class ProtectedBranch(userName: String, repositoryName: String, branch: String, statusCheckAdmin: Boolean)
 
-case class ProtectedBranch(
+case class ProtectedBranchContext(userName: String, repositoryName: String, branch: String, context: String)
-  userName: String,
-  repositoryName: String,
-  branch: String,
-  statusCheckAdmin: Boolean)
-
-
-case class ProtectedBranchContext(
-  userName: String,
-  repositoryName: String,
-  branch: String,
-  context: String)

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

@@ -12,10 +12,23 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
     val requestBranch = column[String]("REQUEST_BRANCH")
     val commitIdFrom = column[String]("COMMIT_ID_FROM")
     val commitIdTo = column[String]("COMMIT_ID_TO")
-    def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)
+    def * =
+      (
+        userName,
+        repositoryName,
+        issueId,
+        branch,
+        requestUserName,
+        requestRepositoryName,
+        requestBranch,
+        commitIdFrom,
+        commitIdTo
+      ) <> (PullRequest.tupled, PullRequest.unapply)
 
-    def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) =
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) = byIssue(userName, repositoryName, issueId)
+      byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) =
+      byIssue(userName, repositoryName, issueId)
   }
 }
 

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

@@ -0,0 +1,43 @@
+package gitbucket.core.model
+
+import java.util.Date
+
+trait ReleaseAssetComponent extends TemplateComponent {
+  self: Profile =>
+
+  import profile.api._
+  import self._
+
+  lazy val ReleaseAssets = TableQuery[ReleaseAssets]
+
+  class ReleaseAssets(tag_ : Tag) extends Table[ReleaseAsset](tag_, "RELEASE_ASSET") with BasicTemplate {
+    val tag = column[String]("TAG")
+    val releaseAssetId = column[Int]("RELEASE_ASSET_ID", O AutoInc)
+    val fileName = column[String]("FILE_NAME")
+    val label = column[String]("LABEL")
+    val size = column[Long]("SIZE")
+    val uploader = column[String]("UPLOADER")
+    val registeredDate = column[Date]("REGISTERED_DATE")
+    val updatedDate = column[Date]("UPDATED_DATE")
+
+    def * =
+      (userName, repositoryName, tag, releaseAssetId, fileName, label, size, uploader, registeredDate, updatedDate) <> (ReleaseAsset.tupled, ReleaseAsset.unapply)
+    def byPrimaryKey(owner: String, repository: String, tag: String, fileName: String) =
+      byTag(owner, repository, tag) && (this.fileName === fileName.bind)
+    def byTag(owner: String, repository: String, tag: String) =
+      byRepository(owner, repository) && (this.tag === tag.bind)
+  }
+}
+
+case class ReleaseAsset(
+  userName: String,
+  repositoryName: String,
+  tag: String,
+  releaseAssetId: Int = 0,
+  fileName: String,
+  label: String,
+  size: Long,
+  uploader: String,
+  registeredDate: Date,
+  updatedDate: Date
+)

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

@@ -0,0 +1,36 @@
+package gitbucket.core.model
+
+trait ReleaseTagComponent extends TemplateComponent {
+  self: Profile =>
+
+  import profile.api._
+  import self._
+
+  lazy val ReleaseTags = TableQuery[ReleaseTags]
+
+  class ReleaseTags(tag_ : Tag) extends Table[ReleaseTag](tag_, "RELEASE_TAG") with BasicTemplate {
+    val name = column[String]("NAME")
+    val tag = column[String]("TAG")
+    val author = column[String]("AUTHOR")
+    val content = column[Option[String]]("CONTENT")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+
+    def * =
+      (userName, repositoryName, name, tag, author, content, registeredDate, updatedDate) <> (ReleaseTag.tupled, ReleaseTag.unapply)
+    def byPrimaryKey(owner: String, repository: String, tag: String) = byTag(owner, repository, tag)
+    def byTag(owner: String, repository: String, tag: String) =
+      byRepository(owner, repository) && (this.tag === tag.bind)
+  }
+}
+
+case class ReleaseTag(
+  userName: String,
+  repositoryName: String,
+  name: String,
+  tag: String,
+  author: String,
+  content: Option[String],
+  registeredDate: java.util.Date,
+  updatedDate: java.util.Date
+)

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

@@ -22,13 +22,28 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
     val wikiOption = column[String]("WIKI_OPTION")
     val externalWikiUrl = column[String]("EXTERNAL_WIKI_URL")
     val allowFork = column[Boolean]("ALLOW_FORK")
+    val mergeOptions = column[String]("MERGE_OPTIONS")
+    val defaultMergeOption = column[String]("DEFAULT_MERGE_OPTION")
 
-    def * = (
+    def * =
-      (userName, repositoryName, isPrivate, description.?, defaultBranch,
+      (
-      registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?),
+        (
-      (issuesOption, externalIssuesUrl.?, wikiOption, externalWikiUrl.?, allowFork)
+          userName,
-    ).shaped <> (
+          repositoryName,
-      { case (repository, options) =>
+          isPrivate,
+          description.?,
+          defaultBranch,
+          registeredDate,
+          updatedDate,
+          lastActivityDate,
+          originUserName.?,
+          originRepositoryName.?,
+          parentUserName.?,
+          parentRepositoryName.?
+        ),
+        (issuesOption, externalIssuesUrl.?, wikiOption, externalWikiUrl.?, allowFork, mergeOptions, defaultMergeOption)
+      ).shaped <> ({
+        case (repository, options) =>
           Repository(
             repository._1,
             repository._2,
@@ -45,7 +60,9 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
             RepositoryOptions.tupled.apply(options)
           )
       }, { (r: Repository) =>
-        Some(((
+        Some(
+          (
+            (
               r.userName,
               r.repositoryName,
               r.isPrivate,
@@ -58,9 +75,12 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
               r.originRepositoryName,
               r.parentUserName,
               r.parentRepositoryName
-        ),(
+            ),
+            (
               RepositoryOptions.unapply(r.options).get
-        )))
+            )
+          )
+        )
       })
 
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
@@ -88,5 +108,7 @@ case class RepositoryOptions(
   externalIssuesUrl: Option[String],
   wikiOption: String,
   externalWikiUrl: Option[String],
-  allowFork: Boolean
+  allowFork: Boolean,
+  mergeOptions: String,
+  defaultMergeOption: String
 )

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

@@ -3,7 +3,8 @@ package gitbucket.core.model
 trait RepositoryWebHookComponent extends TemplateComponent { self: Profile =>
   import profile.api._
 
-  implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+  implicit val whContentTypeColumnType =
+    MappedColumnType.base[WebHookContentType, String](whct => whct.code, code => WebHookContentType.valueOf(code))
 
   lazy val RepositoryWebHooks = TableQuery[RepositoryWebHooks]
 
@@ -11,13 +12,14 @@ trait RepositoryWebHookComponent extends TemplateComponent { self: Profile =>
     val url = column[String]("URL")
     val token = column[Option[String]]("TOKEN")
     val ctype = column[WebHookContentType]("CTYPE")
-    def * = (userName, repositoryName, url, ctype, token) <> ((RepositoryWebHook.apply _).tupled, RepositoryWebHook.unapply)
+    def * =
+      (userName, repositoryName, url, ctype, token) <> ((RepositoryWebHook.apply _).tupled, RepositoryWebHook.unapply)
 
-    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+    def byPrimaryKey(owner: String, repository: String, url: String) =
+      byRepository(owner, repository) && (this.url === url.bind)
   }
 }
 
-
 case class RepositoryWebHook(
   userName: String,
   repositoryName: String,

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

@@ -6,17 +6,22 @@ trait RepositoryWebHookEventComponent extends TemplateComponent { self: Profile
 
   lazy val RepositoryWebHookEvents = TableQuery[RepositoryWebHookEvents]
 
-  class RepositoryWebHookEvents(tag: Tag) extends Table[RepositoryWebHookEvent](tag, "WEB_HOOK_EVENT") with BasicTemplate {
+  class RepositoryWebHookEvents(tag: Tag)
+      extends Table[RepositoryWebHookEvent](tag, "WEB_HOOK_EVENT")
+      with BasicTemplate {
     val url = column[String]("URL")
     val event = column[WebHook.Event]("EVENT")
-    def * = (userName, repositoryName, url, event) <> ((RepositoryWebHookEvent.apply _).tupled, RepositoryWebHookEvent.unapply)
+    def * =
+      (userName, repositoryName, url, event) <> ((RepositoryWebHookEvent.apply _).tupled, RepositoryWebHookEvent.unapply)
 
-    def byRepositoryWebHook(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+    def byRepositoryWebHook(owner: String, repository: String, url: String) =
+      byRepository(owner, repository) && (this.url === url.bind)
     def byRepositoryWebHook(owner: Rep[String], repository: Rep[String], url: Rep[String]) =
       byRepository(userName, repositoryName) && (this.url === url)
     def byRepositoryWebHook(webhook: RepositoryWebHooks) =
       byRepository(webhook.userName, webhook.repositoryName) && (this.url === webhook.url)
-    def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) = byRepositoryWebHook(owner, repository, url) && (this.event === event.bind)
+    def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) =
+      byRepositoryWebHook(owner, repository, url) && (this.event === event.bind)
   }
 }
 

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

@@ -12,7 +12,8 @@ trait SshKeyComponent { self: Profile =>
     val publicKey = column[String]("PUBLIC_KEY")
     def * = (userName, sshKeyId, title, publicKey) <> (SshKey.tupled, SshKey.unapply)
 
-    def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName === userName.bind) && (this.sshKeyId === sshKeyId.bind)
+    def byPrimaryKey(userName: String, sshKeyId: Int) =
+      (this.userName === userName.bind) && (this.sshKeyId === sshKeyId.bind)
   }
 }
 

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

@@ -16,7 +16,7 @@ object WebHookContentType {
   def valueOpt(code: String): Option[WebHookContentType] = map.get(code)
 }
 
-trait WebHook{
+trait WebHook {
   val url: String
   val ctype: WebHookContentType
   val token: Option[String]
@@ -45,7 +45,7 @@ object WebHook {
   case object TeamAdd extends Event("team_add")
   case object Watch extends Event("watch")
 
-  object Event{
+  object Event {
     val values = List(
       CommitComment,
       Create,
@@ -68,7 +68,7 @@ object WebHook {
       Watch
     )
 
-    private val map: Map[String,Event] = values.map(e => e.name -> e).toMap
+    private val map: Map[String, Event] = values.map(e => e.name -> e).toMap
     def valueOf(name: String): Event = map(name)
     def valueOpt(name: String): Option[Event] = map.get(name)
   }

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

@@ -10,13 +10,18 @@ import gitbucket.core.service.SystemSettingsService.SystemSettings
  * @param localPath the string to assemble local file path of repository (e.g. "gist/$1/$2")
  * @param filter the filter for request to the Git repository which is defined by this routing
  */
-case class GitRepositoryRouting(urlPattern: String, localPath: String, filter: GitRepositoryFilter){
+case class GitRepositoryRouting(urlPattern: String, localPath: String, filter: GitRepositoryFilter) {
 
   def this(urlPattern: String, localPath: String) = {
-    this(urlPattern, localPath, new GitRepositoryFilter(){
+    this(
-      def filter(repositoryName: String, userName: Option[String], settings: SystemSettings, isUpdating: Boolean)
+      urlPattern,
-                (implicit session: Session): Boolean = true
+      localPath,
-    })
+      new GitRepositoryFilter() {
+        def filter(repositoryName: String, userName: Option[String], settings: SystemSettings, isUpdating: Boolean)(
+          implicit session: Session
+        ): Boolean = true
+      }
+    )
   }
 
 }
@@ -36,7 +41,8 @@ trait GitRepositoryFilter {
    * @param session the database session
    * @return true if allow accessing to repository, otherwise false.
    */
-  def filter(path: String, userName: Option[String], settings: SystemSettings, isUpdating: Boolean)
+  def filter(path: String, userName: Option[String], settings: SystemSettings, isUpdating: Boolean)(
-            (implicit session: Session): Boolean
+    implicit session: Session
+  ): Boolean
 
 }

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

@@ -3,18 +3,23 @@ package gitbucket.core.plugin
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Issue
 import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.model.Profile._
+import profile.api._
 
 trait IssueHook {
 
-  def created(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def created(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
-  def addedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def addedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(
-  def closed(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+    implicit session: Session,
-  def reopened(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+    context: Context
+  ): Unit = ()
+  def closed(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
+  def reopened(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
 
 }
 
 trait PullRequestHook extends IssueHook {
 
-  def merged(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def merged(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
 
 }

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

@@ -8,6 +8,7 @@ import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.SyntaxSugars._
 import io.github.gitbucket.solidbase.model.Version
+import org.apache.sshd.server.Command
 import play.twirl.api.Html
 
 /**
@@ -29,7 +30,8 @@ abstract class Plugin {
   /**
    * Override to declare this plug-in provides images.
    */
-  def images(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, Array[Byte])] = Nil
+  def images(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, Array[Byte])] =
+    Nil
 
   /**
    * Override to declare this plug-in provides controllers.
@@ -39,7 +41,11 @@ abstract class Plugin {
   /**
    * Override to declare this plug-in provides controllers.
    */
-  def controllers(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, ControllerBase)] = Nil
+  def controllers(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(String, ControllerBase)] = Nil
 
   /**
    * Override to declare this plug-in provides JavaScript.
@@ -49,7 +55,8 @@ abstract class Plugin {
   /**
    * Override to declare this plug-in provides JavaScript.
    */
-  def javaScripts(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, String)] = Nil
+  def javaScripts(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, String)] =
+    Nil
 
   /**
    * Override to declare this plug-in provides renderers.
@@ -59,7 +66,8 @@ abstract class Plugin {
   /**
    * Override to declare this plug-in provides renderers.
    */
-  def renderers(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, Renderer)] = Nil
+  def renderers(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, Renderer)] =
+    Nil
 
   /**
    * Override to add git repository routings.
@@ -69,7 +77,11 @@ abstract class Plugin {
   /**
    * Override to add git repository routings.
    */
-  def repositoryRoutings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[GitRepositoryRouting] = Nil
+  def repositoryRoutings(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[GitRepositoryRouting] = Nil
 
   /**
    * Override to add account hooks.
@@ -99,7 +111,11 @@ abstract class Plugin {
   /**
    * Override to add repository hooks.
    */
-  def repositoryHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[RepositoryHook] = Nil
+  def repositoryHooks(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[RepositoryHook] = Nil
 
   /**
    * Override to add issue hooks.
@@ -119,7 +135,11 @@ abstract class Plugin {
   /**
    * Override to add pull request hooks.
    */
-  def pullRequestHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[PullRequestHook] = Nil
+  def pullRequestHooks(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[PullRequestHook] = Nil
 
   /**
    * Override to add repository headers.
@@ -129,7 +149,11 @@ abstract class Plugin {
   /**
    * Override to add repository headers.
    */
-  def repositoryHeaders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Html]] = Nil
+  def repositoryHeaders(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(RepositoryInfo, Context) => Option[Html]] = Nil
 
   /**
    * Override to add global menus.
@@ -139,7 +163,11 @@ abstract class Plugin {
   /**
    * Override to add global menus.
    */
-  def globalMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
+  def globalMenus(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(Context) => Option[Link]] = Nil
 
   /**
    * Override to add repository menus.
@@ -149,7 +177,11 @@ abstract class Plugin {
   /**
    * Override to add repository menus.
    */
-  def repositoryMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
+  def repositoryMenus(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
 
   /**
    * Override to add repository setting tabs.
@@ -159,7 +191,11 @@ abstract class Plugin {
   /**
    * Override to add repository setting tabs.
    */
-  def repositorySettingTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
+  def repositorySettingTabs(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
 
   /**
    * Override to add profile tabs.
@@ -169,7 +205,11 @@ abstract class Plugin {
   /**
    * Override to add profile tabs.
    */
-  def profileTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Account, Context) => Option[Link]] = Nil
+  def profileTabs(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(Account, Context) => Option[Link]] = Nil
 
   /**
    * Override to add system setting menus.
@@ -179,7 +219,11 @@ abstract class Plugin {
   /**
    * Override to add system setting menus.
    */
-  def systemSettingMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
+  def systemSettingMenus(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(Context) => Option[Link]] = Nil
 
   /**
    * Override to add account setting menus.
@@ -189,7 +233,11 @@ abstract class Plugin {
   /**
    * Override to add account setting menus.
    */
-  def accountSettingMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
+  def accountSettingMenus(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(Context) => Option[Link]] = Nil
 
   /**
    * Override to add dashboard tabs.
@@ -199,7 +247,11 @@ abstract class Plugin {
   /**
    * Override to add dashboard tabs.
    */
-  def dashboardTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
+  def dashboardTabs(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(Context) => Option[Link]] = Nil
 
   /**
    * Override to add issue sidebars.
@@ -209,7 +261,11 @@ abstract class Plugin {
   /**
    * Override to add issue sidebars.
    */
-  def issueSidebars(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
+  def issueSidebars(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
 
   /**
    * Override to add assets mappings.
@@ -219,7 +275,11 @@ abstract class Plugin {
   /**
    * Override to add assets mappings.
    */
-  def assetsMappings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, String)] = Nil
+  def assetsMappings(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[(String, String)] = Nil
 
   /**
    * Override to add text decorators.
@@ -229,7 +289,8 @@ abstract class Plugin {
   /**
    * Override to add text decorators.
    */
-  def textDecorators(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[TextDecorator] = Nil
+  def textDecorators(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[TextDecorator] =
+    Nil
 
   /**
    * Override to add suggestion provider.
@@ -239,23 +300,45 @@ abstract class Plugin {
   /**
    * Override to add suggestion provider.
    */
-  def suggestionProviders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[SuggestionProvider] = Nil
+  def suggestionProviders(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[SuggestionProvider] = Nil
+
+  /**
+   * Override to add ssh command providers.
+   */
+  val sshCommandProviders: Seq[PartialFunction[String, Command]] = Nil
+
+  /**
+   * Override to add ssh command providers.
+   */
+  def sshCommandProviders(
+    registry: PluginRegistry,
+    context: ServletContext,
+    settings: SystemSettings
+  ): Seq[PartialFunction[String, Command]] = Nil
 
   /**
    * This method is invoked in initialization of plugin system.
    * Register plugin functionality to PluginRegistry.
    */
   def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {
-    (images ++ images(registry, context, settings)).foreach { case (id, in) =>
+    (images ++ images(registry, context, settings)).foreach {
+      case (id, in) =>
         registry.addImage(id, in)
     }
-    (controllers ++ controllers(registry, context, settings)).foreach { case (path, controller) =>
+    (controllers ++ controllers(registry, context, settings)).foreach {
+      case (path, controller) =>
         registry.addController(path, controller)
     }
-    (javaScripts ++ javaScripts(registry, context, settings)).foreach { case (path, script) =>
+    (javaScripts ++ javaScripts(registry, context, settings)).foreach {
+      case (path, script) =>
         registry.addJavaScript(path, script)
     }
-    (renderers ++ renderers(registry, context, settings)).foreach { case (extension, renderer) =>
+    (renderers ++ renderers(registry, context, settings)).foreach {
+      case (extension, renderer) =>
         registry.addRenderer(extension, renderer)
     }
     (repositoryRoutings ++ repositoryRoutings(registry, context, settings)).foreach { routing =>
@@ -312,6 +395,9 @@ abstract class Plugin {
     (suggestionProviders ++ suggestionProviders(registry, context, settings)).foreach { suggestionProvider =>
       registry.addSuggestionProvider(suggestionProvider)
     }
+    (sshCommandProviders ++ sshCommandProviders(registry, context, settings)).foreach { sshCommandProvider =>
+      registry.addSshCommandProvider(sshCommandProvider)
+    }
   }
 
   /**
@@ -330,7 +416,7 @@ abstract class Plugin {
    * Helper method to get a resource from classpath.
    */
   protected def fromClassPath(path: String): Array[Byte] =
-    using(getClass.getClassLoader.getResourceAsStream(path)){ in =>
+    using(getClass.getClassLoader.getResourceAsStream(path)) { in =>
       val bytes = new Array[Byte](in.available)
       in.read(bytes)
       bytes

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

@@ -22,6 +22,7 @@ import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
 import org.apache.commons.io.FileUtils
+import org.apache.sshd.server.Command
 import org.slf4j.LoggerFactory
 import play.twirl.api.Html
 
@@ -40,12 +41,9 @@ class PluginRegistry {
   private val accountHooks = new ConcurrentLinkedQueue[AccountHook]
   private val receiveHooks = new ConcurrentLinkedQueue[ReceiveHook]
   receiveHooks.add(new ProtectedBranchReceiveHook())
-
   private val repositoryHooks = new ConcurrentLinkedQueue[RepositoryHook]
   private val issueHooks = new ConcurrentLinkedQueue[IssueHook]
-
   private val pullRequestHooks = new ConcurrentLinkedQueue[PullRequestHook]
-
   private val repositoryHeaders = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Html]]
   private val globalMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
   private val repositoryMenus = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Link]]
@@ -57,9 +55,9 @@ class PluginRegistry {
   private val issueSidebars = new ConcurrentLinkedQueue[(Issue, RepositoryInfo, Context) => Option[Html]]
   private val assetsMappings = new ConcurrentLinkedQueue[(String, String, ClassLoader)]
   private val textDecorators = new ConcurrentLinkedQueue[TextDecorator]
-
   private val suggestionProviders = new ConcurrentLinkedQueue[SuggestionProvider]
   suggestionProviders.add(new UserNameSuggestionProvider())
+  private val sshCommandProviders = new ConcurrentLinkedQueue[PartialFunction[String, Command]]()
 
   def addPlugin(pluginInfo: PluginInfo): Unit = plugins.add(pluginInfo)
 
@@ -72,7 +70,7 @@ class PluginRegistry {
 
   @deprecated("Use addImage(id: String, bytes: Array[Byte]) instead", "3.4.0")
   def addImage(id: String, in: InputStream): Unit = {
-    val bytes = using(in){ in =>
+    val bytes = using(in) { in =>
       val bytes = new Array[Byte](in.available)
       in.read(bytes)
       bytes
@@ -89,9 +87,11 @@ class PluginRegistry {
 
   def getControllers(): Seq[(ControllerBase, String)] = controllers.asScala.toSeq
 
-  def addJavaScript(path: String, script: String): Unit = javaScripts.add((path, script)) //javaScripts += ((path, script))
+  def addJavaScript(path: String, script: String): Unit =
+    javaScripts.add((path, script)) //javaScripts += ((path, script))
 
-  def getJavaScript(currentPath: String): List[String] = javaScripts.asScala.filter(x => currentPath.matches(x._1)).toList.map(_._2)
+  def getJavaScript(currentPath: String): List[String] =
+    javaScripts.asScala.filter(x => currentPath.matches(x._1)).toList.map(_._2)
 
   def addRenderer(extension: String, renderer: Renderer): Unit = renderers.put(extension, renderer)
 
@@ -131,7 +131,8 @@ class PluginRegistry {
 
   def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.asScala.toSeq
 
-  def addRepositoryHeader(repositoryHeader: (RepositoryInfo, Context) => Option[Html]): Unit = repositoryHeaders.add(repositoryHeader)
+  def addRepositoryHeader(repositoryHeader: (RepositoryInfo, Context) => Option[Html]): Unit =
+    repositoryHeaders.add(repositoryHeader)
 
   def getRepositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = repositoryHeaders.asScala.toSeq
 
@@ -139,11 +140,13 @@ class PluginRegistry {
 
   def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.asScala.toSeq
 
-  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus.add(repositoryMenu)
+  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit =
+    repositoryMenus.add(repositoryMenu)
 
   def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.asScala.toSeq
 
-  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs.add(repositorySettingTab)
+  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit =
+    repositorySettingTabs.add(repositorySettingTab)
 
   def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.asScala.toSeq
 
@@ -151,11 +154,13 @@ class PluginRegistry {
 
   def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.asScala.toSeq
 
-  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus.add(systemSettingMenu)
+  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit =
+    systemSettingMenus.add(systemSettingMenu)
 
   def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.asScala.toSeq
 
-  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus.add(accountSettingMenu)
+  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit =
+    accountSettingMenus.add(accountSettingMenu)
 
   def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.asScala.toSeq
 
@@ -163,7 +168,8 @@ class PluginRegistry {
 
   def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.asScala.toSeq
 
-  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars.add(issueSidebar)
+  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit =
+    issueSidebars.add(issueSidebar)
 
   def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.asScala.toSeq
 
@@ -178,6 +184,11 @@ class PluginRegistry {
   def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders.add(suggestionProvider)
 
   def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.asScala.toSeq
+
+  def addSshCommandProvider(sshCommandProvider: PartialFunction[String, Command]): Unit =
+    sshCommandProviders.add(sshCommandProvider)
+
+  def getSshCommandProviders: Seq[PartialFunction[String, Command]] = sshCommandProviders.asScala.toSeq
 }
 
 /**
@@ -210,8 +221,10 @@ object PluginRegistry {
   /**
    * Uninstall a specified plugin.
    */
-  def uninstall(pluginId: String, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
+  def uninstall(pluginId: String, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit =
-    instance.getPlugins()
+    synchronized {
+      instance
+        .getPlugins()
         .collect { case plugin if plugin.pluginId == pluginId => plugin }
         .foreach { plugin =>
 //      try {
@@ -230,7 +243,8 @@ object PluginRegistry {
   /**
    * Install a plugin from a specified jar file.
    */
-  def install(file: File, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
+  def install(file: File, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit =
+    synchronized {
       shutdown(context, settings)
       FileUtils.copyFile(file, new File(PluginHome, file.getName))
       instance = new PluginRegistry()
@@ -238,9 +252,13 @@ object PluginRegistry {
     }
 
   private def listPluginJars(dir: File): Seq[File] = {
-    dir.listFiles(new FilenameFilter {
+    dir
+      .listFiles(new FilenameFilter {
         override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
-    }).toSeq.sortBy(_.getName).reverse
+      })
+      .toSeq
+      .sortBy(_.getName)
+      .reverse
   }
 
   lazy val extraPluginDir: Option[String] = Option(System.getProperty("gitbucket.pluginDir"))
@@ -254,16 +272,21 @@ object PluginRegistry {
 
     // Clean installed directory
     val installedDir = new File(PluginHome, ".installed")
-    if(installedDir.exists){
+    if (installedDir.exists) {
       FileUtils.deleteDirectory(installedDir)
     }
-    installedDir.mkdir()
+    installedDir.mkdirs()
 
     val pluginJars = listPluginJars(pluginDir)
-    val extraJars = extraPluginDir.map { extraDir => listPluginJars(new File(extraDir)) }.getOrElse(Nil)
+    val extraJars = extraPluginDir
+      .map { extraDir =>
+        listPluginJars(new File(extraDir))
+      }
+      .getOrElse(Nil)
 
     (extraJars ++ pluginJars).foreach { pluginJar =>
       val installedJar = new File(installedDir, pluginJar.getName)
+
       FileUtils.copyFile(pluginJar, installedJar)
 
       logger.info(s"Initialize ${pluginJar.getName}")
@@ -280,18 +303,23 @@ object PluginRegistry {
           case None => {
             // Migration
             val solidbase = new Solidbase()
-            solidbase.migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
+            solidbase
+              .migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
+            conn.commit()
 
             // Check database version
             val databaseVersion = manager.getCurrentVersion(plugin.pluginId)
             val pluginVersion = plugin.versions.last.getVersion
             if (databaseVersion != pluginVersion) {
-              throw new IllegalStateException(s"Plugin version is ${pluginVersion}, but database version is ${databaseVersion}")
+              throw new IllegalStateException(
+                s"Plugin version is ${pluginVersion}, but database version is ${databaseVersion}"
+              )
             }
 
             // Initialize
             plugin.initialize(instance, context, settings)
-            instance.addPlugin(PluginInfo(
+            instance.addPlugin(
+              PluginInfo(
                 pluginId = plugin.pluginId,
                 pluginName = plugin.pluginName,
                 pluginVersion = plugin.versions.last.getVersion,
@@ -299,7 +327,8 @@ object PluginRegistry {
                 pluginClass = plugin,
                 pluginJar = pluginJar,
                 classLoader = classLoader
-            ))
+              )
+            )
           }
         }
       } catch {
@@ -307,13 +336,13 @@ object PluginRegistry {
       }
     }
 
-    if(watcher == null){
+    if (watcher == null) {
       watcher = new PluginWatchThread(context, PluginHome)
       watcher.start()
     }
 
     extraPluginDir.foreach { extraDir =>
-      if(extraWatcher == null){
+      if (extraWatcher == null) {
         extraWatcher = new PluginWatchThread(context, extraDir)
         extraWatcher.start()
       }
@@ -324,11 +353,11 @@ object PluginRegistry {
     instance.getPlugins().foreach { plugin =>
       try {
         plugin.pluginClass.shutdown(instance, context, settings)
-        if(watcher != null){
+        if (watcher != null) {
           watcher.interrupt()
           watcher = null
         }
-        if(extraWatcher != null){
+        if (extraWatcher != null) {
           extraWatcher.interrupt()
           extraWatcher = null
         }
@@ -376,17 +405,19 @@ class PluginWatchThread(context: ServletContext, dir: String) extends Thread wit
 
   override def run(): Unit = {
     val path = Paths.get(dir)
-    if(!Files.exists(path)){
+    if (!Files.exists(path)) {
       Files.createDirectories(path)
     }
     val fs = path.getFileSystem
     val watcher = fs.newWatchService
 
-    val watchKey = path.register(watcher,
+    val watchKey = path.register(
+      watcher,
       StandardWatchEventKinds.ENTRY_CREATE,
       StandardWatchEventKinds.ENTRY_MODIFY,
       StandardWatchEventKinds.ENTRY_DELETE,
-      StandardWatchEventKinds.OVERFLOW)
+      StandardWatchEventKinds.OVERFLOW
+    )
 
     logger.info("Start PluginWatchThread: " + path)
 
@@ -396,17 +427,20 @@ class PluginWatchThread(context: ServletContext, dir: String) extends Thread wit
         val events = detectedWatchKey.pollEvents.asScala.filter { e =>
           e.context.toString != ".installed" && !e.context.toString.endsWith(".bak")
         }
-        if(events.nonEmpty){
+        if (events.nonEmpty) {
           events.foreach { event =>
             logger.info(event.kind + ": " + event.context)
           }
-
+          new Thread {
+            override def run(): Unit = {
               gitbucket.core.servlet.Database() withTransaction { session =>
                 logger.info("Reloading plugins...")
                 PluginRegistry.reload(context, loadSystemSettings(), session.conn)
                 logger.info("Reloading finished.")
               }
             }
+          }.start()
+        }
         detectedWatchKey.reset()
       }
     } catch {

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

@@ -15,7 +15,7 @@ object PluginRepository {
   lazy val LocalRepositoryIndexFile = new java.io.File(LocalRepositoryDir, "plugins.json")
 
   def getPlugins(): Seq[PluginMetadata] = {
-    if(LocalRepositoryIndexFile.exists){
+    if (LocalRepositoryIndexFile.exists) {
       parsePluginJson(FileUtils.readFileToString(LocalRepositoryIndexFile, "UTF-8"))
     } else Nil
   }
@@ -29,13 +29,14 @@ case class PluginMetadata(
   description: String,
   versions: Seq[VersionDef],
   default: Boolean = false
-){
+) {
   lazy val latestVersion: VersionDef = versions.last
 }
 
 case class VersionDef(
   version: String,
-  file: String,
+  url: String,
   range: String
-)
+) {
-
+  lazy val file = url.substring(url.lastIndexOf("/") + 1)
+}

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

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

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

@@ -3,6 +3,7 @@ package gitbucket.core.plugin
 import gitbucket.core.controller.Context
 import gitbucket.core.service.RepositoryService
 import gitbucket.core.view.Markdown
+import gitbucket.core.view.helpers.urlLink
 import play.twirl.api.Html
 
 /**
@@ -20,25 +21,22 @@ trait Renderer {
 object MarkdownRenderer extends Renderer {
   override def render(request: RenderRequest): Html = {
     import request._
-    Html(Markdown.toHtml(
+    Html(
+      Markdown.toHtml(
         markdown = fileContent,
         repository = repository,
         enableWikiLink = enableWikiLink,
         enableRefsLink = enableRefsLink,
         enableAnchor = enableAnchor,
         enableLineBreaks = false
-    )(context))
+      )(context)
+    )
   }
 }
 
 object DefaultRenderer extends Renderer {
   override def render(request: RenderRequest): Html = {
-    import request._
+    Html(s"""<tt><pre class="plain">${urlLink(request.fileContent)}</pre></tt>""")
-    Html(
-      s"<tt>${
-        fileContent.split("(\\r\\n)|\\n").map(xml.Utility.escape(_)).mkString("<br/>")
-      }</tt>"
-    )
   }
 }