Release 4.21.0

Merge pull request #1856 from int128/oidc
OpenID Connect authentication
2025-11-06 13:35:50 +01:00 · 2018-01-27 00:30:42 +09:00 · 2018-01-25 16:25:48 +09:00 · 2018-01-25 14:41:59 +09:00 · 2018-01-25 12:19:47 +09:00 · 2018-01-25 11:57:19 +09:00
329 changed files with 25828 additions and 12839 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.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.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.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)*
--- a/.github/SUPPORT.md
+++ b/.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.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,465 @@
 # Changelog
 All changes to the project will be documented in this file.
 ## 4.21.1 - 01 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
--- a/README.md
+++ b/README.md
@@ -66,418 +66,17 @@ 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.20.x
 -------------
 ### 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
+### 4.21.1 - 01 Jan 2018
 - 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
+- Release page
- Bug fix: Possibility of error in forking repository
+- OpenID Connect support
 - New database viewer
 - Submodule links to web page
 - Clarify close/reopen button
-### 4.14 - 1 Jul 2017
+See the [change log](CHANGELOG.md) for all of the updates.
 - 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
--- a/build.sbt
+++ b/build.sbt
@@ -1,16 +1,21 @@
 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.21.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.4"
 // dependency settings
 resolvers ++= Seq(
@@ -21,44 +26,45 @@ resolvers ++= Seq(
  "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.9.2.201712150930-r",
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.8.0.201706111038-r",
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.9.2.201712150930-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.1",
-  "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
@@ -87,17 +93,28 @@ 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 +129,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,7 +143,7 @@ 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) =>
      (name startsWith "javax/") ||
@@ -151,24 +168,19 @@ executableKey := {
  IO copyFile(Keys.baseDirectory.value / "plugins.json", pluginsDir / "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(
@@ -237,3 +249,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")
 }
--- a/contrib/linux/redhat/selinux/gitbucket.te
+++ b/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 };
--- a/contrib/linux/redhat/selinux/readme.md
+++ b/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}
 ~~~
--- a/contrib/linux/redhat/selinux/sedeploy.sh
+++ b/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
--- a/doc/jrebel.md
+++ b/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`.
--- a/doc/licenses.md
+++ b/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>
--- a/doc/readme.md
+++ b/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)
--- a/plugins.json
+++ b/plugins.json
@@ -5,9 +5,9 @@
    "description": "Provides notifications feature on GitBucket.",
    "versions": [
      {
-        "version": "1.1.0",
+        "version": "1.4.0",
-        "range": ">=4.16.0",
+        "range": ">=4.19.0",
-        "file": "gitbucket-notifications-plugin_2.12-1.1.0.jar"
+        "url": "https://github.com/gitbucket/gitbucket-notifications-plugin/releases/download/1.4.0/gitbucket-notifications-plugin_2.12-1.4.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.11.0",
-        "range": ">=4.15.0",
+        "range": ">=4.19.0",
-        "file": "gitbucket-gist-plugin_2.12-4.10.0.jar"
+        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.11.0/gitbucket-gist-plugin-assembly-4.11.0.jar"
      }
    ],
    "default": false
@@ -44,9 +44,9 @@
    "description": "Project pages for gitbucket",
    "versions": [
      {
-        "version": "1.5.0",
+        "version": "1.6.0",
-        "range": ">=4.15.0",
+        "range": ">=4.19.0",
-        "file": "gitbucket-pages-plugin_2.12-1.5.0.jar"
+        "url": "https://github.com/gitbucket/gitbucket-pages-plugin/releases/download/v1.6.0/gitbucket-pages-plugin_2.12-1.6.0.jar"
      }
    ],
    "default": false
--- a/project/Checksums.scala
+++ b/project/Checksums.scala
@@ -1,12 +1,13 @@
 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 =
-      IO write (target, compute(source, algorithm))
+      sbt.IO write (target, compute(source, algorithm))
  def compute(file:File, algorithm:String):String =
      hex(raw(file, algorithm))
--- a/project/PluginsJson.scala
+++ b/project/PluginsJson.scala
@@ -3,13 +3,12 @@ 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)
    }
  }
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=1.1.0
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,8 +1,10 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
-addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.0")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.13")
-addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.3")
+addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.5")
-addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "2.1.1")
+//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
-addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
-addSbtPlugin("com.typesafe.sbt"     % "sbt-pgp"           % "0.8.3")
+addSbtPlugin("org.scalatra.sbt"     % "sbt-scalatra"      % "1.0.1")
-addSbtPlugin("io.get-coursier"      % "sbt-coursier"      % "1.0.0-M15")
+addSbtPlugin("com.jsuereth"         % "sbt-pgp"           % "1.1.0")
 addSbtCoursier
 addSbtPlugin("com.typesafe.sbt"     % "sbt-license-report" % "1.2.0")
--- a/project/project/plugins.sbt
+++ b/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")
--- a/src/main/resources/update/gitbucket-core_4.21.xml
+++ b/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>
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -2,7 +2,7 @@
 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._
@@ -32,20 +32,26 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
    context.addFilter("pluginControllerFilter", new PluginControllerFilter)
    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)
--- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
@@ -41,5 +41,15 @@ object GitBucketCoreModule extends Module("gitbucket-core",
  ),
  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")
  )
 )
--- a/src/main/scala/gitbucket/core/api/ApiCommit.scala
+++ b/src/main/scala/gitbucket/core/api/ApiCommit.scala
@@ -35,23 +35,23 @@ case class 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)
 }
--- a/src/main/scala/gitbucket/core/api/ApiCommits.scala
+++ b/src/main/scala/gitbucket/core/api/ApiCommits.scala
@@ -0,0 +1,124 @@
 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
    )
  }
 }
--- a/src/main/scala/gitbucket/core/api/ApiPath.scala
+++ b/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)
--- a/src/main/scala/gitbucket/core/api/ApiPullRequest.scala
+++ b/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,8 @@ case class ApiPullRequest(
  merged_by: Option[ApiUser],
  title: String,
  body: String,
-  user: ApiUser) {
+  user: ApiUser,
  assignee: Option[ApiUser]){
  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")
@@ -39,10 +40,12 @@ object ApiPullRequest{
    headRepo: ApiRepository,
    baseRepo: ApiRepository,
    user: ApiUser,
    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(
@@ -59,14 +62,16 @@ object ApiPullRequest{
      merged_by  = mergedComment.map { case (_, account) => ApiUser(account) },
      title      = issue.title,
      body       = issue.content.getOrElse(""),
-      user       = user
+      user       = user,
      assignee   = assignee
    )
  case class Commit(
    sha: String,
    ref: String,
    repo: ApiRepository)(baseOwner:String){
-    val label = if( baseOwner == repo.owner.login ){ ref }else{ s"${repo.owner.login}:${ref}" }
+    val label = if( baseOwner == repo.owner.login ){ ref } else { s"${repo.owner.login}:${ref}" }
    val user = repo.owner
  }
 }
--- a/src/main/scala/gitbucket/core/api/ApiRepository.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRepository.scala
@@ -24,6 +24,7 @@ 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{
@@ -50,17 +51,18 @@ object ApiRepository{
  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)
  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)
 }
--- a/src/main/scala/gitbucket/core/api/JsonFormat.scala
+++ b/src/main/scala/gitbucket/core/api/JsonFormat.scala
@@ -1,23 +1,24 @@
 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 =>
    (
-      { case JString(s) => Try(parserISO.parseDateTime(s)).toOption.map(_.toDate).getOrElse(throw new MappingException("Can't convert " + s + " to Date")) },
+      { case JString(s) => Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date")) },
-      { case x: Date => JString(parserISO.print(new DateTime(x).withZone(DateTimeZone.UTC))) }
+      { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
    )
  ) + FieldSerializer[ApiUser]() +
    FieldSerializer[ApiPullRequest]() +
@@ -33,23 +34,31 @@ 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))
 }
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -2,7 +2,7 @@ package gitbucket.core.controller
 import gitbucket.core.account.html
 import gitbucket.core.helper
-import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, RepositoryWebHookEvent, Role, WebHook, WebHookContentType}
+import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, Role, WebHook, WebHookContentType}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
@@ -12,10 +12,9 @@ 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
  with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
@@ -87,15 +86,16 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    "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(
@@ -137,12 +137,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  }
  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
@@ -460,7 +461,6 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  get("/:groupName/_editgroup")(managersOnly {
    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()
@@ -527,11 +527,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  post("/new", newRepositoryForm)(usersOnly { form =>
    LockUtil.lock(s"${form.owner}/${form.name}"){
      if(getRepository(form.owner, form.name).isEmpty){
-        // Create the repository
+        createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.initOption, form.sourceUrl)
        createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.createReadme)
        // Call hooks
        PluginRegistry().getRepositoryHooks.foreach(_.created(form.owner, form.name))
      }
    }
@@ -565,67 +561,16 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      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()
  })
@@ -635,9 +580,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  }
  private def uniqueRepository: 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] = {
-      params.get("owner").flatMap { userName =>
+      for {
-        getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        userName <- params.optionValue("owner")
        _        <- getRepositoryNamesOfUser(userName).find(_ == value)
      } yield {
        "Repository already exists."
      }
    }
  }
--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -12,9 +12,12 @@ import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
 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
  with RepositoryService
@@ -50,6 +53,7 @@ trait ApiControllerBase extends ControllerBase {
    with LabelsService
    with MilestonesService
    with PullRequestService
    with CommitsService
    with CommitStatusService
    with RepositoryCreationService
    with IssueCreationService
@@ -199,13 +203,24 @@ trait ApiControllerBase extends ControllerBase {
  /*
   * 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))
        })
      }
    }
  })
@@ -247,7 +262,8 @@ trait ApiControllerBase extends ControllerBase {
    } yield {
      LockUtil.lock(s"${owner}/${data.name}") {
        if(getRepository(owner, data.name).isEmpty){
-          createRepository(context.loginAccount.get, owner, data.name, data.description, data.`private`, data.auto_init)
+          val 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 {
@@ -271,7 +287,8 @@ trait ApiControllerBase extends ControllerBase {
    } yield {
      LockUtil.lock(s"${groupName}/${data.name}") {
        if(getRepository(groupName, data.name).isEmpty){
-          createRepository(context.loginAccount.get, groupName, data.name, data.description, data.`private`, data.auto_init)
+          val 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 {
@@ -499,7 +516,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 +524,14 @@ 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),
        assignee      = assignee.map(ApiUser.apply),
        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
      )
    })
@@ -530,6 +548,7 @@ trait ApiControllerBase extends ControllerBase {
      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(
@@ -538,6 +557,7 @@ trait ApiControllerBase extends ControllerBase {
        headRepo      = ApiRepository(headRepo, ApiUser(headOwner)),
        baseRepo      = ApiRepository(repository, ApiUser(baseOwner)),
        user          = ApiUser(issueUser),
        assignee      = assignee.map(ApiUser.apply),
        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
      ))
    }) getOrElse NotFound()
@@ -628,6 +648,52 @@ 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
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -4,23 +4,23 @@ import java.io.FileInputStream
 import gitbucket.core.api.ApiError
 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
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory
 * Provides generic features for controller implementations.
 */
 abstract class ControllerBase extends ScalatraFilter
-  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
+  with ValidationSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
  with SystemSettingsService {
  private val logger = LoggerFactory.getLogger(getClass)
@@ -45,24 +45,10 @@ abstract class ControllerBase extends ScalatraFilter
  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 {
@@ -128,12 +114,24 @@ abstract class ControllerBase extends ScalatraFilter
      org.scalatra.NotFound(gitbucket.core.html.error("Not Found"))
    }
  private def isBrowser(userAgent: String): Boolean = {
    if(userAgent == null || userAgent.isEmpty){
      false
    } else {
      val data = Classifier.parse(userAgent)
      val category = data.get("category")
      category == "pc" || category == "smartphone" || category == "mobilephone"
    }
  }
  protected def Unauthorized()(implicit context: Context) =
    if(request.hasAttribute(Keys.Request.Ajax)){
      org.scalatra.Unauthorized()
    } else if(request.hasAttribute(Keys.Request.APIv3)){
      contentType = formats("json")
      org.scalatra.Unauthorized(ApiError("Requires authentication"))
    } else if(!isBrowser(request.getHeader("USER-AGENT"))){
      org.scalatra.Unauthorized()
    } else {
      if(context.loginAccount.isDefined){
        org.scalatra.Unauthorized(redirect("/"))
@@ -177,7 +175,7 @@ abstract class ControllerBase extends ScalatraFilter
  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
@@ -315,13 +313,14 @@ trait AccountManagementControllerBase extends ControllerBase {
  }
  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] = {
      getAccountByMailAddress(value, true)
-        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
+        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName) }
        .map    { _ => "Mail address is already registered." }
    }
  }
-  val allReservedNames = Set("git", "admin", "upload", "api")
+  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)){
      Some(s"${value} is reserved")
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -1,8 +1,7 @@
 package gitbucket.core.controller
 import gitbucket.core.model.Account
-import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.service.{AccountService, RepositoryService, ReleaseService}
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
 import gitbucket.core.util.SyntaxSugars._
@@ -20,14 +19,13 @@ 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({ (file, fileId) =>
@@ -48,7 +46,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
      FileUtils.writeByteArrayToFile(new java.io.File(
        getAttachedDir(params("owner"), params("repository")),
        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
-    }, FileUtil.isUploadableType)
+    }, _ => true)
  }
  post("/wiki/:owner/:repository"){
@@ -80,16 +78,30 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
              builder.finish()
              val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-                Constants.HEAD, loginAccount.userName, loginAccount.mailAddress, s"Uploaded ${fileName}")
+                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 java.io.File(getReleaseFilesDir(owner, repository), tag + "/" + fileId),
          file.get
        )
      }, _ => true)
    }.getOrElse(BadRequest())
  }
  post("/import") {
    import JDBCUtil._
    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account if loginAccount.isAdmin =>
@@ -113,10 +125,11 @@ 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) = fileParams.get("file") match {
    case Some(file) if(mimeTypeChcker(file.name)) =>
      defining(FileUtil.generateFileId){ fileId =>
        f(file, fileId)
        contentType = "text/plain"
        Ok(fileId)
      }
    case _ => BadRequest()
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -1,29 +1,46 @@
 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 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 UsersAuthenticator
  with ReferrerAuthenticator
  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 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,6 +51,7 @@ trait IndexControllerBase extends ControllerBase {
 //
 //  case class SearchForm(query: String, owner: String, repository: String)
  case class OidcContext(state: State, nonce: Nonce, redirectBackURI: String)
  get("/"){
    context.loginAccount.map { account =>
@@ -54,14 +72,60 @@ trait IndexControllerBase extends ControllerBase {
  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()
    }
  }
  /**
    * 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"){
@@ -74,7 +138,7 @@ trait IndexControllerBase extends ControllerBase {
    xml.feed(getRecentActivities())
  }
-  get("/sidebar-collapse"){
+  post("/sidebar-collapse"){
    if(params("collapse") == "true"){
      session.setAttribute("sidebar-collapse", "true")
    }  else {
@@ -86,7 +150,7 @@ 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)
@@ -94,15 +158,11 @@ trait IndexControllerBase extends ControllerBase {
      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("/")
    }
  }
  /**
@@ -120,7 +180,12 @@ trait IndexControllerBase extends ControllerBase {
            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
            )
          }
      ))
    )
  })
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -8,7 +8,7 @@ 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}
--- a/src/main/scala/gitbucket/core/controller/LabelsController.scala
+++ b/src/main/scala/gitbucket/core/controller/LabelsController.scala
@@ -4,7 +4,8 @@ import gitbucket.core.issues.labels.html
 import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService}
 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
@@ -82,10 +83,10 @@ trait LabelsControllerBase extends ControllerBase {
  }
  private def uniqueLabelName: 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 owner = params("owner")
+      val owner      = params.value("owner")
-      val repository = params("repository")
+      val repository = params.value("repository")
-      params.get("labelId").map { labelId =>
+      params.optionValue("labelId").map { labelId =>
        getLabel(owner, repository, value).filter(_.labelId != labelId.toInt).map(_ => "Name has already been taken.")
      }.getOrElse {
        getLabel(owner, repository, value).map(_ => "Name has already been taken.")
--- a/src/main/scala/gitbucket/core/controller/MilestonesController.scala
+++ b/src/main/scala/gitbucket/core/controller/MilestonesController.scala
@@ -4,7 +4,7 @@ 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
  with MilestonesService with RepositoryService with AccountService
--- a/src/main/scala/gitbucket/core/controller/PreProcessController.scala
+++ b/src/main/scala/gitbucket/core/controller/PreProcessController.scala
@@ -29,7 +29,7 @@ trait PreProcessControllerBase extends ControllerBase {
   */
  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
    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()
--- a/src/main/scala/gitbucket/core/controller/PrioritiesController.scala
+++ b/src/main/scala/gitbucket/core/controller/PrioritiesController.scala
@@ -4,7 +4,8 @@ import gitbucket.core.issues.priorities.html
 import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, 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
@@ -98,10 +99,10 @@ trait PrioritiesControllerBase extends ControllerBase {
  }
  private def uniquePriorityName: 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 owner = params("owner")
+      val owner      = params.value("owner")
-      val repository = params("repository")
+      val repository = params.value("repository")
-      params.get("priorityId").map { priorityId =>
+      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.")
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -13,9 +13,10 @@ 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 scala.collection.JavaConverters._
@@ -50,7 +51,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,7 +71,7 @@ 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")
@@ -115,13 +117,13 @@ trait PullRequestsControllerBase extends ControllerBase {
      val owner = repository.owner
      val name  = repository.name
      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
-        val hasConflict = LockUtil.lock(s"${owner}/${name}"){
+        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),
@@ -258,13 +260,29 @@ trait PullRequestsControllerBase extends ControllerBase {
            // record activity
            recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
            val revCommits = using(new RevWalk( git.getRepository )){ revWalk =>
              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" =>
-            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
+                rebasePullRequest(git, pullreq.branch, issueId, revCommits,
-              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
+                  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
@@ -324,8 +342,8 @@ 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(
      originRepositoryName <- if(originOwner == forkedOwner) {
@@ -333,7 +351,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        Some(forkedRepository.name)
      } 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).find(_.userName == originOwner).map(_.repositoryName)
      } else if(Some(originOwner) == forkedRepository.repository.originUserName){
        // Original repository
        forkedRepository.repository.originRepositoryName
@@ -381,9 +399,12 @@ 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)) => getRepository(userName, repositoryName) match {
-                case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+                  case Some(x) => x.repository :: getForkedRepositories(userName, repositoryName)
-              }).filter { case (owner, name) => hasGuestRole(owner, name, context.loginAccount) },
+                  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,
@@ -411,15 +432,15 @@ 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(
      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)
@@ -434,7 +455,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          checkConflict(originRepository.owner, originRepository.name, originBranch,
                        forkedRepository.owner, forkedRepository.name, forkedBranch)
        }
-        html.mergecheck(conflict)
+        html.mergecheck(conflict.isDefined)
      }
    }) getOrElse NotFound()
  })
@@ -499,13 +520,42 @@ 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(':')){
      val array = value.split(":")
      (array(0), array(1))
--- a/src/main/scala/gitbucket/core/controller/ReleasesController.scala
+++ b/src/main/scala/gitbucket/core/controller/ReleasesController.scala
@@ -0,0 +1,151 @@
 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 tag = params("tag")
    getRelease(repository.owner, repository.name, tag).map { release =>
      html.release(release, getReleaseAssets(repository.owner, repository.name, tag), hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
    }.getOrElse(NotFound())
  })
  get("/:owner/:repository/releases/:tag/assets/:fileId")(referrersOnly {repository =>
    val tag = params("tag")
    val fileId = params("fileId")
    (for {
      _     <- repository.tags.find(_.name == tag)
      _     <- getRelease(repository.owner, repository.name, tag)
      asset <- getReleaseAsset(repository.owner, repository.name, tag, fileId)
    } yield {
      response.setHeader("Content-Disposition", s"attachment; filename=${asset.label}")
      RawData(
        FileUtil.getMimeType(asset.label),
        new File(getReleaseFilesDir(repository.owner, repository.name), tag + "/" + fileId)
      )
    }).getOrElse(NotFound())
  })
  get("/:owner/:repository/releases/:tag/create")(writableUsersOnly {repository =>
    html.form(repository, params("tag"), None)
  })
  post("/:owner/:repository/releases/:tag/create", releaseForm)(writableUsersOnly { (form, repository) =>
    val tag = params("tag")
    val loginAccount = context.loginAccount.get
    // Insert into RELEASE
    createRelease(repository.owner, repository.name, form.name, form.content, tag, loginAccount)
    // Insert into RELEASE_ASSET
    request.getParameterNames.asScala.filter(_.startsWith("file:")).foreach { paramName =>
      val Array(_, fileId) = paramName.split(":")
      val fileName = params(paramName)
      val size = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tag + "/" + fileId).length
      createReleaseAsset(repository.owner, repository.name, tag, fileId, fileName, size, loginAccount)
    }
    recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name)
    redirect(s"/${repository.owner}/${repository.name}/releases/${tag}")
  })
  get("/:owner/:repository/releases/:tag/edit")(writableUsersOnly {repository =>
    val tag = params("tag")
    getRelease(repository.owner, repository.name, tag).map { release =>
      html.form(repository, release.tag, Some(release, getReleaseAssets(repository.owner, repository.name, tag)))
    }.getOrElse(NotFound())
  })
  post("/:owner/:repository/releases/:tag/edit", releaseForm)(writableUsersOnly { (form, repository) =>
    val tag = params("tag")
    val loginAccount = context.loginAccount.get
    getRelease(repository.owner, repository.name, tag).map { release =>
      // Update RELEASE
      updateRelease(repository.owner, repository.name, tag, form.name, form.content)
      // Delete and Insert RELEASE_ASSET
      val assets = getReleaseAssets(repository.owner, repository.name, tag)
      deleteReleaseAssets(repository.owner, repository.name, tag)
      val fileIds = request.getParameterNames.asScala.filter(_.startsWith("file:")).map { paramName =>
        val Array(_, fileId) = paramName.split(":")
        val fileName = params(paramName)
        val size = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), release.tag + "/" + fileId).length
        createReleaseAsset(repository.owner, repository.name, tag, fileId, fileName, size, loginAccount)
        fileId
      }
      assets.foreach { asset =>
        if(!fileIds.contains(asset.fileName)){
          val file = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), release.tag + "/" + asset.fileName)
          FileUtils.forceDelete(file)
        }
      }
      redirect(s"/${release.userName}/${release.repositoryName}/releases/${tag}")
    }.getOrElse(NotFound())
  })
  post("/:owner/:repository/releases/:tag/delete")(writableUsersOnly { repository =>
    val tag = params("tag")
    getRelease(repository.owner, repository.name, tag).foreach { release =>
      FileUtils.deleteDirectory(new File(getReleaseFilesDir(repository.owner, repository.name), release.tag))
    }
    deleteRelease(repository.owner, repository.name, tag)
    redirect(s"/${repository.owner}/${repository.name}/releases")
  })
 }
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/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
@@ -139,6 +142,9 @@ trait RepositorySettingsControllerBase extends ControllerBase {
          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))
    }
@@ -175,7 +181,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      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"))
    }
@@ -343,20 +350,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
            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()) {
            FileUtils.moveDirectory(dir, getLfsDir(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))
+            FileUtils.moveDirectory(dir, getRepositoryFilesDir(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))
@@ -376,9 +375,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      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 +390,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."
@@ -435,12 +432,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  }
  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
@@ -466,10 +463,13 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Duplicate check for the rename repository name.
   */
  private def renameRepositoryName: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
-      params.get("repository").filter(_ != value).flatMap { _ =>
+      for {
-        params.get("owner").flatMap { userName =>
+        repoName <- params.optionValue("repository") if repoName != value
-          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        userName <- params.optionValue("owner")
        _        <- getRepositoryNamesOfUser(userName).find(_ == value)
      } yield {
        "Repository already exists."
      }
    }
  }
@@ -478,7 +478,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   *
   */
  private def featureOption: 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] =
      if(Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
  }
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -17,13 +17,15 @@ 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
@@ -147,13 +149,31 @@ 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") => defining(request.paths) { paths =>
-        getRepository(paths(0), paths(1)).map(gitbucket.core.html.goget(_))getOrElse NotFound()
+          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.
@@ -320,7 +340,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      commit      = form.commit
    )
-    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+    redirect(s"/${repository.owner}/${repository.name}/blob/${urlEncode(form.branch)}/${
      if (form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
    }")
  })
@@ -381,13 +401,7 @@ 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/*"){
@@ -402,7 +416,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    contentType = formats("json")
    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
-      Map(
+      Serialization.write(Map(
        "root"  -> s"${context.baseUrl}/${repository.owner}/${repository.name}",
        "id"    -> id,
        "path"  -> path,
@@ -417,8 +431,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            "prevPath" -> blame.prevPath,
            "commited" -> blame.commitTime.getTime,
            "message"  -> blame.message,
-            "lines"    -> blame.lines)
+            "lines" -> blame.lines
-        })
+          )
        }))
    }
  })
@@ -431,8 +446,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    try {
      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
        defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) { revCommit =>
-          JGitUtil.getDiffs(git, id) match {
+          val diffs = JGitUtil.getDiffs(git, None, id, true, false)
-            case (diffs, oldCommitId) =>
+          val oldCommitId = JGitUtil.getParentCommitId(git, id)
          html.commit(id, new JGitUtil.CommitInfo(revCommit),
            JGitUtil.getBranchesOfCommit(git, revCommit.getName),
            JGitUtil.getTagsOfCommit(git, revCommit.getName),
@@ -440,12 +456,36 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            repository, diffs, oldCommitId, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
        }
      }
    } catch {
      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,
@@ -478,9 +518,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
    form.issueId match {
      case Some(issueId) =>
        getPullRequest(repository.owner, repository.name, issueId).foreach { case (issue, pullRequest) =>
          recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content)
-        callPullRequestReviewCommentWebHook("create", comment, repository, issueId, context.baseUrl, context.loginAccount.get)
+          PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId, form.content, issue, repository))
-      case None => recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content)
+          callPullRequestReviewCommentWebHook("create", comment, repository, issue, pullRequest, context.baseUrl, context.loginAccount.get)
        }
      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)
  })
@@ -584,8 +628,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")
  })
  /**
@@ -609,7 +653,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          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)
@@ -713,11 +758,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        f(git, headTip, builder, inserter)
        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
-          headName, loginAccount.userName, loginAccount.mailAddress, message)
+          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)
@@ -738,6 +801,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            // close issue by commit message
            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))
@@ -750,6 +818,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        }
      }
    }
  }
  private val readmeFiles = PluginRegistry().renderableExtensions.map { extension =>
    s"readme.${extension}"
@@ -773,7 +842,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
            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 =>
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -2,27 +2,33 @@ 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 scala.collection.JavaConverters._
+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
 case class Table(name: String, columns: Seq[Column])
 case class Column(name: String, primaryKey: Boolean)
 trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  self: AccountService with RepositoryService with AdminAuthenticator =>
@@ -64,6 +70,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
        "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
        "keystore"                 -> trim(label("Keystore", optional(text())))
    )(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(
@@ -152,6 +165,71 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  )(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"))
  })
@@ -174,9 +252,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
@@ -257,12 +338,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  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 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 {
--- a/src/main/scala/gitbucket/core/controller/ValidationSupport.scala
+++ b/src/main/scala/gitbucket/core/controller/ValidationSupport.scala
@@ -0,0 +1,91 @@
 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)
 }
--- a/src/main/scala/gitbucket/core/controller/WikiController.scala
+++ b/src/main/scala/gitbucket/core/controller/WikiController.scala
@@ -10,7 +10,7 @@ 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
@@ -76,7 +76,7 @@ trait WikiControllerBase extends ControllerBase {
    val Array(from, to) = params("commitId").split("\\.\\.\\.")
    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(Some(pageName), from, to, JGitUtil.getDiffs(git, Some(from), to, true, false).filter(_.newPath == pageName + ".md"), repository,
        isEditable(repository), flash.get("info"))
    }
  })
@@ -85,7 +85,7 @@ trait WikiControllerBase extends ControllerBase {
    val Array(from, to) = params("commitId").split("\\.\\.\\.")
    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
+      html.compare(None, from, to, JGitUtil.getDiffs(git, Some(from), to, true, false), repository,
        isEditable(repository), flash.get("info"))
    }
  })
@@ -219,15 +219,18 @@ 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(){
-    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] =
-      getWikiPageList(params("owner"), params("repository")).find(_ == value).map(_ => "Page already exists.")
+      getWikiPageList(params.value("owner"), params.value("repository")).find(_ == value).map(_ => "Page already exists.")
  }
  private def pagename: Constraint = new Constraint(){
--- a/src/main/scala/gitbucket/core/model/AccountFederation.scala
+++ b/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)
--- a/src/main/scala/gitbucket/core/model/Profile.scala
+++ b/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
@@ -61,7 +61,10 @@ trait CoreProfile extends ProfileProvider with Profile
  with RepositoryWebHookEventComponent
  with AccountWebHookComponent
  with AccountWebHookEventComponent
  with AccountFederationComponent
  with ProtectedBranchComponent
  with DeployKeyComponent
  with ReleaseComponent
  with ReleaseAssetComponent
 object Profile extends CoreProfile
--- a/src/main/scala/gitbucket/core/model/Release.scala
+++ b/src/main/scala/gitbucket/core/model/Release.scala
@@ -0,0 +1,34 @@
 package gitbucket.core.model
 trait ReleaseComponent extends TemplateComponent {
  self: Profile =>
  import profile.api._
  import self._
  lazy val Releases = TableQuery[Releases]
  class Releases(tag_ : Tag) extends Table[Release](tag_, "RELEASE") 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) <> (Release.tupled, Release.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 Release(
  userName: String,
  repositoryName: String,
  name: String,
  tag: String,
  author: String,
  content: Option[String],
  registeredDate: java.util.Date,
  updatedDate: java.util.Date
 )
--- a/src/main/scala/gitbucket/core/model/ReleasesAsset.scala
+++ b/src/main/scala/gitbucket/core/model/ReleasesAsset.scala
@@ -0,0 +1,40 @@
 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
 )
--- a/src/main/scala/gitbucket/core/plugin/IssueHook.scala
+++ b/src/main/scala/gitbucket/core/plugin/IssueHook.scala
@@ -3,18 +3,20 @@ 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)(implicit session: Session, context: Context): Unit = ()
-  def closed(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def closed(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
-  def reopened(issue: Issue, repository: RepositoryInfo)(implicit 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 = ()
 }
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/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
 /**
@@ -241,6 +242,17 @@ abstract class Plugin {
   */
  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.
@@ -312,6 +324,9 @@ abstract class Plugin {
    (suggestionProviders ++ suggestionProviders(registry, context, settings)).foreach { suggestionProvider =>
      registry.addSuggestionProvider(suggestionProvider)
    }
    (sshCommandProviders ++ sshCommandProviders(registry, context, settings)).foreach { sshCommandProvider =>
      registry.addSshCommandProvider(sshCommandProvider)
    }
  }
  /**
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.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)
@@ -178,6 +176,10 @@ 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
 }
 /**
@@ -257,13 +259,14 @@ object PluginRegistry {
    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)
    (extraJars ++ pluginJars).foreach { pluginJar =>
      val installedJar = new File(installedDir, pluginJar.getName)
      FileUtils.copyFile(pluginJar, installedJar)
      logger.info(s"Initialize ${pluginJar.getName}")
@@ -400,13 +403,16 @@ class PluginWatchThread(context: ServletContext, dir: String) extends Thread wit
          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 {
--- a/src/main/scala/gitbucket/core/plugin/PluginRepository.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRepository.scala
@@ -35,7 +35,9 @@ case class PluginMetadata(
 case class VersionDef(
  version: String,
-  file: String,
+  url: String,
  range: String
-)
+){
  lazy val file = url.substring(url.lastIndexOf("/") + 1)
 }
--- a/src/main/scala/gitbucket/core/plugin/Renderer.scala
+++ b/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
 /**
@@ -33,12 +34,7 @@ object MarkdownRenderer extends Renderer {
 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>"
    )
  }
 }
--- a/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
+++ b/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
@@ -3,15 +3,92 @@ package gitbucket.core.plugin
 import gitbucket.core.controller.Context
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 /**
 * The base trait of suggestion providers which supplies completion proposals in some text areas.
 */
 trait SuggestionProvider {
  /**
   * The identifier of this suggestion provider.
   * You must specify the unique identifier in the all suggestion providers.
   */
  val id: String
  /**
   * The trigger of this suggestion provider. When user types this character, the proposal list would be displayed.
   * Also this is used as the prefix of the replaced string.
   */
  val prefix: String
  /**
   * The suffix of the replaced string. The default is `" "`.
   */
  val suffix: String = " "
  /**
   * Which contexts is this suggestion provider enabled. Currently, available contexts are `"issues"` and `"wiki"`.
   */
  val context: Seq[String]
-  def values(repository: RepositoryInfo): Seq[String]
+  /**
-  def template(implicit context: Context): String = "value"
+   * If this suggestion provider has static proposal list, override this method to return it.
   *
   * The returned sequence is rendered as follows:
   * <pre>
   * [
   *   {
   *     "label" -> "value1",
   *     "value" -> "value1"
   *   },
   *   {
   *     "label" -> "value2",
   *     "value" -> "value2"
   *   },
   * ]
   * </pre>
   *
   * Each element can be accessed as `option` in `template()` or `replace()` method.
   */
  def values(repository: RepositoryInfo): Seq[String] = Nil
  /**
   * If this suggestion provider has static proposal list, override this method to return it.
   *
   * If your proposals have label and value, use this method instead of `values()`.
   * The first element of tuple is used as a value, and the second element is used as a label.
   *
   * The returned sequence is rendered as follows:
   * <pre>
   * [
   *   {
   *     "label" -> "label1",
   *     "value" -> "value1"
   *   },
   *   {
   *     "label" -> "label2",
   *     "value" -> "value2"
   *   },
   * ]
   * </pre>
   *
   * Each element can be accessed as `option` in `template()` or `replace()` method.
   */
  def options(repository: RepositoryInfo): Seq[(String, String)] = values(repository).map { value => (value, value) }
  /**
   * JavaScript fragment to generate a label of completion proposal. The default is: `option.label`.
   */
  def template(implicit context: Context): String = "option.label"
  /**
   * JavaScript fragment to generate a replaced value of completion proposal. The default is: `option.value`
   */
  def replace(implicit context: Context): String = "option.value"
  /**
   * If this suggestion provider needs some additional process to assemble the proposal list (e.g. It need to use Ajax
   * to get a proposal list from the server), then override this method and return any JavaScript code.
   */
  def additionalScript(implicit context: Context): String = ""
 }
@@ -20,8 +97,6 @@ class UserNameSuggestionProvider extends SuggestionProvider {
  override val id: String = "user"
  override val prefix: String = "@"
  override val context: Seq[String] = Seq("issues")
  override def values(repository: RepositoryInfo): Seq[String] = Nil
  override def template(implicit context: Context): String = "'@' + value"
  override def additionalScript(implicit context: Context): String =
    s"""$$.get('${context.path}/_user/proposals', { query: '', user: true, group: false }, function (data) { user = data.options; });"""
 }
--- a/src/main/scala/gitbucket/core/service/AccountFederationService.scala
+++ b/src/main/scala/gitbucket/core/service/AccountFederationService.scala
@@ -0,0 +1,77 @@
 package gitbucket.core.service
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.{AccountFederations, Accounts}
 import gitbucket.core.model.{Account, AccountFederation}
 import gitbucket.core.util.SyntaxSugars.~
 import org.slf4j.LoggerFactory
 trait AccountFederationService {
  self: AccountService =>
  private val logger = LoggerFactory.getLogger(classOf[AccountFederationService])
  /**
    * Get or create a user account federated with OIDC or SAML IdP.
    *
    * @param issuer            Issuer
    * @param subject           Subject
    * @param mailAddress       Mail address
    * @param preferredUserName Username (if this is none, username will be generated from the mail address)
    * @param fullName          Fullname (defaults to username)
    * @return Account
    */
  def getOrCreateFederatedUser(issuer: String,
                               subject: String,
                               mailAddress: String,
                               preferredUserName: Option[String],
                               fullName: Option[String])(implicit s: Session): Option[Account] =
    getAccountByFederation(issuer, subject) match {
      case Some(account) if !account.isRemoved =>
        Some(account)
      case Some(account) =>
        logger.info(s"Federated user found but disabled: userName=${account.userName}, isRemoved=${account.isRemoved}")
        None
      case None =>
        findAvailableUserName(preferredUserName, mailAddress) flatMap { userName =>
          createAccount(userName, "", fullName.getOrElse(userName), mailAddress, isAdmin = false, None, None)
          createAccountFederation(issuer, subject, userName)
          getAccountByUserName(userName)
        }
    }
  private def extractSafeStringForUserName(s: String) = """^[a-zA-Z0-9][a-zA-Z0-9\-_.]*""".r.findPrefixOf(s)
  /**
    * Find an available username from the preferred username or mail address.
    *
    * @param mailAddress       Mail address
    * @param preferredUserName Username
    * @return Available username
    */
  def findAvailableUserName(preferredUserName: Option[String], mailAddress: String)(implicit s: Session): Option[String] = {
    preferredUserName.flatMap(n => extractSafeStringForUserName(n)).orElse(extractSafeStringForUserName(mailAddress)) match {
      case Some(safeUserName) =>
        getAccountByUserName(safeUserName, includeRemoved = true) match {
          case None => Some(safeUserName)
          case Some(_) =>
            logger.info(s"User ($safeUserName) already exists. preferredUserName=$preferredUserName, mailAddress=$mailAddress")
            None
        }
      case None =>
        logger.info(s"Could not extract username from preferredUserName=$preferredUserName, mailAddress=$mailAddress")
        None
    }
  }
  def getAccountByFederation(issuer: String, subject: String)(implicit s: Session): Option[Account] =
    AccountFederations.filter(_.byPrimaryKey(issuer, subject))
      .join(Accounts).on { case af ~ ac => af.userName === ac.userName }
      .map { case _ ~ ac => ac }
      .firstOption
  def createAccountFederation(issuer: String, subject: String, userName: String)(implicit s: Session): Unit =
    AccountFederations insert AccountFederation(issuer, subject, userName)
 }
 object AccountFederationService extends AccountFederationService with AccountService
--- a/src/main/scala/gitbucket/core/service/AccountService.scala
+++ b/src/main/scala/gitbucket/core/service/AccountService.scala
@@ -96,11 +96,13 @@ trait AccountService {
  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
    Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
-  def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
+  def getAllUsers(includeRemoved: Boolean = true, includeGroups: Boolean = true)(implicit s: Session): List[Account] =
-    if(includeRemoved){
+  {
-      Accounts sortBy(_.userName) list
+    Accounts filter { t =>
-    } else {
+      (1.bind === 1.bind) &&
-      Accounts filter (_.removed === false.bind) sortBy(_.userName) list
+        (t.groupAccount === false.bind, !includeGroups) &&
        (t.removed === false.bind, !includeRemoved)
    } sortBy(_.userName) list
  }
  def isLastAdministrator(account: Account)(implicit s: Session): Boolean = {
--- a/src/main/scala/gitbucket/core/service/ActivityService.scala
+++ b/src/main/scala/gitbucket/core/service/ActivityService.scala
@@ -190,6 +190,13 @@ trait ActivityService {
      Some(message),
      currentDate)
  def recordReleaseActivity(userName: String, repositoryName: String, activityUserName: String, name: String)(implicit s: Session): Unit =
    Activities insert Activity(userName, repositoryName, activityUserName,
      "release",
      s"[user:${activityUserName}] released ${name} at [repo:${userName}/${repositoryName}]",
      None,
      currentDate)
  private def cut(value: String, length: Int): String =
    if(value.length > length) value.substring(0, length) + "..." else value
 }
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -202,15 +202,16 @@ trait IssuesService {
   * @return (issue, issueUser, commentCount, pullRequest, headRepo, headOwner)
   */
  def searchPullRequestByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*)
-                            (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = {
+                            (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] = {
    // get issues and comment count and labels
    searchIssueQueryBase(condition, true, offset, limit, repos)
-      .join(PullRequests).on { case t1 ~ t2 ~ i ~ t3                => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
+      .join    (PullRequests).on { case t1 ~ t2 ~ i ~ t3                     => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
-      .join(Repositories).on { case t1 ~ t2 ~ i ~ t3 ~ t4           => t4.byRepository(t1.userName, t1.repositoryName) }
+      .join    (Repositories).on { case t1 ~ t2 ~ i ~ t3 ~ t4                => t4.byRepository(t1.userName, t1.repositoryName) }
-      .join(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5      => t5.userName === t1.openedUserName }
+      .join    (Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5           => t5.userName === t1.openedUserName }
-      .join(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t6.userName === t4.userName }
+      .join    (Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6      => t6.userName === t4.userName }
-      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
+      .joinLeft(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => t7.userName === t1.assignedUserName}
-      .map    { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => (t1, t5, t2.commentCount, t3, t4, t6) }
+      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => i asc }
      .map    { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => (t1, t5, t2.commentCount, t3, t4, t6, t7) }
      .list
  }
@@ -368,8 +369,15 @@ trait IssuesService {
  def deleteComment(issueId: Int, commentId: Int)(implicit s: Session): Int = {
    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
    IssueComments.filter(_.byPrimaryKey(commentId)).firstOption match {
      case Some(c) if c.action == "reopen_comment" =>
        IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.action)).update("Reopen", "reopen")
      case Some(c) if c.action == "close_comment" =>
        IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.action)).update("Close", "close")
      case Some(_) =>
        IssueComments.filter(_.byPrimaryKey(commentId)).delete
    }
  }
  def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean)(implicit s: Session): Int = {
    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.closed, t.updatedDate)).update(closed, currentDate)
@@ -455,9 +463,8 @@ trait IssuesService {
  def createIssueComment(owner: String, repository: String, commit: CommitInfo)(implicit s: Session): Unit = {
    extractIssueId(commit.fullMessage).foreach { issueId =>
      if(getIssue(owner, repository, issueId).isDefined){
-        getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
+        val userName = getAccountByMailAddress(commit.committerEmailAddress).map(_.userName).getOrElse(commit.committerName)
-          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+        createComment(owner, repository, userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
        }
      }
    }
  }
--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/src/main/scala/gitbucket/core/service/MergeService.scala
@@ -3,40 +3,55 @@ package gitbucket.core.service
 import gitbucket.core.model.Account
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.SyntaxSugars._
-
+import org.eclipse.jgit.merge.{MergeStrategy, Merger, RecursiveMerger}
 import org.eclipse.jgit.merge.MergeStrategy
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.transport.RefSpec
 import org.eclipse.jgit.errors.NoMergeBaseException
-import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent, Repository}
+import org.eclipse.jgit.lib.{CommitBuilder, ObjectId, PersonIdent, Repository}
-import org.eclipse.jgit.revwalk.RevWalk
+import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
 import scala.collection.JavaConverters._
 trait MergeService {
  import MergeService._
  /**
   * Checks whether conflict will be caused in merging within pull request.
   * Returns true if conflict will be caused.
   */
-  def checkConflict(userName: String, repositoryName: String, branch: String, issueId: Int): Boolean = {
+  def checkConflict(userName: String, repositoryName: String, branch: String, issueId: Int): Option[String] = {
    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
-      MergeCacheInfo(git, branch, issueId).checkConflict()
+      new MergeCacheInfo(git, branch, issueId).checkConflict()
    }
  }
  /**
   * Checks whether conflict will be caused in merging within pull request.
   * only cache check.
   * Returns Some(true) if conflict will be caused.
   * Returns None if cache has not created yet.
   */
-  def checkConflictCache(userName: String, repositoryName: String, branch: String, issueId: Int): Option[Boolean] = {
+  def checkConflictCache(userName: String, repositoryName: String, branch: String, issueId: Int): Option[Option[String]] = {
    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
-      MergeCacheInfo(git, branch, issueId).checkConflictCache()
+      new MergeCacheInfo(git, branch, issueId).checkConflictCache()
    }
  }
-  /** merge pull request */
+
-  def mergePullRequest(git:Git, branch: String, issueId: Int, message:String, committer:PersonIdent): Unit = {
+  /** merge the pull request with a merge commit */
-    MergeCacheInfo(git, branch, issueId).merge(message, committer)
+  def mergePullRequest(git: Git, branch: String, issueId: Int, message: String, committer: PersonIdent): Unit = {
    new MergeCacheInfo(git, branch, issueId).merge(message, committer)
  }
  /** rebase to the head of the pull request branch */
  def rebasePullRequest(git: Git, branch: String, issueId: Int, commits: Seq[RevCommit], committer: PersonIdent): Unit = {
    new MergeCacheInfo(git, branch, issueId).rebase(committer, commits)
  }
  /** squash commits in the pull request and append it */
  def squashPullRequest(git: Git, branch: String, issueId: Int, message: String, committer: PersonIdent): Unit = {
    new MergeCacheInfo(git, branch, issueId).squash(message, committer)
  }
  /** fetch remote branch to my repository refs/pull/{issueId}/head */
  def fetchAsPullRequest(userName: String, repositoryName: String, requestUserName: String, requestRepositoryName: String, requestBranch:String, issueId:Int){
    using(Git.open(getRepositoryDir(userName, repositoryName))){ git =>
@@ -46,11 +61,12 @@ trait MergeService {
        .call
    }
  }
  /**
   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
   */
  def tryMergeRemote(localUserName: String, localRepositoryName: String, localBranch: String,
-                      remoteUserName: String, remoteRepositoryName: String, remoteBranch: String): Option[(ObjectId, ObjectId, ObjectId)] = {
+                      remoteUserName: String, remoteRepositoryName: String, remoteBranch: String): Either[String, (ObjectId, ObjectId, ObjectId)] = {
    using(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
      val remoteRefName = s"refs/heads/${remoteBranch}"
      val tmpRefName = s"refs/remote-temp/${remoteUserName}/${remoteRepositoryName}/${remoteBranch}"
@@ -67,12 +83,12 @@ trait MergeService {
        val mergeTip = git.getRepository.resolve(tmpRefName)
        try {
          if(merger.merge(mergeBaseTip, mergeTip)){
-            Some((merger.getResultTreeId, mergeBaseTip, mergeTip))
+            Right((merger.getResultTreeId, mergeBaseTip, mergeTip))
          } else {
-            None
+            Left(createConflictMessage(mergeTip, mergeBaseTip, merger))
          }
        } catch {
-          case e: NoMergeBaseException =>  None
+          case e: NoMergeBaseException => Left(e.toString)
        }
      } finally {
        val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
@@ -81,30 +97,33 @@ trait MergeService {
      }
    }
  }
  /**
-   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
+   * Checks whether conflict will be caused in merging. Returns `Some(errorMessage)` if conflict will be caused.
   */
  def checkConflict(userName: String, repositoryName: String, branch: String,
-                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean =
+                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Option[String] =
-    tryMergeRemote(userName, repositoryName, branch, requestUserName, requestRepositoryName, requestBranch).isEmpty
+    tryMergeRemote(userName, repositoryName, branch, requestUserName, requestRepositoryName, requestBranch).left.toOption
  def pullRemote(localUserName: String, localRepositoryName: String, localBranch: String,
                      remoteUserName: String, remoteRepositoryName: String, remoteBranch: String,
                      loginAccount: Account, message: String): Option[ObjectId] = {
-    tryMergeRemote(localUserName, localRepositoryName, localBranch, remoteUserName, remoteRepositoryName, remoteBranch).map{ case (newTreeId, oldBaseId, oldHeadId) =>
+    tryMergeRemote(localUserName, localRepositoryName, localBranch, remoteUserName, remoteRepositoryName, remoteBranch).map { case (newTreeId, oldBaseId, oldHeadId) =>
      using(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
        val committer = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
        val newCommit = Util.createMergeCommit(git.getRepository, newTreeId, committer, message, Seq(oldBaseId, oldHeadId))
        Util.updateRefs(git.getRepository, s"refs/heads/${localBranch}", newCommit, false, committer, Some("merge"))
      }
      oldBaseId
-    }
+    }.toOption
  }
 }
 object MergeService{
  object Util{
-    // return treeId
+    // return merge commit id
    def createMergeCommit(repository: Repository, treeId: ObjectId, committer: PersonIdent, message: String, parents: Seq[ObjectId]): ObjectId = {
      val mergeCommit = new CommitBuilder()
      mergeCommit.setTreeId(treeId)
@@ -113,14 +132,14 @@ object MergeService{
      mergeCommit.setCommitter(committer)
      mergeCommit.setMessage(message)
      // insertObject and got mergeCommit Object Id
-      val inserter = repository.newObjectInserter
+      using(repository.newObjectInserter){ inserter =>
        val mergeCommitId = inserter.insert(mergeCommit)
        inserter.flush()
      inserter.close()
        mergeCommitId
      }
-    def updateRefs(repository: Repository, ref: String, newObjectId: ObjectId, force: Boolean, committer: PersonIdent, refLogMessage: Option[String] = None):Unit = {
+    }
-      // update refs
+
    def updateRefs(repository: Repository, ref: String, newObjectId: ObjectId, force: Boolean, committer: PersonIdent, refLogMessage: Option[String] = None): Unit = {
      val refUpdate = repository.updateRef(ref)
      refUpdate.setNewObjectId(newObjectId)
      refUpdate.setForceUpdate(force)
@@ -129,33 +148,41 @@ object MergeService{
      refUpdate.update()
    }
  }
-  case class MergeCacheInfo(git:Git, branch:String, issueId:Int){
+
-    val repository = git.getRepository
+  class MergeCacheInfo(git: Git, branch: String, issueId: Int){
-    val mergedBranchName = s"refs/pull/${issueId}/merge"
+
-    val conflictedBranchName = s"refs/pull/${issueId}/conflict"
+    private val repository = git.getRepository
    private val mergedBranchName     = s"refs/pull/${issueId}/merge"
    private val conflictedBranchName = s"refs/pull/${issueId}/conflict"
    lazy val mergeBaseTip = repository.resolve(s"refs/heads/${branch}")
    lazy val mergeTip     = repository.resolve(s"refs/pull/${issueId}/head")
-    def checkConflictCache(): Option[Boolean] = {
+
-      Option(repository.resolve(mergedBranchName)).flatMap{ merged =>
+    def checkConflictCache(): Option[Option[String]] = {
      Option(repository.resolve(mergedBranchName)).flatMap { merged =>
          if(parseCommit(merged).getParents().toSet == Set( mergeBaseTip, mergeTip )){
            // merged branch exists
-            Some(false)
+            Some(None)
          } else {
            None
          }
      }.orElse(Option(repository.resolve(conflictedBranchName)).flatMap{ conflicted =>
-        if(parseCommit(conflicted).getParents().toSet == Set( mergeBaseTip, mergeTip )){
+        val commit = parseCommit(conflicted)
        if(commit.getParents().toSet == Set( mergeBaseTip, mergeTip )){
          // conflict branch exists
-          Some(true)
+          Some(Some(commit.getFullMessage))
        } else {
          None
        }
      })
    }
-    def checkConflict():Boolean ={
+
    def checkConflict(): Option[String] ={
      checkConflictCache.getOrElse(checkConflictForce)
    }
-    def checkConflictForce():Boolean ={
+
    def checkConflictForce(): Option[String] ={
      val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
      val conflicted = try {
        !merger.merge(mergeBaseTip, mergeTip)
@@ -164,35 +191,114 @@ object MergeService{
      }
      val mergeTipCommit = using(new RevWalk( repository ))(_.parseCommit( mergeTip ))
      val committer = mergeTipCommit.getCommitterIdent
-      def updateBranch(treeId:ObjectId, message:String, branchName:String){
+
      def _updateBranch(treeId: ObjectId, message: String, branchName: String){
        // creates merge commit
        val mergeCommitId = createMergeCommit(treeId, committer, message)
        Util.updateRefs(repository, branchName, mergeCommitId, true, committer)
      }
      if(!conflicted){
-        updateBranch(merger.getResultTreeId, s"Merge ${mergeTip.name} into ${mergeBaseTip.name}", mergedBranchName)
+        _updateBranch(merger.getResultTreeId, s"Merge ${mergeTip.name} into ${mergeBaseTip.name}", mergedBranchName)
        git.branchDelete().setForce(true).setBranchNames(conflictedBranchName).call()
        None
      } else {
-        updateBranch(mergeTipCommit.getTree().getId(), s"can't merge ${mergeTip.name} into ${mergeBaseTip.name}", conflictedBranchName)
+        val message = createConflictMessage(mergeTip, mergeBaseTip, merger)
        _updateBranch(mergeTipCommit.getTree().getId(), message, conflictedBranchName)
        git.branchDelete().setForce(true).setBranchNames(mergedBranchName).call()
        Some(message)
      }
      conflicted
    }
    // update branch from cache
-    def merge(message:String, committer:PersonIdent) = {
+    def merge(message: String, committer: PersonIdent) = {
-      if(checkConflict()){
+      if(checkConflict().isDefined){
        throw new RuntimeException("This pull request can't merge automatically.")
      }
-      val mergeResultCommit = parseCommit( Option(repository.resolve(mergedBranchName)).getOrElse(throw new RuntimeException(s"not found branch ${mergedBranchName}")) )
+      val mergeResultCommit = parseCommit(Option(repository.resolve(mergedBranchName)).getOrElse {
        throw new RuntimeException(s"Not found branch ${mergedBranchName}")
      })
      // creates merge commit
      val mergeCommitId = createMergeCommit(mergeResultCommit.getTree().getId(), committer, message)
      // update refs
      Util.updateRefs(repository, s"refs/heads/${branch}", mergeCommitId, false, committer, Some("merged"))
    }
    def rebase(committer: PersonIdent, commits: Seq[RevCommit]): Unit = {
      if(checkConflict().isDefined){
        throw new RuntimeException("This pull request can't merge automatically.")
      }
      def _cloneCommit(commit: RevCommit, parentId: ObjectId, baseId: ObjectId): CommitBuilder = {
        val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
        merger.merge(commit.toObjectId, baseId)
        val newCommit = new CommitBuilder()
        newCommit.setTreeId(merger.getResultTreeId)
        newCommit.addParentId(parentId)
        newCommit.setAuthor(commit.getAuthorIdent)
        newCommit.setCommitter(committer)
        newCommit.setMessage(commit.getFullMessage)
        newCommit
      }
      val mergeBaseTipCommit = using(new RevWalk( repository ))(_.parseCommit( mergeBaseTip ))
      var previousId = mergeBaseTipCommit.getId
      using(repository.newObjectInserter){ inserter =>
        commits.foreach { commit =>
          val nextCommit = _cloneCommit(commit, previousId, mergeBaseTipCommit.getId)
          previousId = inserter.insert(nextCommit)
        }
        inserter.flush()
      }
      Util.updateRefs(repository, s"refs/heads/${branch}", previousId, false, committer, Some("rebased"))
    }
    def squash(message: String, committer: PersonIdent): Unit = {
      if(checkConflict().isDefined){
        throw new RuntimeException("This pull request can't merge automatically.")
      }
      val mergeBaseTipCommit = using(new RevWalk( repository ))(_.parseCommit(mergeBaseTip))
      val mergeBranchHeadCommit = using(new RevWalk( repository ))(_.parseCommit(repository.resolve(mergedBranchName)))
      // Create squash commit
      val mergeCommit = new CommitBuilder()
      mergeCommit.setTreeId(mergeBranchHeadCommit.getTree.getId)
      mergeCommit.setParentId(mergeBaseTipCommit)
      mergeCommit.setAuthor(mergeBranchHeadCommit.getAuthorIdent)
      mergeCommit.setCommitter(committer)
      mergeCommit.setMessage(message)
      // insertObject and got squash commit Object Id
      val newCommitId = using(repository.newObjectInserter){ inserter =>
        val newCommitId = inserter.insert(mergeCommit)
        inserter.flush()
        newCommitId
      }
      Util.updateRefs(repository, mergedBranchName, newCommitId, true, committer)
      // rebase to squash commit
      Util.updateRefs(repository, s"refs/heads/${branch}", repository.resolve(mergedBranchName), false, committer, Some("squashed"))
    }
    // return treeId
    private def createMergeCommit(treeId: ObjectId, committer: PersonIdent, message: String) =
      Util.createMergeCommit(repository, treeId, committer, message, Seq[ObjectId](mergeBaseTip, mergeTip))
-    private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
+    private def parseCommit(id: ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
  }
  private def createConflictMessage(mergeTip: ObjectId, mergeBaseTip: ObjectId, merger: Merger): String = {
    val mergeResults = merger.asInstanceOf[RecursiveMerger].getMergeResults
    s"Can't merge ${mergeTip.name} into ${mergeBaseTip.name}\n\n" +
      "Conflicting files:\n" +
      mergeResults.asScala.map { case (key, _) => "- " + key + "\n" }.mkString
  }
 }
--- a/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala
+++ b/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala
@@ -0,0 +1,191 @@
 package gitbucket.core.service
 import java.net.URI
 import com.nimbusds.jose.JWSAlgorithm.Family
 import com.nimbusds.jose.proc.BadJOSEException
 import com.nimbusds.jose.util.DefaultResourceRetriever
 import com.nimbusds.jose.{JOSEException, JWSAlgorithm}
 import com.nimbusds.oauth2.sdk._
 import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic
 import com.nimbusds.oauth2.sdk.id.{ClientID, Issuer, State}
 import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet
 import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata
 import com.nimbusds.openid.connect.sdk.validators.IDTokenValidator
 import com.nimbusds.openid.connect.sdk.{AuthenticationErrorResponse, _}
 import gitbucket.core.model.Account
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.slf4j.LoggerFactory
 import scala.collection.JavaConverters.{asScalaSet, mapAsJavaMap}
 /**
  * Service class for the OpenID Connect authentication.
  */
 trait OpenIDConnectService {
  self: AccountFederationService =>
  private val logger = LoggerFactory.getLogger(classOf[OpenIDConnectService])
  private val JWK_REQUEST_TIMEOUT = 5000
  private val OIDC_SCOPE = new Scope(
    OIDCScopeValue.OPENID,
    OIDCScopeValue.EMAIL,
    OIDCScopeValue.PROFILE)
  /**
    * Obtain the OIDC metadata from discovery and create an authentication request.
    *
    * @param issuer      Issuer, used to construct the discovery endpoint URL, e.g. https://accounts.google.com
    * @param clientID    Client ID (given by the issuer)
    * @param redirectURI Redirect URI
    * @return Authentication request
    */
  def createOIDCAuthenticationRequest(issuer: Issuer,
                                      clientID: ClientID,
                                      redirectURI: URI): AuthenticationRequest = {
    val metadata = OIDCProviderMetadata.resolve(issuer)
    new AuthenticationRequest(
      metadata.getAuthorizationEndpointURI,
      new ResponseType(ResponseType.Value.CODE),
      OIDC_SCOPE,
      clientID,
      redirectURI,
      new State(),
      new Nonce())
  }
  /**
    * Proceed the OpenID Connect authentication.
    *
    * @param params      Query parameters of the authentication response
    * @param redirectURI Redirect URI
    * @param state       State saved in the session
    * @param nonce       Nonce saved in the session
    * @param oidc        OIDC settings
    * @return ID token
    */
  def authenticate(params: Map[String, String],
                   redirectURI: URI,
                   state: State,
                   nonce: Nonce,
                   oidc: SystemSettingsService.OIDC)(implicit s: Session): Option[Account] =
    validateOIDCAuthenticationResponse(params, state, redirectURI) flatMap { authenticationResponse =>
      obtainOIDCToken(authenticationResponse.getAuthorizationCode, nonce, redirectURI, oidc) flatMap { claims =>
        Seq("email", "preferred_username", "name").map(k => Option(claims.getStringClaim(k))) match {
          case Seq(Some(email), preferredUsername, name) =>
            getOrCreateFederatedUser(claims.getIssuer.getValue, claims.getSubject.getValue, email, preferredUsername, name)
          case _ =>
            logger.info(s"OIDC ID token must have an email claim: claims=${claims.toJSONObject}")
            None
        }
      }
    }
  /**
    * Validate the authentication response.
    *
    * @param params      Query parameters of the authentication response
    * @param state       State saved in the session
    * @param redirectURI Redirect URI
    * @return Authentication response
    */
  def validateOIDCAuthenticationResponse(params: Map[String, String], state: State, redirectURI: URI): Option[AuthenticationSuccessResponse] =
    try {
      AuthenticationResponseParser.parse(redirectURI, mapAsJavaMap(params)) match {
        case response: AuthenticationSuccessResponse =>
          if (response.getState == state) {
            Some(response)
          } else {
            logger.info(s"OIDC authentication state did not match: response(${response.getState}) != session($state)")
            None
          }
        case response: AuthenticationErrorResponse =>
          logger.info(s"OIDC authentication response has error: ${response.getErrorObject}")
          None
      }
    } catch {
      case e: ParseException =>
        logger.info(s"OIDC authentication response has error: $e")
        None
    }
  /**
    * Obtain the ID token from the OpenID Provider.
    *
    * @param authorizationCode Authorization code in the query string
    * @param nonce             Nonce
    * @param redirectURI       Redirect URI
    * @param oidc              OIDC settings
    * @return Token response
    */
  def obtainOIDCToken(authorizationCode: AuthorizationCode,
                      nonce: Nonce,
                      redirectURI: URI,
                      oidc: SystemSettingsService.OIDC): Option[IDTokenClaimsSet] = {
    val metadata = OIDCProviderMetadata.resolve(oidc.issuer)
    val tokenRequest = new TokenRequest(metadata.getTokenEndpointURI,
      new ClientSecretBasic(oidc.clientID, oidc.clientSecret),
      new AuthorizationCodeGrant(authorizationCode, redirectURI),
      OIDC_SCOPE)
    val httpResponse = tokenRequest.toHTTPRequest.send()
    try {
      OIDCTokenResponseParser.parse(httpResponse) match {
        case response: OIDCTokenResponse =>
          validateOIDCTokenResponse(response, metadata, nonce, oidc)
        case response: TokenErrorResponse =>
          logger.info(s"OIDC token response has error: ${response.getErrorObject.toJSONObject}")
          None
      }
    } catch {
      case e: ParseException =>
        logger.info(s"OIDC token response has error: $e")
        None
    }
  }
  /**
    * Validate the token response.
    *
    * @param response Token response
    * @param metadata OpenID Provider metadata
    * @param nonce    Nonce
    * @return Claims
    */
  def validateOIDCTokenResponse(response: OIDCTokenResponse,
                                metadata: OIDCProviderMetadata,
                                nonce: Nonce,
                                oidc: SystemSettingsService.OIDC): Option[IDTokenClaimsSet] =
    Option(response.getOIDCTokens.getIDToken) match {
      case Some(jwt) =>
        val validator = oidc.jwsAlgorithm map { jwsAlgorithm =>
          new IDTokenValidator(metadata.getIssuer, oidc.clientID, jwsAlgorithm, metadata.getJWKSetURI.toURL,
            new DefaultResourceRetriever(JWK_REQUEST_TIMEOUT, JWK_REQUEST_TIMEOUT))
        } getOrElse {
          new IDTokenValidator(metadata.getIssuer, oidc.clientID)
        }
        try {
          Some(validator.validate(jwt, nonce))
        } catch {
          case e@(_: BadJOSEException | _: JOSEException) =>
            logger.info(s"OIDC ID token has error: $e")
            None
        }
      case None =>
        logger.info(s"OIDC token response does not have a valid ID token: ${response.toJSONObject}")
        None
    }
 }
 object OpenIDConnectService {
  /**
    * All signature algorithms.
    */
  val JWS_ALGORITHMS: Map[String, Set[JWSAlgorithm]] = Seq(
    "HMAC" -> Family.HMAC_SHA,
    "RSA" -> Family.RSA,
    "ECDSA" -> Family.EC,
    "EdDSA" -> Family.ED
  ).toMap.map { case (name, family) => (name, asScalaSet(family).toSet) }
 }
--- a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
+++ b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
@@ -1,11 +1,10 @@
 package gitbucket.core.service
-import gitbucket.core.model.{ProtectedBranch, ProtectedBranchContext, CommitState}
+import gitbucket.core.model.{Session => _, _}
 import gitbucket.core.plugin.ReceiveHook
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
-
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
 import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}
 trait ProtectedBranchService {
@@ -46,12 +45,17 @@ trait ProtectedBranchService {
 object ProtectedBranchService {
-  class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService {
+  class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService with RepositoryService with AccountService {
    override def preReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)
                           (implicit session: Session): Option[String] = {
      val branch = command.getRefName.stripPrefix("refs/heads/")
      if(branch != command.getRefName){
        val repositoryInfo = getRepository(owner, repository)
        if(command.getType == ReceiveCommand.Type.DELETE && repositoryInfo.exists(_.repository.defaultBranch == branch)){
          Some(s"refusing to delete the branch: ${command.getRefName}.")
        } else {
          getProtectedBranchInfo(owner, repository, branch).getStopReason(receivePack.isAllowNonFastForwards, command, pusher)
        }
      } else {
        None
      }
@@ -74,10 +78,19 @@ object ProtectedBranchService {
     * Include administrators
     * Enforce required status checks for repository administrators.
     */
-    includeAdministrators: Boolean) extends AccountService with CommitStatusService {
+    includeAdministrators: Boolean) extends AccountService with RepositoryService with CommitStatusService {
    def isAdministrator(pusher: String)(implicit session: Session): Boolean =
-      pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager)
+      pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager) ||
        getCollaborators(owner, repository).exists { case (collaborator, isGroup) =>
          if(collaborator.role == Role.ADMIN.name){
            if(isGroup){
              getGroupMembers(collaborator.collaboratorName).exists(gm => gm.userName == pusher)
            } else {
              collaborator.collaboratorName == pusher
            }
          } else false
        }
    /**
     * Can't be force pushed
--- a/src/main/scala/gitbucket/core/service/PullRequestService.scala
+++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala
@@ -79,7 +79,7 @@ trait PullRequestService { self: IssuesService with CommitsService =>
      commitIdFrom,
      commitIdTo)
-  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean)
+  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Option[Boolean])
                              (implicit s: Session): List[PullRequest] =
    PullRequests
      .join(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
@@ -87,7 +87,7 @@ trait PullRequestService { self: IssuesService with CommitsService =>
        (t1.requestUserName       === userName.bind) &&
        (t1.requestRepositoryName === repositoryName.bind) &&
        (t1.requestBranch         === branch.bind) &&
-        (t2.closed                === closed.bind)
+        (t2.closed                === closed.get.bind, closed.isDefined)
      }
      .map { case (t1, t2) => t1 }
      .list
@@ -118,7 +118,7 @@ trait PullRequestService { self: IssuesService with CommitsService =>
   * Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
   */
  def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit =
-    getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
+    getPullRequestsByRequest(owner, repository, branch, Some(false)).foreach { pullreq =>
      if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
        // Update the git repository
        val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest(
@@ -230,7 +230,7 @@ trait PullRequestService { self: IssuesService with CommitsService =>
        helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
      }
-      val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)
+      val diffs = JGitUtil.getDiffs(newGit, Some(oldId.getName), newId.getName, true, false)
      (commits, diffs)
    }
@@ -244,8 +244,8 @@ object PullRequestService {
  case class PullRequestCount(userName: String, count: Int)
  case class MergeStatus(
-    hasConflict: Boolean,
+    conflictMessage: Option[String],
-    commitStatues:List[CommitStatus],
+    commitStatues: List[CommitStatus],
    branchProtection: ProtectedBranchService.ProtectedBranchInfo,
    branchIsOutOfDate: Boolean,
    hasUpdatePermission: Boolean,
@@ -253,6 +253,7 @@ object PullRequestService {
    hasMergePermission: Boolean,
    commitIdTo: String){
    val hasConflict = conflictMessage.isDefined
    val statuses: List[CommitStatus] =
      commitStatues ++ (branchProtection.contexts.toSet -- commitStatues.map(_.context).toSet).map(CommitStatus.pending(branchProtection.owner, branchProtection.repository, _))
    val hasRequiredStatusProblem = needStatusCheck && branchProtection.contexts.exists(context => statuses.find(_.context == context).map(_.state) != Some(CommitState.SUCCESS))
--- a/src/main/scala/gitbucket/core/service/ReleaseService.scala
+++ b/src/main/scala/gitbucket/core/service/ReleaseService.scala
@@ -0,0 +1,87 @@
 package gitbucket.core.service
 import gitbucket.core.controller.Context
 import gitbucket.core.model.{Account, Release, ReleaseAsset}
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.dateColumnType
 trait ReleaseService {
  self: AccountService with RepositoryService =>
  def createReleaseAsset(owner: String, repository: String, tag: String, fileName: String, label: String, size: Long, loginAccount: Account)(implicit s: Session): Unit = {
    ReleaseAssets insert ReleaseAsset(
      userName       = owner,
      repositoryName = repository,
      tag            = tag,
      fileName       = fileName,
      label          = label,
      size           = size,
      uploader       = loginAccount.userName,
      registeredDate = currentDate,
      updatedDate    = currentDate
    )
  }
  def getReleaseAssets(owner: String, repository: String, tag: String)(implicit s: Session): Seq[ReleaseAsset] = {
    ReleaseAssets.filter(x => x.byTag(owner, repository, tag)).list
  }
  def getReleaseAssetsMap(owner: String, repository: String)(implicit s: Session): Map[Release, Seq[ReleaseAsset]] = {
    val releases = getReleases(owner, repository)
    releases.map(rel => (rel -> getReleaseAssets(owner, repository, rel.tag))).toMap
  }
  def getReleaseAsset(owner: String, repository: String, tag: String, fileId: String)(implicit s: Session): Option[ReleaseAsset] = {
    ReleaseAssets.filter(x => x.byPrimaryKey(owner, repository, tag, fileId)) firstOption
  }
  def deleteReleaseAssets(owner: String, repository: String, tag: String)(implicit s: Session): Unit = {
    ReleaseAssets.filter(x => x.byTag(owner, repository, tag)) delete
  }
  def createRelease(owner: String, repository: String, name: String, content: Option[String], tag: String,
                    loginAccount: Account)(implicit context: Context, s: Session): Int = {
    Releases insert Release(
      userName       = owner,
      repositoryName = repository,
      name           = name,
      tag            = tag,
      author         = loginAccount.userName,
      content        = content,
      registeredDate = currentDate,
      updatedDate    = currentDate
    )
  }
  def getReleases(owner: String, repository: String)(implicit s: Session): Seq[Release] = {
    Releases.filter(x => x.byRepository(owner, repository)).list
  }
  def getRelease(owner: String, repository: String, tag: String)(implicit s: Session): Option[Release] = {
    //Releases filter (_.byPrimaryKey(owner, repository, releaseId)) firstOption
    Releases filter (_.byTag(owner, repository, tag)) firstOption
  }
 //  def getReleaseByTag(owner: String, repository: String, tag: String)(implicit s: Session): Option[Release] = {
 //    Releases filter (_.byTag(owner, repository, tag)) firstOption
 //  }
 //
 //  def getRelease(owner: String, repository: String, releaseId: String)(implicit s: Session): Option[Release] = {
 //    if (isInteger(releaseId))
 //      getRelease(owner, repository, releaseId.toInt)
 //    else None
 //  }
  def updateRelease(owner: String, repository: String, tag: String, title: String, content: Option[String])(implicit s: Session): Int = {
    Releases
      .filter (_.byPrimaryKey(owner, repository, tag))
      .map { t => (t.name, t.content, t.updatedDate) }
      .update (title, content, currentDate)
  }
  def deleteRelease(owner: String, repository: String, tag: String)(implicit s: Session): Unit = {
    deleteReleaseAssets(owner, repository, tag)
    Releases filter (_.byPrimaryKey(owner, repository, tag)) delete
  }
 }
--- a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
@@ -1,31 +1,83 @@
 package gitbucket.core.service
 import java.nio.file.Files
 import java.util.concurrent.ConcurrentHashMap
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.JGitUtil
+import gitbucket.core.util.{FileUtil, JGitUtil, LockUtil}
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, Role}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.servlet.Database
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.dircache.DirCache
-import org.eclipse.jgit.lib.{FileMode, Constants}
+import org.eclipse.jgit.lib.{Constants, FileMode}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 object RepositoryCreationService {
  private val Creating = new ConcurrentHashMap[String, Option[String]]()
  def isCreating(owner: String, repository: String): Boolean = {
    Option(Creating.get(s"${owner}/${repository}")).map(_.isEmpty).getOrElse(false)
  }
  def startCreation(owner: String, repository: String): Unit = {
    Creating.put(s"${owner}/${repository}", None)
  }
  def endCreation(owner: String, repository: String, error: Option[String]): Unit = {
    error match {
      case None => Creating.remove(s"${owner}/${repository}")
      case Some(error) => Creating.put(s"${owner}/${repository}", Some(error))
    }
  }
  def getCreationError(owner: String, repository: String): Option[String] = {
    Option(Creating.remove(s"${owner}/${repository}")).getOrElse(None)
  }
 }
 trait RepositoryCreationService {
  self: AccountService with RepositoryService with LabelsService with WikiService with ActivityService with PrioritiesService =>
-  def createRepository(loginAccount: Account, owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
+  def createRepository(loginAccount: Account, owner: String, name: String, description: Option[String],
-                      (implicit s: Session) {
+    isPrivate: Boolean, createReadme: Boolean): Future[Unit] = {
    createRepository(loginAccount, owner, name, description, isPrivate, if (createReadme) "README" else "EMPTY", None)
  }
  def createRepository(loginAccount: Account, owner: String, name: String, description: Option[String],
    isPrivate: Boolean, initOption: String, sourceUrl: Option[String]): Future[Unit] = Future {
    RepositoryCreationService.startCreation(owner, name)
    try {
      Database() withTransaction { implicit session =>
        val ownerAccount = getAccountByUserName(owner).get
        val loginUserName = loginAccount.userName
        val copyRepositoryDir = if (initOption == "COPY") {
          sourceUrl.flatMap { url =>
            val dir = Files.createTempDirectory(s"gitbucket-${owner}-${name}").toFile
            Git.cloneRepository().setBare(true).setURI(url).setDirectory(dir).setCloneAllBranches(true).call()
            Some(dir)
          }
        } else None
        // Insert to the database at first
        insertRepository(name, owner, description, isPrivate)
-//    // Add collaborators for group repository
+        //    // Add collaborators for group repository
-//    if(ownerAccount.isGroupAccount){
+        //    if(ownerAccount.isGroupAccount){
-//      getGroupMembers(owner).foreach { member =>
+        //      getGroupMembers(owner).foreach { member =>
-//        addCollaborator(owner, name, member.userName)
+        //        addCollaborator(owner, name, member.userName)
-//      }
+        //      }
-//    }
+        //    }
        // Insert default labels
        insertDefaultLabels(owner, name)
@@ -37,12 +89,12 @@ trait RepositoryCreationService {
        val gitdir = getRepositoryDir(owner, name)
        JGitUtil.initRepository(gitdir)
-    if(createReadme){
+        if (initOption == "README") {
-      using(Git.open(gitdir)){ git =>
+          using(Git.open(gitdir)) { git =>
            val builder = DirCache.newInCore.builder()
            val inserter = git.getRepository.newObjectInserter()
            val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-        val content  = if(description.nonEmpty){
+            val content = if (description.nonEmpty) {
              name + "\n" +
                "===============\n" +
                "\n" +
@@ -61,11 +113,94 @@ trait RepositoryCreationService {
          }
        }
        copyRepositoryDir.foreach { dir =>
          try {
            using(Git.open(dir)) { git =>
              git.push().setRemote(gitdir.toURI.toString).setPushAll().setPushTags().call()
            }
          } finally {
            FileUtils.deleteQuietly(dir)
          }
        }
        // Create Wiki repository
        createWikiRepository(loginAccount, owner, name)
        // Record activity
        recordCreateRepositoryActivity(owner, name, loginUserName)
        // Call hooks
        PluginRegistry().getRepositoryHooks.foreach(_.created(owner, name))
      }
      RepositoryCreationService.endCreation(owner, name, None)
    } catch {
      case ex: Exception => RepositoryCreationService.endCreation(owner, name, Some(ex.toString))
    }
  }
  def forkRepository(accountName: String, repository: RepositoryInfo, loginUserName: String): Future[Unit] = Future {
    RepositoryCreationService.startCreation(accountName, repository.name)
    try {
      LockUtil.lock(s"${accountName}/${repository.name}") {
        Database() withTransaction { implicit session =>
          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
          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))
          RepositoryCreationService.endCreation(accountName, repository.name, None)
        }
      }
    } catch {
      case ex: Exception => RepositoryCreationService.endCreation(accountName, repository.name, Some(ex.toString))
    }
  }
  def insertDefaultLabels(userName: String, repositoryName: String)(implicit s: Session): Unit = {
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -3,7 +3,7 @@ package gitbucket.core.service
 import gitbucket.core.controller.Context
 import gitbucket.core.util._
 import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.model.{Account, Collaborator, Repository, RepositoryOptions, Role}
+import gitbucket.core.model.{Account, Collaborator, Repository, RepositoryOptions, Role, Release}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
@@ -75,6 +75,8 @@ trait RepositoryService { self: AccountService =>
        val protectedBranches       = ProtectedBranches      .filter(_.byRepository(oldUserName, oldRepositoryName)).list
        val protectedBranchContexts = ProtectedBranchContexts.filter(_.byRepository(oldUserName, oldRepositoryName)).list
        val deployKeys              = DeployKeys             .filter(_.byRepository(oldUserName, oldRepositoryName)).list
        val releases                = Releases               .filter(_.byRepository(oldUserName, oldRepositoryName)).list
        val releaseAssets           = ReleaseAssets          .filter(_.byRepository(oldUserName, oldRepositoryName)).list
        Repositories.filter { t =>
          (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
@@ -120,6 +122,8 @@ trait RepositoryService { self: AccountService =>
        ProtectedBranches      .insertAll(protectedBranches.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
        ProtectedBranchContexts.insertAll(protectedBranchContexts.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
        DeployKeys             .insertAll(deployKeys    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
        Releases               .insertAll(releases      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
        ReleaseAssets          .insertAll(releaseAssets .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
        // Update source repository of pull requests
        PullRequests.filter { t =>
@@ -161,7 +165,7 @@ trait RepositoryService { self: AccountService =>
  def deleteRepository(userName: String, repositoryName: String)(implicit s: Session): Unit = {
    Activities              .filter(_.byRepository(userName, repositoryName)).delete
    Collaborators           .filter(_.byRepository(userName, repositoryName)).delete
-    CommitComments.filter(_.byRepository(userName, repositoryName)).delete
+    CommitComments          .filter(_.byRepository(userName, repositoryName)).delete
    IssueLabels             .filter(_.byRepository(userName, repositoryName)).delete
    Labels                  .filter(_.byRepository(userName, repositoryName)).delete
    IssueComments           .filter(_.byRepository(userName, repositoryName)).delete
@@ -173,6 +177,8 @@ trait RepositoryService { self: AccountService =>
    RepositoryWebHooks      .filter(_.byRepository(userName, repositoryName)).delete
    RepositoryWebHookEvents .filter(_.byRepository(userName, repositoryName)).delete
    DeployKeys              .filter(_.byRepository(userName, repositoryName)).delete
    ReleaseAssets .filter(_.byRepository(userName, repositoryName)).delete
    Releases      .filter(_.byRepository(userName, repositoryName)).delete
    Repositories            .filter(_.byRepository(userName, repositoryName)).delete
    // Update ORIGIN_USER_NAME and ORIGIN_REPOSITORY_NAME
@@ -413,6 +419,15 @@ trait RepositoryService { self: AccountService =>
    q1.union(q2).list.filter { x => filter.isEmpty || filter.exists(_.name == x._2) }.map(_._1)
  }
  def hasOwnerRole(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
    loginAccount match {
      case Some(a) if(a.isAdmin) => true
      case Some(a) if(a.userName == owner) => true
      case Some(a) if(getGroupMembers(owner).exists(_.userName == a.userName)) => true
      case Some(a) if(getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN)).contains(a.userName)) => true
      case _ => false
    }
  }
  def hasDeveloperRole(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
    loginAccount match {
@@ -434,17 +449,31 @@ trait RepositoryService { self: AccountService =>
    }
  }
  def isReadable(repository: Repository, loginAccount: Option[Account])(implicit s: Session): Boolean = {
    if(!repository.isPrivate){
      true
    } else {
      loginAccount match {
        case Some(x) if(x.isAdmin) => true
        case Some(x) if(repository.userName == x.userName) => true
        case Some(x) if(getGroupMembers(repository.userName).exists(_.userName == x.userName)) => true
        case Some(x) if(getCollaboratorUserNames(repository.userName, repository.repositoryName).contains(x.userName)) => true
        case _ => false
      }
    }
  }
  private def getForkedCount(userName: String, repositoryName: String)(implicit s: Session): Int =
    Query(Repositories.filter { t =>
      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
    }.length).first
-  def getForkedRepositories(userName: String, repositoryName: String)(implicit s: Session): List[(String, String)] =
+  def getForkedRepositories(userName: String, repositoryName: String)(implicit s: Session): List[Repository] =
    Repositories.filter { t =>
      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
    }
-    .sortBy(_.userName asc).map(t => t.userName -> t.repositoryName).list
+    .sortBy(_.userName asc).list//.map(t => t.userName -> t.repositoryName).list
  private val templateExtensions = Seq("md", "markdown")
@@ -491,7 +520,7 @@ object RepositoryService {
      this(repo.owner, repo.name, model, issueCount, pullCount, forkedCount, repo.branchList, repo.tags, managers)
    /**
-     * Creates instance without issue count and pull request count.
+     * Creates instance without issue and  pull request count.
     */
    def this(repo: JGitUtil.RepositoryInfo, model: Repository, 	forkedCount: Int, managers: Seq[String]) =
      this(repo.owner, repo.name, model, 0, 0, forkedCount, repo.branchList, repo.tags, managers)
@@ -516,5 +545,4 @@ object RepositoryService {
      context.settings.sshAddress.map { x => s"ssh://${x.genericUser}@${x.host}:${x.port}/${owner}/${name}.git" }
    } else None
  def openRepoUrl(openUrl: String)(implicit context: Context): String = s"github-${context.platform}://openRepo/${openUrl}"
 }
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -1,11 +1,14 @@
 package gitbucket.core.service
-import gitbucket.core.util.Implicits._
+import javax.servlet.http.HttpServletRequest
 import com.nimbusds.jose.JWSAlgorithm
 import com.nimbusds.oauth2.sdk.auth.Secret
 import com.nimbusds.oauth2.sdk.id.{ClientID, Issuer}
 import gitbucket.core.service.SystemSettingsService._
 import gitbucket.core.util.ConfigUtil._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.SyntaxSugars._
 import SystemSettingsService._
 import javax.servlet.http.HttpServletRequest
 trait SystemSettingsService {
@@ -54,6 +57,15 @@ trait SystemSettingsService {
          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
        }
      }
      props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString)
      if (settings.oidcAuthentication) {
        settings.oidc.map { oidc =>
          props.setProperty(OidcIssuer, oidc.issuer.getValue)
          props.setProperty(OidcClientId, oidc.clientID.getValue)
          props.setProperty(OidcClientSecret, oidc.clientSecret.getValue)
          oidc.jwsAlgorithm.map { x => props.setProperty(OidcJwsAlgorithm, x.getName) }
        }
      }
      props.setProperty(SkinName, settings.skinName.toString)
      using(new java.io.FileOutputStream(GitBucketConf)){ out =>
        props.store(out, null)
@@ -113,6 +125,17 @@ trait SystemSettingsService {
        } else {
          None
        },
        getValue(props, OidcAuthentication, false),
        if (getValue(props, OidcAuthentication, false)) {
          Some(OIDC(
            getValue(props, OidcIssuer, ""),
            getValue(props, OidcClientId, ""),
            getValue(props, OidcClientSecret, ""),
            getOptionValue(props, OidcJwsAlgorithm, None)
          ))
        } else {
          None
        },
        getValue(props, SkinName, "skin-blue")
      )
    }
@@ -139,18 +162,19 @@ object SystemSettingsService {
    smtp: Option[Smtp],
    ldapAuthentication: Boolean,
    ldap: Option[Ldap],
    oidcAuthentication: Boolean,
    oidc: Option[OIDC],
    skinName: String){
    def baseUrl(request: HttpServletRequest): String = baseUrl.fold(request.baseUrl)(_.stripSuffix("/"))
-    def sshAddress:Option[SshAddress] =
+    def baseUrl(request: HttpServletRequest): String = baseUrl.fold {
-      for {
+      val url = request.getRequestURL.toString
-        host <- sshHost if ssh
+      val len = url.length - (request.getRequestURI.length - request.getContextPath.length)
      url.substring(0, len).stripSuffix("/")
    } (_.stripSuffix("/"))
    def sshAddress:Option[SshAddress] = sshHost.collect { case host if ssh =>
      SshAddress(host, sshPort.getOrElse(DefaultSshPort), "git")
    }
      yield SshAddress(
        host,
        sshPort.getOrElse(DefaultSshPort),
        "git"
      )
  }
  case class Ldap(
@@ -167,6 +191,16 @@ object SystemSettingsService {
    ssl: Option[Boolean],
    keystore: Option[String])
  case class OIDC(
    issuer: Issuer,
    clientID: ClientID,
    clientSecret: Secret,
    jwsAlgorithm: Option[JWSAlgorithm])
  object OIDC {
    def apply(issuer: String, clientID: String, clientSecret: String, jwsAlgorithm: Option[String]): OIDC =
      new OIDC(new Issuer(issuer), new ClientID(clientID), new Secret(clientSecret), jwsAlgorithm.map(JWSAlgorithm.parse))
  }
  case class Smtp(
    host: String,
    port: Option[Int],
@@ -222,6 +256,11 @@ object SystemSettingsService {
  private val LdapTls = "ldap.tls"
  private val LdapSsl = "ldap.ssl"
  private val LdapKeystore = "ldap.keystore"
  private val OidcAuthentication = "oidc_authentication"
  private val OidcIssuer = "oidc.issuer"
  private val OidcClientId = "oidc.client_id"
  private val OidcClientSecret = "oidc.client_secret"
  private val OidcJwsAlgorithm = "oidc.jws_algorithm"
  private val SkinName = "skinName"
  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
--- a/src/main/scala/gitbucket/core/service/WebHookService.scala
+++ b/src/main/scala/gitbucket/core/service/WebHookService.scala
@@ -232,12 +232,14 @@ trait WebHookPullRequestService extends WebHookService {
        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 {
        WebHookPullRequestPayload(
          action         = action,
          issue          = issue,
          issueUser      = issueUser,
          assignee       = assignee,
          pullRequest    = pullRequest,
          headRepository = headRepo,
          headOwner      = headOwner,
@@ -273,12 +275,14 @@ trait WebHookPullRequestService extends WebHookService {
    import WebHookService._
    for{
      ((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch)
      assignee =  issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) }
      baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName)
    } yield {
      val payload = WebHookPullRequestPayload(
        action         = action,
        issue          = issue,
        issueUser      = issueUser,
        assignee       = assignee,
        pullRequest    = pullRequest,
        headRepository = requestRepository,
        headOwner      = headOwner,
@@ -296,16 +300,17 @@ trait WebHookPullRequestService extends WebHookService {
 trait WebHookPullRequestReviewCommentService extends WebHookService {
  self: AccountService with RepositoryService with PullRequestService with IssuesService with CommitsService =>
-  def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account)
+  def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo,
                                          issue: Issue, pullRequest: PullRequest, baseUrl: String, sender: Account)
                                         (implicit s: Session, c: JsonFormat.Context): Unit = {
    import WebHookService._
    callWebHookOf(repository.owner, repository.name, WebHook.PullRequestReviewComment){
      val users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender))
      for{
        (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
        users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender))
        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 {
        WebHookPullRequestReviewCommentPayload(
@@ -313,6 +318,7 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
          comment        = comment,
          issue          = issue,
          issueUser      = issueUser,
          assignee       = assignee,
          pullRequest    = pullRequest,
          headRepository = headRepo,
          headOwner      = headOwner,
@@ -356,6 +362,35 @@ trait WebHookIssueCommentService extends WebHookPullRequestService {
 object WebHookService {
  trait WebHookPayload
  // https://developer.github.com/v3/activity/events/types/#createevent
  case class WebHookCreatePayload(
    sender: ApiUser,
    description: String,
    ref: String,
    ref_type: String,
    master_branch: String,
    repository: ApiRepository
  ) extends FieldSerializable with WebHookPayload {
    val pusher_type = "user"
  }
  object WebHookCreatePayload {
    def apply(git: Git, sender: Account, refName: String, repositoryInfo: RepositoryInfo,
              commits: List[CommitInfo], repositoryOwner: Account,
              ref: String, refType: String): WebHookCreatePayload =
      WebHookCreatePayload(
        sender        = ApiUser(sender),
        ref           = ref,
        ref_type      = refType,
        description   = repositoryInfo.repository.description.getOrElse(""),
        master_branch = repositoryInfo.repository.defaultBranch,
        repository    = ApiRepository.forWebhookPayload(
          repositoryInfo,
          owner= ApiUser(repositoryOwner))
      )
  }
  // https://developer.github.com/v3/activity/events/types/#pushevent
  case class WebHookPushPayload(
    pusher: ApiPusher,
@@ -385,8 +420,8 @@ object WebHookService {
        ref        = refName,
        before     = ObjectId.toString(oldId),
        after      = ObjectId.toString(newId),
-        commits    = commits.map{ commit => ApiCommit.forPushPayload(git, RepositoryName(repositoryInfo), commit) },
+        commits    = commits.map{ commit => ApiCommit.forWebhookPayload(git, RepositoryName(repositoryInfo), commit) },
-        repository = ApiRepository.forPushPayload(
+        repository = ApiRepository.forWebhookPayload(
          repositoryInfo,
          owner= ApiUser(repositoryOwner))
      )
@@ -424,6 +459,7 @@ object WebHookService {
    def apply(action: String,
        issue: Issue,
        issueUser: Account,
        assignee: Option[Account],
        pullRequest: PullRequest,
        headRepository: RepositoryInfo,
        headOwner: Account,
@@ -441,6 +477,7 @@ object WebHookService {
        headRepo      = headRepoPayload,
        baseRepo      = baseRepoPayload,
        user          = ApiUser(issueUser),
        assignee      = assignee.map(ApiUser.apply),
        mergedComment = mergedComment
      )
@@ -495,6 +532,7 @@ object WebHookService {
      comment: CommitComment,
      issue: Issue,
      issueUser: Account,
      assignee: Option[Account],
      pullRequest: PullRequest,
      headRepository: RepositoryInfo,
      headOwner: Account,
@@ -502,7 +540,7 @@ object WebHookService {
      baseOwner: Account,
      sender: Account,
      mergedComment: Option[(IssueComment, Account)]
-    ) : WebHookPullRequestReviewCommentPayload = {
+    ): WebHookPullRequestReviewCommentPayload = {
      val headRepoPayload = ApiRepository(headRepository, headOwner)
      val baseRepoPayload = ApiRepository(baseRepository, baseOwner)
      val senderPayload = ApiUser(sender)
@@ -521,6 +559,7 @@ object WebHookService {
          headRepo      = headRepoPayload,
          baseRepo      = baseRepoPayload,
          user          = ApiUser(issueUser),
          assignee      = assignee.map(ApiUser.apply),
          mergedComment = mergedComment
        ),
        repository   = baseRepoPayload,
--- a/src/main/scala/gitbucket/core/service/WikiService.scala
+++ b/src/main/scala/gitbucket/core/service/WikiService.scala
@@ -75,22 +75,6 @@ trait WikiService {
    }
  }
  /**
   * Returns the content of the specified file.
   */
  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
      if(!JGitUtil.isEmpty(git)){
        val index = path.lastIndexOf('/')
        val parentPath = if(index < 0) "."  else path.substring(0, index)
        val fileName   = if(index < 0) path else path.substring(index + 1)
        JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
          git.getRepository.open(file.id).getBytes
        }
      } else None
    }
  /**
   * Returns the list of wiki page names.
   */
--- a/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
@@ -0,0 +1,73 @@
 package gitbucket.core.servlet
 import javax.servlet._
 import javax.servlet.http.HttpServletRequest
 import org.scalatra.ScalatraFilter
 import scala.collection.mutable.ListBuffer
 class CompositeScalatraFilter extends Filter {
  private val filters = new ListBuffer[(ScalatraFilter, String)]()
  def mount(filter: ScalatraFilter, path: String): Unit = {
    filters += ((filter, path))
  }
  override def init(filterConfig: FilterConfig): Unit = {
    filters.foreach { case (filter, _) =>
      filter.init(filterConfig)
    }
  }
  override def destroy(): Unit = {
    filters.foreach { case (filter, _) =>
      filter.destroy()
    }
  }
  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
    val contextPath = request.getServletContext.getContextPath
    val requestPath = request.asInstanceOf[HttpServletRequest].getRequestURI.substring(contextPath.length)
    val checkPath = if(requestPath.endsWith("/")){
      requestPath
    } else {
      requestPath + "/"
    }
    if(!checkPath.startsWith("/upload/") && !checkPath.startsWith("/git/") && !checkPath.startsWith("/git-lfs/") &&
       !checkPath.startsWith("/plugin-assets/")){
      filters
        .filter { case (_, path) =>
          val start = path.replaceFirst("/\\*$", "/")
          checkPath.startsWith(start)
        }
        .foreach { case (filter, _) =>
          val mockChain = new MockFilterChain()
          filter.doFilter(request, response, mockChain)
          if(mockChain.continue == false){
            return ()
          }
        }
    }
    chain.doFilter(request, response)
  }
 }
 class MockFilterChain extends FilterChain {
  var continue: Boolean = false
  override def doFilter(request: ServletRequest, response: ServletResponse): Unit = {
    continue = true
  }
 }
 //class FilterChainFilter(chain: FilterChain) extends Filter {
 //  override def init(filterConfig: FilterConfig): Unit = ()
 //  override def destroy(): Unit  = ()
 //  override def doFilter(request: ServletRequest, response: ServletResponse, mockChain: FilterChain) = chain.doFilter(request, response)
 //}
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -156,9 +156,13 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
        logger.debug("repository:" + owner + "/" + repository)
        val settings = loadSystemSettings()
        val baseUrl = settings.baseUrl(request)
        val sshUrl  = settings.sshAddress.map { x => s"${x.genericUser}@${x.host}:${x.port}" }
        if(!repository.endsWith(".wiki")){
          defining(request) { implicit r =>
-            val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
+            val hook = new CommitLogHook(owner, repository, pusher, baseUrl, sshUrl)
            receivePack.setPreReceiveHook(hook)
            receivePack.setPostReceiveHook(hook)
          }
@@ -166,7 +170,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
        if(repository.endsWith(".wiki")){
          defining(request) { implicit r =>
-            receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl))
+            receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl, sshUrl))
          }
        }
      }
@@ -178,7 +182,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 import scala.collection.JavaConverters._
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
  extends PostReceiveHook with PreReceiveHook
  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
  with WebHookPullRequestService with CommitsService {
@@ -219,7 +223,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
          val pushedIds = scala.collection.mutable.Set[String]()
          commands.asScala.foreach { command =>
            logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-            implicit val apiContext = api.JsonFormat.Context(baseUrl)
+            implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
            val refName = command.getRefName.split("/")
            val branchName = refName.drop(2).mkString("/")
            val commits = if (refName(1) == "tags") {
@@ -302,6 +306,18 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                  newId = command.getNewId(), oldId = command.getOldId())
              }
            }
            if (command.getType ==  ReceiveCommand.Type.CREATE) {
              callWebHookOf(owner, repository, WebHook.Create) {
                for {
                  pusherAccount <- getAccountByUserName(pusher)
                  ownerAccount  <- getAccountByUserName(owner)
                } yield {
                  val refType = if (refName(1) == "tags") "tag" else "branch"
                  WebHookCreatePayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount,
                    ref = branchName, refType = refType)
                }
              }
            }
            // call post-commit hook
            PluginRegistry().getReceiveHooks.foreach(_.postReceive(owner, repository, receivePack, command, pusher))
@@ -320,7 +336,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
 }
-class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String)
+class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
  extends PostReceiveHook with WebHookService with AccountService with RepositoryService {
  private val logger = LoggerFactory.getLogger(classOf[WikiCommitHook])
@@ -329,7 +345,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
    Database() withTransaction { implicit session =>
      try {
        commands.asScala.headOption.foreach { command =>
-          implicit val apiContext = api.JsonFormat.Context(baseUrl)
+          implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
          val refName = command.getRefName.split("/")
          val commitIds = if (refName(1) == "tags") {
            None
@@ -343,11 +359,10 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
          commitIds.map { case (oldCommitId, newCommitId) =>
            val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
              JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit =>
-                val diffs = JGitUtil.getDiffs(git, commit.id, false)
+                val diffs = JGitUtil.getDiffs(git, None, commit.id, false, false)
-                diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") =>
+                diffs.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") =>
                  val action = if(diff.changeType == ChangeType.ADD) "created" else "edited"
                  val fileName = diff.newPath
                  println(action + " - " + fileName + " - " + commit.id)
                  (action, fileName, commit.id)
                }
              }
--- a/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
@@ -21,25 +21,27 @@ class PluginControllerFilter extends Filter {
  }
  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
    val controller = PluginRegistry().getControllers().filter { case (_, path) =>
    val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI
    PluginRegistry().getControllers()
      .filter { case (_, path) =>
        val start = path.replaceFirst("/\\*$", "/")
-      path.endsWith("/*") && (requestUri + "/").startsWith(start)
+        (requestUri + "/").startsWith(start)
      }
      .foreach { case (controller, _) =>
        controller match {
          case x: ControllerBase if(x.config == null) => x.init(filterConfig)
          case _ => ()
        }
        val mockChain = new MockFilterChain()
        controller.doFilter(request, response, mockChain)
        if(mockChain.continue == false){
          return ()
        }
      }
-    val filterChainWrapper = controller.foldLeft(chain){ case (chain, (controller, _)) =>
+    chain.doFilter(request, response)
      new FilterChainWrapper(controller, chain)
    }
    filterChainWrapper.doFilter(request, response)
  }
  class FilterChainWrapper(controller: ControllerBase, chain: FilterChain) extends FilterChain {
    override def doFilter(request: ServletRequest, response: ServletResponse): Unit = {
      if(controller.config == null){
        controller.init(filterConfig)
      }
      controller.doFilter(request, response, chain)
    }
  }
 }
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -154,7 +154,7 @@ class DefaultGitUploadPack(owner: String, repoName: String) extends DefaultGitCo
  }
 }
-class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) extends DefaultGitCommand(owner, repoName)
+class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String, sshUrl: Option[String]) extends DefaultGitCommand(owner, repoName)
    with RepositoryService with AccountService with DeployKeyService {
  override protected def runTask(authType: AuthType): Unit = {
@@ -169,7 +169,7 @@ class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) ex
        val repository = git.getRepository
        val receive = new ReceivePack(repository)
        if (!repoName.endsWith(".wiki")) {
-          val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl)
+          val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl, sshUrl)
          receive.setPreReceiveHook(hook)
          receive.setPostReceiveHook(hook)
        }
@@ -216,21 +216,28 @@ class PluginGitReceivePack(repoName: String, routing: GitRepositoryRouting) exte
 }
-class GitCommandFactory(baseUrl: String) extends CommandFactory {
+class GitCommandFactory(baseUrl: String, sshUrl: Option[String]) extends CommandFactory {
  private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])
  override def createCommand(command: String): Command = {
    import GitCommand._
    logger.debug(s"command: $command")
-    command match {
+    val pluginCommand = PluginRegistry().getSshCommandProviders.collectFirst {
      case f if f.isDefinedAt(command) => f(command)
    }
    pluginCommand match {
      case Some(x) => x
      case None => command match {
        case SimpleCommandRegex ("upload" , repoName) if(pluginRepository(repoName)) => new PluginGitUploadPack (repoName, routing(repoName))
        case SimpleCommandRegex ("receive", repoName) if(pluginRepository(repoName)) => new PluginGitReceivePack(repoName, routing(repoName))
        case DefaultCommandRegex("upload" , owner, repoName) => new DefaultGitUploadPack (owner, repoName)
-      case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl)
+        case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl, sshUrl)
        case _ => new UnknownCommand(command)
      }
    }
  }
  private def pluginRepository(repoName: String): Boolean = PluginRegistry().getRepositoryRouting("/" + repoName).isDefined
  private def routing(repoName: String): GitRepositoryRouting = PluginRegistry().getRepositoryRouting("/" + repoName).get
--- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
@@ -22,7 +22,7 @@ object SshServer {
    provider.setOverwriteAllowed(false)
    server.setKeyPairProvider(provider)
    server.setPublickeyAuthenticator(new PublicKeyAuthenticator(sshAddress.genericUser))
-    server.setCommandFactory(new GitCommandFactory(baseUrl))
+    server.setCommandFactory(new GitCommandFactory(baseUrl, Some(s"${sshAddress.genericUser}@${sshAddress.host}:${sshAddress.port}")))
    server.setShellFactory(new NoShell(sshAddress))
  }
--- a/src/main/scala/gitbucket/core/util/Authenticator.scala
+++ b/src/main/scala/gitbucket/core/util/Authenticator.scala
@@ -97,16 +97,10 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService with A
    {
      defining(request.paths){ paths =>
        getRepository(paths(0), paths(1)).map { repository =>
-          if(!repository.repository.isPrivate){
+          if(isReadable(repository.repository, context.loginAccount)){
            action(repository)
          } else {
-            context.loginAccount match {
+            Unauthorized()
              case Some(x) if(x.isAdmin) => action(repository)
              case Some(x) if(paths(0) == x.userName) => action(repository)
              case Some(x) if(getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository)
              case Some(x) if(getCollaboratorUserNames(paths(0), paths(1)).contains(x.userName)) => action(repository)
              case _ => Unauthorized()
            }
          }
        } getOrElse NotFound()
      }
--- a/src/main/scala/gitbucket/core/util/Directory.scala
+++ b/src/main/scala/gitbucket/core/util/Directory.scala
@@ -54,6 +54,12 @@ object Directory {
  def getAttachedDir(owner: String, repository: String): File =
    new File(getRepositoryFilesDir(owner, repository), "comments")
  /**
    * Directory for released files
    */
  def getReleaseFilesDir(owner: String, repository: String): File =
    new File(getRepositoryFilesDir(owner, repository), "releases")
  /**
   * Directory for files which are attached to issue.
   */
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -28,8 +28,6 @@ object FileUtil {
  def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
  def isUploadableType(name: String): Boolean = mimeTypeWhiteList contains getMimeType(name)
  def isLarge(size: Long): Boolean = (size > 1024 * 1000)
  def isText(content: Array[Byte]): Boolean = !content.contains(0)
@@ -53,16 +51,6 @@ object FileUtil {
    }
  }
  val mimeTypeWhiteList: Array[String] = Array(
      "application/pdf",
      "application/vnd.openxmlformats-officedocument.presentationml.presentation",
      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
      "image/gif",
      "image/jpeg",
      "image/png",
      "text/plain")
  def getLfsFilePath(owner: String, repository: String, oid: String): String =
    Directory.getLfsDir(owner, repository) + "/" + oid
@@ -88,4 +76,9 @@ object FileUtil {
    file
  }
  lazy val MaxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
    System.getProperty("gitbucket.maxFileSize").toLong
  else
    3 * 1024 * 1024
 }
--- a/src/main/scala/gitbucket/core/util/Implicits.scala
+++ b/src/main/scala/gitbucket/core/util/Implicits.scala
@@ -22,7 +22,8 @@ object Implicits {
  // Convert to slick session.
  implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session = Database.getSession(request)
-  implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context = JsonFormat.Context(context.baseUrl)
+  implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context =
    JsonFormat.Context(context.baseUrl, context.settings.sshAddress.map { x => s"${x.genericUser}@${x.host}:${x.port}" })
  implicit class RichSeq[A](private val seq: Seq[A]) extends AnyVal {
@@ -77,11 +78,6 @@ object Implicits {
    def gitRepositoryPath: String = request.getRequestURI.replaceFirst("^" + quote(request.getContextPath) + "/git/", "/")
    def baseUrl:String = {
      val url = request.getRequestURL.toString
      val len = url.length - (request.getRequestURI.length - request.getContextPath.length)
      url.substring(0, len).stripSuffix("/")
    }
  }
  implicit class RichSession(private val session: HttpSession) extends AnyVal {
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -1,5 +1,7 @@
 package gitbucket.core.util
 import java.io.ByteArrayOutputStream
 import gitbucket.core.service.RepositoryService
 import org.eclipse.jgit.api.Git
 import Directory._
@@ -20,9 +22,11 @@ import java.util.Date
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
-import org.cache2k.{Cache2kBuilder, CacheEntry}
+import org.cache2k.Cache2kBuilder
 import org.eclipse.jgit.api.errors.{InvalidRefNameException, JGitInternalException, NoHeadException, RefAlreadyExistsException}
 import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter, RawTextComparator}
 import org.eclipse.jgit.dircache.DirCacheEntry
 import org.eclipse.jgit.util.io.DisabledOutputStream
 import org.slf4j.LoggerFactory
 /**
@@ -114,7 +118,8 @@ object JGitUtil {
    newObjectId: Option[String],
    oldMode: String,
    newMode: String,
-    tooLarge: Boolean
+    tooLarge: Boolean,
    patch: Option[String]
  )
  /**
@@ -146,9 +151,10 @@ object JGitUtil {
   *
   * @param name the module name
   * @param path the path in the repository
-   * @param url the repository url of this module
+   * @param repositoryUrl the repository url of this module
   * @param viewerUrl the repository viewer url of this module
   */
-  case class SubmoduleInfo(name: String, path: String, url: String)
+  case class SubmoduleInfo(name: String, path: String, repositoryUrl: String, viewerUrl: String)
  case class BranchMergeInfo(ahead: Int, behind: Int, isMerged: Boolean)
@@ -184,11 +190,9 @@ object JGitUtil {
    val dir = git.getRepository.getDirectory
    val keyPrefix = dir.getAbsolutePath + "@"
-    cache.forEach(new Consumer[CacheEntry[String, Int]] {
+    cache.keys.forEach(key => {
-      override def accept(entry: CacheEntry[String, Int]): Unit = {
+      if (key.startsWith(keyPrefix)) {
-        if(entry.getKey.startsWith(keyPrefix)){
+        cache.remove(key)
          cache.remove(entry.getKey)
        }
      }
    })
  }
@@ -249,9 +253,10 @@ object JGitUtil {
   * @param git the Git object
   * @param revision the branch name or commit id
   * @param path the directory path (optional)
   * @param baseUrl the base url of GitBucket instance. This parameter is used to generate links of submodules (optional)
   * @return HTML of the file list
   */
-  def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = {
+  def getFileList(git: Git, revision: String, path: String = ".", baseUrl: Option[String] = None): List[FileInfo] = {
    using(new RevWalk(git.getRepository)){ revWalk =>
      val objectId = git.getRepository.resolve(revision)
      if(objectId == null) return Nil
@@ -337,7 +342,7 @@ object JGitUtil {
      useTreeWalk(revCommit){ treeWalk =>
        while (treeWalk.next()) {
          val linkUrl = if (treeWalk.getFileMode(0) == FileMode.GITLINK) {
-            getSubmodules(git, revCommit.getTree).find(_.path == treeWalk.getPathString).map(_.url)
+            getSubmodules(git, revCommit.getTree, baseUrl).find(_.path == treeWalk.getPathString).map(_.viewerUrl)
          } else None
          fileList +:= (treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getNameString, treeWalk.getPathString, linkUrl)
        }
@@ -514,90 +519,49 @@ object JGitUtil {
    }.toMap
  }
-  /**
+  def getPatch(git: Git, from: Option[String], to: String): String = {
-   * Returns the tuple of diff of the given commit and the previous commit id.
+    val out = new ByteArrayOutputStream()
-   */
+    val df = new DiffFormatter(out)
-  def getDiffs(git: Git, id: String, fetchContent: Boolean = true): (List[DiffInfo], Option[String]) = {
+    df.setRepository(git.getRepository)
-    @scala.annotation.tailrec
+    df.setDiffComparator(RawTextComparator.DEFAULT)
-    def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[RevCommit]): List[RevCommit] =
+    df.setDetectRenames(true)
-      i.hasNext match {
+    df.format(getDiffEntries(git, from, to).head)
-        case true if(logs.size < 2) => getCommitLog(i, logs :+ i.next)
+    new String(out.toByteArray, "UTF-8")
        case _ => logs
  }
  private def getDiffEntries(git: Git, from: Option[String], to: String): Seq[DiffEntry] = {
    using(new RevWalk(git.getRepository)){ revWalk =>
-      revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(id)))
+      val df = new DiffFormatter(DisabledOutputStream.INSTANCE)
-      val commits   = getCommitLog(revWalk.iterator, Nil)
+      df.setRepository(git.getRepository)
      val revCommit = commits(0)
-      if(commits.length >= 2){
+      val toCommit = revWalk.parseCommit(git.getRepository.resolve(to))
-        // not initial commit
+      from match {
-        val oldCommit = if(revCommit.getParentCount >= 2) {
+        case None => {
-          // merge commit
+          toCommit.getParentCount match {
-          revCommit.getParents.head
+            case 0 => df.scan(new EmptyTreeIterator(), new CanonicalTreeParser(null, git.getRepository.newObjectReader(), toCommit.getTree)).asScala
-        } else {
+            case _ => df.scan(toCommit.getParent(0), toCommit.getTree).asScala
          commits(1)
          }
        (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))
      } else {
        // initial commit
        using(new TreeWalk(git.getRepository)){ treeWalk =>
          treeWalk.setRecursive(true)
          treeWalk.addTree(revCommit.getTree)
          val buffer = new scala.collection.mutable.ListBuffer[DiffInfo]()
          while(treeWalk.next){
            val newIsImage = FileUtil.isImage(treeWalk.getPathString)
            buffer.append((if(!fetchContent){
              DiffInfo(
                changeType  = ChangeType.ADD,
                oldPath     = null,
                newPath     = treeWalk.getPathString,
                oldContent  = None,
                newContent  = None,
                oldIsImage  = false,
                newIsImage  = newIsImage,
                oldObjectId = None,
                newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
                oldMode     = treeWalk.getFileMode(0).toString,
                newMode     = treeWalk.getFileMode(0).toString,
                tooLarge    = false
              )
            } else {
              DiffInfo(
                changeType  = ChangeType.ADD,
                oldPath     = null,
                newPath     = treeWalk.getPathString,
                oldContent  = None,
                newContent  = JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray),
                oldIsImage  = false,
                newIsImage  = newIsImage,
                oldObjectId = None,
                newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
                oldMode     = treeWalk.getFileMode(0).toString,
                newMode     = treeWalk.getFileMode(0).toString,
                tooLarge    = false
              )
            }))
        }
-          (buffer.toList, None)
+        case Some(from) => {
          val fromCommit = revWalk.parseCommit(git.getRepository.resolve(from))
          df.scan(fromCommit.getTree, toCommit.getTree).asScala
        }
      }
    }
  }
-  def getDiffs(git: Git, from: String, to: String, fetchContent: Boolean): List[DiffInfo] = {
+  def getParentCommitId(git: Git, id: String): Option[String] = {
-    val reader = git.getRepository.newObjectReader
+    using(new RevWalk(git.getRepository)){ revWalk =>
-    val oldTreeIter = new CanonicalTreeParser
+      val commit = revWalk.parseCommit(git.getRepository.resolve(id))
-    oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
+      commit.getParentCount match {
        case 0 => None
        case _ => Some(commit.getParent(0).getName)
      }
    }
  }
-    val newTreeIter = new CanonicalTreeParser
+  def getDiffs(git: Git, from: Option[String], to: String, fetchContent: Boolean, makePatch: Boolean): List[DiffInfo] = {
-    newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
+    val diffs = getDiffEntries(git, from, to)
    import scala.collection.JavaConverters._
    git.getRepository.getConfig.setString("diff", null, "renames", "copies")
    val diffs = git.diff.setNewTree(newTreeIter).setOldTree(oldTreeIter).call.asScala
    diffs.map { diff =>
      if(diffs.size > 100){
        DiffInfo(
@@ -612,7 +576,8 @@ object JGitUtil {
          newObjectId = Option(diff.getNewId).map(_.name),
          oldMode     = diff.getOldMode.toString,
          newMode     = diff.getNewMode.toString,
-          tooLarge    = true
+          tooLarge    = true,
          patch       = None
        )
      } else {
        val oldIsImage = FileUtil.isImage(diff.getOldPath)
@@ -630,7 +595,8 @@ object JGitUtil {
            newObjectId = Option(diff.getNewId).map(_.name),
            oldMode     = diff.getOldMode.toString,
            newMode     = diff.getNewMode.toString,
-            tooLarge    = false
+            tooLarge    = false,
            patch       = (if(makePatch) Some(makePatchFromDiffEntry(git, diff)) else None) // TODO use DiffFormatter
          )
        } else {
          DiffInfo(
@@ -645,13 +611,23 @@ object JGitUtil {
            newObjectId = Option(diff.getNewId).map(_.name),
            oldMode     = diff.getOldMode.toString,
            newMode     = diff.getNewMode.toString,
-            tooLarge    = false
+            tooLarge    = false,
            patch       = (if(makePatch) Some(makePatchFromDiffEntry(git, diff)) else None) // TODO use DiffFormatter
          )
        }
      }
    }.toList
  }
  private def makePatchFromDiffEntry(git: Git, diff: DiffEntry): String = {
    val out = new ByteArrayOutputStream()
    using(new DiffFormatter(out)){ formatter =>
      formatter.setRepository(git.getRepository)
      formatter.format(diff)
      val patch = new String(out.toByteArray) // TODO charset???
      patch.split("\n").drop(4).mkString("\n")
    }
  }
  /**
   * Returns the list of branch names of the specified commit.
@@ -756,7 +732,7 @@ object JGitUtil {
  /**
   * Read submodule information from .gitmodules
   */
-  def getSubmodules(git: Git, tree: RevTree): List[SubmoduleInfo] = {
+  def getSubmodules(git: Git, tree: RevTree, baseUrl: Option[String]): List[SubmoduleInfo] = {
    val repository = git.getRepository
    getContentFromPath(git, tree, ".gitmodules", true).map { bytes =>
      (try {
@@ -764,7 +740,7 @@ object JGitUtil {
        config.getSubsections("submodule").asScala.map { module =>
          val path = config.getString("submodule", module, "path")
          val url  = config.getString("submodule", module, "url")
-          SubmoduleInfo(module, path, url)
+          SubmoduleInfo(module, path, url, StringUtil.getRepositoryViewerUrl(url, baseUrl))
        }
      } catch {
        case e: ConfigInvalidException => {
@@ -828,17 +804,22 @@ object JGitUtil {
    }
  }
  def isLfsPointer(loader: ObjectLoader): Boolean = {
    !loader.isLarge && new String(loader.getBytes(), "UTF-8").startsWith("version https://git-lfs.github.com/spec/v1")
  }
  def getContentInfo(git: Git, path: String, objectId: ObjectId): ContentInfo = {
    // Viewer
    using(git.getRepository.getObjectDatabase){ db =>
      val loader = db.open(objectId)
      val isLfs  = isLfsPointer(loader)
      val large  = FileUtil.isLarge(loader.getSize)
      val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
      val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
      val size = Some(getContentSize(loader))
      if(viewer == "other"){
-        if(bytes.isDefined && FileUtil.isText(bytes.get)){
+        if(!isLfs && bytes.isDefined && FileUtil.isText(bytes.get)){
          // text
          ContentInfo("text", size, Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
        } else {
@@ -1005,7 +986,7 @@ object JGitUtil {
      val blame = blamer.call()
      var blameMap = Map[String, JGitUtil.BlameInfo]()
      var idLine = List[(String, Int)]()
-      val commits = 0.to(blame.getResultContents().size() - 1).map{ i =>
+      val commits = 0.to(blame.getResultContents().size() - 1).map { i =>
        val c = blame.getSourceCommit(i)
        if(!blameMap.contains(c.name)){
          blameMap += c.name -> JGitUtil.BlameInfo(
--- a/src/main/scala/gitbucket/core/util/Keys.scala
+++ b/src/main/scala/gitbucket/core/util/Keys.scala
@@ -25,6 +25,11 @@ object Keys {
     */
    val DashboardPulls = "dashboard/pulls"
    /**
      * Session key for the OpenID Connect authentication.
      */
    val OidcContext = "oidcContext"
    /**
     * Generate session key for the issue search condition.
     */
--- a/src/main/scala/gitbucket/core/util/Mailer.scala
+++ b/src/main/scala/gitbucket/core/util/Mailer.scala
@@ -0,0 +1,68 @@
 package gitbucket.core.util
 import gitbucket.core.model.Account
 import gitbucket.core.service.SystemSettingsService
 import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
 import SystemSettingsService.SystemSettings
 class Mailer(settings: SystemSettings){
  def send(to: String, subject: String, textMsg: String, htmlMsg: Option[String] = None, loginAccount: Option[Account] = None): Unit = {
    createMail(subject, textMsg, htmlMsg, loginAccount).foreach { email =>
      email.addTo(to).send
    }
  }
  def sendBcc(bcc: Seq[String], subject: String, textMsg: String, htmlMsg: Option[String] = None, loginAccount: Option[Account] = None): Unit = {
    createMail(subject, textMsg, htmlMsg, loginAccount).foreach { email =>
      bcc.foreach { address =>
        email.addBcc(address)
      }
      email.send()
    }
  }
  def createMail(subject: String, textMsg: String, htmlMsg: Option[String] = None, loginAccount: Option[Account] = None): Option[HtmlEmail] = {
    if(settings.notification == true){
      settings.smtp.map { smtp =>
        val email = new HtmlEmail
        email.setHostName(smtp.host)
        email.setSmtpPort(smtp.port.get)
        smtp.user.foreach { user =>
          email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
        }
        smtp.ssl.foreach { ssl =>
          email.setSSLOnConnect(ssl)
          if(ssl == true) {
            email.setSslSmtpPort(smtp.port.get.toString)
          }
        }
        smtp.starttls.foreach { starttls =>
          email.setStartTLSEnabled(starttls)
          email.setStartTLSRequired(starttls)
        }
        smtp.fromAddress
          .map (_ -> smtp.fromName.getOrElse(loginAccount.map(_.userName).getOrElse("GitBucket")))
          .orElse (Some("notifications@gitbucket.com" -> loginAccount.map(_.userName).getOrElse("GitBucket")))
          .foreach { case (address, name) =>
            email.setFrom(address, name)
          }
        email.setCharset("UTF-8")
        email.setSubject(subject)
        email.setTextMsg(textMsg)
        htmlMsg.foreach { msg =>
          email.setHtmlMsg(msg)
        }
        email
      }
    } else None
  }
 }
 //class MockMailer extends Notifier {
 //  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
 //              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
 //}
--- a/src/main/scala/gitbucket/core/util/Notifier.scala
+++ b/src/main/scala/gitbucket/core/util/Notifier.scala
@@ -1,99 +0,0 @@
 package gitbucket.core.util
 import gitbucket.core.model.{Session, Account}
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.servlet.Database
 import scala.concurrent._
 import scala.util.{Success, Failure}
 import ExecutionContext.Implicits.global
 import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
 import org.slf4j.LoggerFactory
 import gitbucket.core.controller.Context
 import SystemSettingsService.Smtp
 /**
 * The trait for notifications.
 * This is used by notifications plugin, which provides notifications feature on GitBucket.
 * Please see the plugin for details.
 */
 trait Notifier {
  def toNotify(subject: String, textMsg: String)
    (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
    toNotify(subject, textMsg, None)(recipients)
  }
  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String])
              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit
 }
 object Notifier {
  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
    case settings if (settings.notification && settings.useSMTP) => new Mailer(settings.smtp.get)
    case _ => new MockMailer
  }
 }
 class Mailer(private val smtp: Smtp) extends Notifier {
  private val logger = LoggerFactory.getLogger(classOf[Mailer])
  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
    context.loginAccount.foreach { loginAccount =>
      val database = Database()
      val f = Future {
        database withSession { session =>
          recipients(loginAccount)(session) foreach { to =>
            send(to, subject, loginAccount, textMsg, htmlMsg)
          }
        }
        "Notifications Successful."
      }
      f.onComplete {
        case Success(s) => logger.debug(s)
        case Failure(t) => logger.error("Notifications Failed.", t)
      }
    }
  }
  def send(to: String, subject: String, loginAccount: Account, textMsg: String, htmlMsg: Option[String] = None): Unit = {
    val email = new HtmlEmail
    email.setHostName(smtp.host)
    email.setSmtpPort(smtp.port.get)
    smtp.user.foreach { user =>
      email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
    }
    smtp.ssl.foreach { ssl =>
      email.setSSLOnConnect(ssl)
      if(ssl == true) {
        email.setSslSmtpPort(smtp.port.get.toString)
      }
    }
    smtp.starttls.foreach { starttls =>
      email.setStartTLSEnabled(starttls)
      email.setStartTLSRequired(starttls)
    }
    smtp.fromAddress
      .map (_ -> smtp.fromName.getOrElse(loginAccount.userName))
      .orElse (Some("notifications@gitbucket.com" -> loginAccount.userName))
      .foreach { case (address, name) =>
        email.setFrom(address, name)
      }
    email.setCharset("UTF-8")
    email.setSubject(subject)
    email.setTextMsg(textMsg)
    htmlMsg.foreach { msg =>
      email.setHtmlMsg(msg)
    }
    email.addTo(to).send
  }
 }
 class MockMailer extends Notifier {
  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
 }
--- a/src/main/scala/gitbucket/core/util/StringUtil.scala
+++ b/src/main/scala/gitbucket/core/util/StringUtil.scala
@@ -123,17 +123,22 @@ object StringUtil {
    "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r
      .findAllIn(message).matchData.map(_.group(1)).toSeq.distinct
  private val GitBucketUrlPattern = "^(https?://.+)/git/(.+?)/(.+?)\\.git$".r
  private val GitHubUrlPattern    = "^https://(.+@)?github\\.com/(.+?)/(.+?)\\.git$".r
  private val BitBucketUrlPattern = "^https?://(.+@)?bitbucket\\.org/(.+?)/(.+?)\\.git$".r
  private val GitLabUrlPattern    = "^https?://(.+@)?gitlab\\.com/(.+?)/(.+?)\\.git$".r
  def getRepositoryViewerUrl(gitRepositoryUrl: String, baseUrl: Option[String]): String = {
    def removeUserName(baseUrl: String): String = baseUrl.replaceFirst("(https?://).+@", "$1")
    gitRepositoryUrl match {
      case GitBucketUrlPattern(base, user, repository) if baseUrl.map(removeUserName(base).startsWith).getOrElse(false)
                                                    => s"${removeUserName(base)}/$user/$repository"
      case GitHubUrlPattern   (_, user, repository) => s"https://github.com/$user/$repository"
      case BitBucketUrlPattern(_, user, repository) => s"https://bitbucket.org/$user/$repository"
      case GitLabUrlPattern   (_, user, repository) => s"https://gitlab.com/$user/$repository"
      case _ => gitRepositoryUrl
    }
  }
 //  /**
 //   * Encode search string for LIKE condition.
 //   * This method has been copied from Slick's SqlUtilsComponent.
 //   */
 //  def likeEncode(s: String) = {
 //    val b = new StringBuilder
 //    for(c <- s) c match {
 //      case '%' | '_' | '^' => b append '^' append c
 //      case _ => b append c
 //    }
 //    b.toString
 //  }
 }
--- a/src/main/scala/gitbucket/core/util/SyntaxSugars.scala
+++ b/src/main/scala/gitbucket/core/util/SyntaxSugars.scala
@@ -53,4 +53,14 @@ object SyntaxSugars {
    def unapply[A, B](t: (A, B)): Option[(A, B)] = Some(t)
  }
  /**
   * Provides easier and explicit ways to access to a head value of `Map[String, Seq[String]]`.
   * This is intended to use in implementations of scalatra-forms's `Constraint` or `ValueType`.
   */
  implicit class HeadValueAccessibleMap(map: Map[String, Seq[String]]){
    def value(key: String): String = map(key).head
    def optionValue(key: String): Option[String] = map.get(key).flatMap(_.headOption)
    def values(key: String): Seq[String] = map.get(key).getOrElse(Seq.empty)
  }
 }
--- a/src/main/scala/gitbucket/core/util/Validations.scala
+++ b/src/main/scala/gitbucket/core/util/Validations.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.util
-import io.github.gitbucket.scalatra.forms._
+import org.scalatra.forms._
 import org.scalatra.i18n.Messages
 trait Validations {
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -346,10 +346,10 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  }
  // This pattern comes from: http://stackoverflow.com/a/4390768/1771641 (extract-url-from-string)
-  private[this] val detectAndRenderLinksRegex = """(?i)\b((?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,13}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))""".r
+  private[this] val urlRegex = """(?i)\b((?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,13}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))""".r
-  def detectAndRenderLinks(text: String, repository: RepositoryInfo)(implicit context: Context): String = {
+  def urlLink(text: String): String = {
-    val matches = detectAndRenderLinksRegex.findAllMatchIn(text).toSeq
+    val matches = urlRegex.findAllMatchIn(text).toSeq
    val (x, pos) = matches.foldLeft((collection.immutable.Seq.empty[Html], 0)){ case ((x, pos), m) =>
      val url  = m.group(0)
@@ -361,8 +361,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    }
    // append rest fragment
    val out = if (pos < text.length) x :+ HtmlFormat.escape(text.substring(pos)) else x
-
+    HtmlFormat.fill(out).toString
    decorateHtml(HtmlFormat.fill(out).toString, repository)
  }
  /**
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -56,7 +56,6 @@
          <a href="@context.path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
        </div>
        <input type="submit" class="btn btn-success" value="Save"/>
        @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@helpers.url(account.userName)" class="btn btn-default">Cancel</a>}
      </div>
    </form>
  }
--- a/src/main/twirl/gitbucket/core/account/main.scala.html
+++ b/src/main/twirl/gitbucket/core/account/main.scala.html
@@ -13,14 +13,14 @@
      </div>
      <div style="padding-left: 10px; padding-right: 10px;">
        @account.description.map{ description =>
-          <p style="color: white;">@description</p>
+          <p style="color: #999">@description</p>
        }
        @if(account.url.isDefined){
          <p style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
            <i class="octicon octicon-home"></i> <a href="@account.url">@account.url</a>
          </p>
        }
-        <p style="color: white;">
+        <p style="color: #999">
          <i class="octicon octicon-clock"></i> Joined on @helpers.date(account.registeredDate)
        </p>
      </div>
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -39,7 +39,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
      </fieldset>
      <fieldset class="form-group">
        <label for="description" class="strong">Description (optional):</label>
-        <input type="text" name="description" id="description" class="form-control" style="width: 95%;"/>
+        <input type="text" name="description" id="description" class="form-control" />
      </fieldset>
      <fieldset class="border-top">
        <label class="radio">
@@ -58,14 +58,30 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
        </label>
      </fieldset>
      <fieldset class="border-top">
-        <label for="createReadme" class="checkbox">
+        <label class="radio">
-          <input type="checkbox" name="createReadme" id="createReadme"/>
+          <input type="radio" name="initOption" value="EMPTY" checked/>
          <span class="strong">Create an empty repository</span>
          <div class="normal muted">
            Create an empty repository. You have to initialize by yourself initially.
          </div>
        </label>
        <label class="radio">
          <input type="radio" name="initOption" value="README"/>
          <span class="strong">Initialize this repository with a README</span>
          <div class="normal muted">
-            This will let you immediately clone the repository to your computer. Skip this step if you’re importing an existing repository.
+            Create a repository which has README.md. You can clone the repository immediately.
          </div>
        </label>
        <label class="radio">
          <input type="radio" name="initOption" value="COPY"/>
          <span class="strong">Copy existing git repository</span>
          <div class="normal muted">
            Create new repository from existing git repository.
          </div>
        </label>
      </fieldset>
      <input type="text" class="form-control" name="sourceUrl" id="sourceUrl" disabled placeholder="Source git repository URL..."/>
      <span id="error-sourceUrl" class="error"></span>
      <fieldset class="border-top form-actions">
        <input type="submit" class="btn btn-success" value="Create repository"/>
      </fieldset>
@@ -83,4 +99,8 @@ $('#owner-dropdown a').click(function(){
  $('#owner-dropdown span.strong').html($(this).find('span').html());
 });
 $('input[name=initOption]').click(function () {
  $('#sourceUrl').prop('disabled', $('input[name=initOption]:checked').val() != 'COPY');
 });
 </script>
--- a/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html
@@ -0,0 +1,95 @@
@(tables: Seq[gitbucket.core.controller.Table])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("Database viewer") {
  @gitbucket.core.admin.html.menu("dbviewer") {
    <div class="container">
      <div class="col-md-3">
        <div id="table-tree">
          <ul>
          @tables.map { table =>
            <li data-jstree='{"icon":"@context.path/assets/common/images/table.gif"}'><a href="javascript:void(0);" class="table-link">@table.name</a>
              <ul>
              @table.columns.map { column =>
                <li data-jstree='{"icon":"@context.path/assets/common/images/column.gif"}'>@column.name
                  @if(column.primaryKey){ (PK) }
                </li>
              }
              </ul>
            </li>
          }
          </ul>
        </div>
      </div>
      <div class="col-md-9">
        <div id="editor" style="width: 100%; height: 300px;"></div>
        <div class="block">
          <input type="button" value="Run query" id="run-query" class="btn btn-success">
          <input type="button" value="Clear" id="clear-query" class="btn btn-default">
        </div>
        <div id="result"></div>
      </div>
    </div>
  }
 }
 <script src="@helpers.assets("/vendors/ace/ace.js")" type="text/javascript" charset="utf-8"></script>
 <script src="@helpers.assets("/vendors/vakata-jstree-3.3.4/jstree.min.js")" type="text/javascript" charset="utf-8"></script>
 <link rel="stylesheet" href="@helpers.assets("/vendors/vakata-jstree-3.3.4/themes/default/style.min.css")" />
 <script>
 $(function(){
  $('#editor').text($('#initial').val());
  var editor = ace.edit("editor");
  editor.setTheme("ace/theme/monokai");
  editor.getSession().setMode("ace/mode/sql");
  $('#table-tree').jstree();
  $('.table-link').click(function(e){
    if(editor.getValue().trim() == ''){
      editor.getSession().insert(editor.getCursorPosition(), 'SELECT * FROM ' + $(e.target).text());
    } else {
      editor.getSession().insert(editor.getCursorPosition(), $(e.target).text());
    }
    editor.focus();
  });
  $('#clear-query').click(function(){
    editor.setValue('');
  });
  $('#run-query').click(function(){
    var selectedText = editor.getSession().doc.getTextRange(editor.selection.getRange()).trim();
    $.post('@context.path/admin/dbviewer/_query', { query: selectedText == '' ? editor.getValue() : selectedText },
      function(data){
        if(data.type == "query"){
          var table = $('<table class="table table-bordered table-hover table-scroll">');
          var header = $('<tr>');
          $.each(data.columns, function(i, column){
            header.append($('<th>').text(column));
          });
          table.append($('<thead>').append(header));
          var body = $('<tbody>');
          $.each(data.rows, function(i, rs){
            var row = $('<tr>');
            $.each(data.columns, function(i, column){
              row.append($('<td>').text(rs[column]));
            });
            body.append(row);
          });
          table.append(body);
          $('#result').empty().append(table);
        } else if(data.type == "update"){
          $('#result').empty().append($('<span>').text('Updated ' + data.rows + ' rows.'));
        } else if(data.type == "error"){
          $('#result').empty().append($('<span class="error">').text(data.message));
        }
      }
    );
  });
 });
 </script>
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -25,17 +25,17 @@
          <span>Data export / import</span>
        </a>
      </li>
-      <li class="menu-item-hover">
+      <li class="menu-item-hover @if(active=="dbviewer"){active}">
-        <a href="@context.path/console/login.jsp" target="_blank">
+        <a href="@context.path/admin/dbviewer">
          <i class="menu-icon octicon octicon-database"></i>
-          <span>H2 console</span>
+          <span>Database viewer</span>
        </a>
      </li>
      @gitbucket.core.plugin.PluginRegistry().getSystemSettingMenus.map { menu =>
        @menu(context).map { link =>
          <li@if(active==link.id){ class="active"}>
            <a href="@context.path/@link.path">
-              <i class="menu-icon octicon octicon-plug"></i>
+              <i class="menu-icon octicon octicon-@link.icon.getOrElse("plug")"></i>
              <span>@link.label</span>
            </a>
          </li>
--- a/src/main/twirl/gitbucket/core/admin/system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -1,6 +1,6 @@
@(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.service.OpenIDConnectService
@import gitbucket.core.util.DatabaseConfig
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("System settings"){
  @gitbucket.core.admin.html.menu("system"){
    @gitbucket.core.helper.html.information(info)
@@ -60,6 +60,44 @@
            <textarea name="information" class="form-control" style="height: 100px;">@context.settings.information</textarea>
          </fieldset>
          <!--====================================================================-->
          <!-- AdminLTE SkinName -->
          <!--====================================================================-->
          <hr>
          <label class="strong">
            AdminLTE skin name
          </label>
          <div class="form-group">
            <label class="control-label col-md-2" for="skinName">Skin name</label>
            <div class="col-md-10">
              <select id="skinName" name="skinName" class="form-control">
                <optgroup label="Dark">
                  @Seq(
                  ("skin-black", "Black"),
                  ("skin-blue", "Blue"),
                  ("skin-green", "Green"),
                  ("skin-purple", "Purple"),
                  ("skin-red", "Red"),
                  ("skin-yellow", "Yellow"),
                  ).map{ skin =>
                    <option value="@skin._1"@if(skin._1 == context.settings.skinName){ selected=""}>@skin._2</option>
                  }
                </optgroup>
                <optgroup label="Light">
                  @Seq(
                  ("skin-black-light", "Light black"),
                  ("skin-blue-light", "Light blue"),
                  ("skin-green-light", "Light green"),
                  ("skin-purple-light", "Light purple"),
                  ("skin-red-light", "Light red"),
                  ("skin-yellow-light", "Light yellow"),
                  ).map{ skin =>
                    <option value="@skin._1"@if(skin._1 == context.settings.skinName){ selected=""} >@skin._2</option>
                  }
                </optgroup>
              </select>
            </div>
          </div>
          <!--====================================================================-->
          <!-- Account registration -->
          <!--====================================================================-->
          <hr>
@@ -108,8 +146,8 @@
          <label><span class="strong">Limit of activity logs</span> (Unlimited if it is not specified or zero)</label>
          <fieldset>
            <div class="form-group">
-              <label class="control-label col-md-3" for="activityLogLimit">Limit</label>
+              <label class="control-label col-md-2" for="activityLogLimit">Limit</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="activityLogLimit" name="activityLogLimit" class="form-control input-mini" value="@context.settings.activityLogLimit"/>
                <span id="error-activityLogLimit" class="error"></span>
              </div>
@@ -140,15 +178,15 @@
          </fieldset>
          <div class="ssh">
            <div class="form-group">
-              <label class="control-label col-md-3" for="sshHost">SSH host</label>
+              <label class="control-label col-md-2" for="sshHost">SSH host</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="sshHost" name="sshHost" class="form-control" value="@context.settings.sshHost"/>
                <span id="error-sshHost" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="sshPort">SSH port</label>
+              <label class="control-label col-md-2" for="sshPort">SSH port</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="sshPort" name="sshPort" class="form-control" value="@context.settings.sshPort"/>
                <span id="error-sshPort" class="error"></span>
              </div>
@@ -167,88 +205,138 @@
          </fieldset>
          <div class="ldap">
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapHost">LDAP host</label>
+              <label class="control-label col-md-2" for="ldapHost">LDAP host</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapHost" name="ldap.host" class="form-control" value="@context.settings.ldap.map(_.host)"/>
                <span id="error-ldap_host" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapPort">LDAP port</label>
+              <label class="control-label col-md-2" for="ldapPort">LDAP port</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapPort" name="ldap.port" class="form-control input-mini" value="@context.settings.ldap.map(_.port)"/>
                <span id="error-ldap_port" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapBindDN">Bind DN</label>
+              <label class="control-label col-md-2" for="ldapBindDN">Bind DN</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapBindDN" name="ldap.bindDN" class="form-control" value="@context.settings.ldap.map(_.bindDN)"/>
                <span id="error-ldap_bindDN" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapBindPassword">Bind password</label>
+              <label class="control-label col-md-2" for="ldapBindPassword">Bind password</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="password" id="ldapBindPassword" name="ldap.bindPassword" class="form-control" value="@context.settings.ldap.map(_.bindPassword)"/>
                <span id="error-ldap_bindPassword" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapBaseDN">Base DN</label>
+              <label class="control-label col-md-2" for="ldapBaseDN">Base DN</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapBaseDN" name="ldap.baseDN" class="form-control" value="@context.settings.ldap.map(_.baseDN)"/>
                <span id="error-ldap_baseDN" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapUserNameAttribute">User name attribute</label>
+              <label class="control-label col-md-2" for="ldapUserNameAttribute">User name attribute</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapUserNameAttribute" name="ldap.userNameAttribute" class="form-control" value="@context.settings.ldap.map(_.userNameAttribute)"/>
                <span id="error-ldap_userNameAttribute" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapAdditionalFilterCondition">Additional filter condition</label>
+              <label class="control-label col-md-2" for="ldapAdditionalFilterCondition">Additional filter condition</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapAdditionalFilterCondition" name="ldap.additionalFilterCondition" class="form-control" value="@context.settings.ldap.map(_.additionalFilterCondition)"/>
                <span id="error-ldap_additionalFilterCondition" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapFullNameAttribute">Full name attribute</label>
+              <label class="control-label col-md-2" for="ldapFullNameAttribute">Full name attribute</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapFullNameAttribute" name="ldap.fullNameAttribute" class="form-control" value="@context.settings.ldap.map(_.fullNameAttribute)"/>
                <span id="error-ldap_fullNameAttribute" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapMailAttribute">Mail address attribute</label>
+              <label class="control-label col-md-2" for="ldapMailAttribute">Mail address attribute</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapMailAttribute" name="ldap.mailAttribute" class="form-control" value="@context.settings.ldap.map(_.mailAttribute)"/>
                <span id="error-ldap_mailAttribute" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3">Enable TLS</label>
+              <label class="control-label col-md-2">Enable TLS</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="checkbox" name="ldap.tls"@if(context.settings.ldap.flatMap(_.tls).getOrElse(false)){ checked}/>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3">Enable SSL</label>
+              <label class="control-label col-md-2">Enable SSL</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="checkbox" name="ldap.ssl"@if(context.settings.ldap.flatMap(_.ssl).getOrElse(false)){ checked}/>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="ldapBindDN">Keystore</label>
+              <label class="control-label col-md-2" for="ldapBindDN">Keystore</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="ldapKeystore" name="ldap.keystore" class="form-control" value="@context.settings.ldap.map(_.keystore)"/>
                <span id="error-ldap_keystore" class="error"></span>
              </div>
            </div>
          </div>
          <fieldset>
            <label class="checkbox">
              <input type="checkbox" id="oidcAuthentication" name="oidcAuthentication"@if(context.settings.oidc){ checked} />
              OpenID Connect
            </label>
          </fieldset>
          <div class="oidc">
            <div class="form-group">
              <label class="control-label col-md-2" for="oidcIssuer">Issuer</label>
              <div class="col-md-10">
                <input type="text" id="oidcIssuer" name="oidc.issuer" class="form-control" value="@context.settings.oidc.map(_.issuer.getValue)"/>
                <span id="error-oidc_issuer" class="error"></span>
              </div>
            </div>
            <div class="form-group">
              <label class="control-label col-md-2" for="oidcClientID">Client ID</label>
              <div class="col-md-10">
                <input type="text" id="oidcClientID" name="oidc.clientID" class="form-control" value="@context.settings.oidc.map(_.clientID.getValue)"/>
                <span id="error-oidc_clientID" class="error"></span>
              </div>
            </div>
            <div class="form-group">
              <label class="control-label col-md-2" for="oidcClientID">Client secret</label>
              <div class="col-md-10">
                <input type="password" id="oidcClientSecret" name="oidc.clientSecret" class="form-control" value="@context.settings.oidc.map(_.clientSecret.getValue)"/>
                <span id="error-oidc_clientSecret" class="error"></span>
              </div>
            </div>
            <div class="form-group">
              <label class="control-label col-md-2" for="oidcJwsAlgorithm">Expected signature</label>
              <div class="col-md-10">
                <select id="oidcJwsAlgorithm" name="oidc.jwsAlgorithm" class="form-control">
                  <option value="" @if(context.settings.oidc.flatMap(_.jwsAlgorithm) == None){selected}>
                    No signature
                  </option>
                  @OpenIDConnectService.JWS_ALGORITHMS.map { case (family, algorithms) =>
                    <optgroup label="@family">
                      @algorithms.map { algorithm =>
                        <option value="@algorithm.getName" @if(context.settings.oidc.flatMap(_.jwsAlgorithm) == Some(algorithm)){selected}>
                          @algorithm.getName
                        </option>
                      }
                    </optgroup>
                  }
                </select>
                <span class="muted">Choose the expected signature algorithm of the token response. Most IdP provides RS256 or HS256.</span>
                <span id="error-oidc_jwsAlgorithm" class="error"></span>
              </div>
            </div>
          </div>
          <!--====================================================================-->
          <!-- Notification email -->
          <!--====================================================================-->
@@ -274,52 +362,52 @@
          </fieldset>
          <div class="useSMTP">
            <div class="form-group">
-              <label class="control-label col-md-3" for="smtpHost">SMTP host</label>
+              <label class="control-label col-md-2" for="smtpHost">SMTP host</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="smtpHost" name="smtp.host" class="form-control" value="@context.settings.smtp.map(_.host)"/>
                <span id="error-smtp_host" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="smtpPort">SMTP port</label>
+              <label class="control-label col-md-2" for="smtpPort">SMTP port</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="smtpPort" name="smtp.port" class="form-control input-mini" value="@context.settings.smtp.map(_.port)"/>
                <span id="error-smtp_port" class="error"></span>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="smtpUser">SMTP user</label>
+              <label class="control-label col-md-2" for="smtpUser">SMTP user</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="smtpUser" name="smtp.user" class="form-control" value="@context.settings.smtp.map(_.user)"/>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="smtpPassword">SMTP password</label>
+              <label class="control-label col-md-2" for="smtpPassword">SMTP password</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="password" id="smtpPassword" name="smtp.password" class="form-control" value="@context.settings.smtp.map(_.password)"/>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="smtpSsl">Enable SSL</label>
+              <label class="control-label col-md-2" for="smtpSsl">Enable SSL</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="checkbox" id="smtpSsl" name="smtp.ssl"@if(context.settings.smtp.flatMap(_.ssl).getOrElse(false)){ checked}/>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="smtpStarttls">Enable STARTTLS</label>
+              <label class="control-label col-md-2" for="smtpStarttls">Enable STARTTLS</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="checkbox" id="smtpStarttls" name="smtp.starttls"@if(context.settings.smtp.flatMap(_.starttls).getOrElse(false)){ checked}/>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="fromAddress">FROM address</label>
+              <label class="control-label col-md-2" for="fromAddress">FROM address</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="fromAddress" name="smtp.fromAddress" class="form-control" value="@context.settings.smtp.map(_.fromAddress)"/>
              </div>
            </div>
            <div class="form-group">
-              <label class="control-label col-md-3" for="fromName">FROM name</label>
+              <label class="control-label col-md-2" for="fromName">FROM name</label>
-              <div class="col-md-9">
+              <div class="col-md-10">
                <input type="text" id="fromName" name="smtp.fromName" class="form-control" value="@context.settings.smtp.map(_.fromName)"/>
              </div>
            </div>
@@ -329,52 +417,22 @@
              <input type="button" id="sendTestMail" value="Send"/>
            </div>
          </div>
          @*
          <!--====================================================================-->
          <!-- GitLFS -->
          <!--====================================================================-->
          @*
          <hr>
          <label class="strong">
            GitLFS <span class="muted normal">(Enter the LFS server url to enable GitLFS support)</span>
          </label>
          <div class="form-group">
-            <label class="control-label col-md-3" for="smtpHost">LFS server url</label>
+            <label class="control-label col-md-2" for="smtpHost">LFS server url</label>
-            <div class="col-md-9">
+            <div class="col-md-10">
              <input type="text" id="lfsServerUrl" name="lfs.serverUrl" class="form-control" value="@context.settings.lfs.serverUrl"/>
              <span id="error-lfs_serverUrl" class="error"></span>
            </div>
          </div>
          *@
          <!--====================================================================-->
          <!-- AdminLTE SkinName -->
          <!--====================================================================-->
          <hr>
          <label class="strong">
            AdminLTE skin name
          </label>
          <div class="form-group">
            <label class="control-label col-md-3" for="skinName">Skin name</label>
            <div class="col-md-9">
              <select id="skinName" name="skinName">
                @Seq(
                "skin-black",
                "skin-black-light",
                "skin-blue",
                "skin-blue-light",
                "skin-green",
                "skin-green-light",
                "skin-purple",
                "skin-purple-light",
                "skin-red",
                "skin-red-light",
                "skin-yellow",
                "skin-yellow-light",
                ).map{ skin =>
                  <option @if(skin == context.settings.skinName){selected}>@skin</option>
                }
              </select>
            </div>
          </div>
        </div>
      </div>
      <div class="align-right" style="margin-top: 20px;">
@@ -385,6 +443,14 @@
 }
 <script>
 $(function(){
  $('#skinName').change(function(evt) {
    var that = $(evt.target);
    var themeCss = $('link[rel="stylesheet"][href*="skin-"]');
    var oldVal = new RegExp('(skin-.*?).min.css').exec(themeCss.attr('href'))[1];
    themeCss.attr('href', themeCss.attr('href').replace(oldVal, that.val()));
    $(document.body).removeClass(oldVal).addClass(that.val());
  });
  $('#sendTestMail').click(function(){
    var host        = $('#smtpHost'    ).val();
    var port        = $('#smtpPort'    ).val();
@@ -440,5 +506,9 @@ $(function(){
  $('#ldapAuthentication').change(function(){
    $('.ldap input').prop('disabled', !$(this).prop('checked'));
  }).change();
  $('#oidcAuthentication').change(function(){
    $('.oidc input, .oidc select').prop('disabled', !$(this).prop('checked'));
  }).change();
 });
 </script>
--- a/src/main/twirl/gitbucket/core/admin/userlist.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/userlist.scala.html
@@ -1,4 +1,4 @@
-@(users: List[gitbucket.core.model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: gitbucket.core.controller.Context)
+@(users: List[gitbucket.core.model.Account], members: Map[String, List[String]], includeRemoved: Boolean, includeGroups: Boolean)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("Manage Users"){
  @gitbucket.core.admin.html.menu("users"){
@@ -10,6 +10,10 @@
      <input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/>
      Include removed users
    </label>
    <label for="includeGroups">
      <input type="checkbox" id="includeGroups" name="includeGroups" @if(includeGroups){checked}/>
      Include group accounts
    </label>
    <table class="table table-bordered table-hover">
      @users.map { account =>
        <tr>
@@ -63,8 +67,9 @@
 }
 <script>
 $(function(){
-  $('#includeRemoved').click(function(){
+  $('#includeRemoved,#includeGroups').click(function(){
-    location.href = '@context.path/admin/users?includeRemoved=' + this.checked;
+    location.href = '@context.path/admin/users?includeRemoved=' + $('#includeRemoved').prop('checked')
      + '&includeGroups=' + $('#includeGroups').prop('checked');
  });
 });
 </script>
--- a/src/main/twirl/gitbucket/core/error.scala.html
+++ b/src/main/twirl/gitbucket/core/error.scala.html
@@ -5,7 +5,7 @@
      <h1>@title</h1>
      @if(context.loginAccount.map{_.isAdmin}.getOrElse(false)){
        @e.map { ex =>
-          <h2>@ex.getMessage</h2>
+          <h2>@ex.toString</h2>
          <table class="table table-condensed table-striped table-hover">
            <tbody>
            @ex.getStackTrace.map{ st =>
--- a/src/main/twirl/gitbucket/core/helper/account.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/account.scala.html
@@ -17,6 +17,12 @@ $(function(){
        function (data) {
          return process(data.options);
        });
    },
    displayText: function(item) {
      return item.label;
    },
    afterSelect: function(item) {
      $('#@id').val(item.value);
    }
  });
 });
--- a/src/main/twirl/gitbucket/core/helper/activities.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html
@@ -14,6 +14,7 @@
        case "reopen_issue"      => detailActivity(activity, "issue-reopened")
        case "open_pullreq"      => detailActivity(activity, "git-pull-request")
        case "merge_pullreq"     => detailActivity(activity, "git-merge")
        case "release"           => detailActivity(activity, "package")
        case "create_repository" => simpleActivity(activity, "repo")
        case "create_branch"     => simpleActivity(activity, "git-branch")
        case "delete_branch"     => simpleActivity(activity, "circle-slash")
--- a/src/main/twirl/gitbucket/core/helper/attached.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -11,7 +11,9 @@
 $(function(){
  @gitbucket.core.plugin.PluginRegistry().getSuggestionProviders.map { provider =>
    @if(provider.context.contains(completionContext)){
-      var @provider.id = @Html(helpers.json(provider.values(repository)));
+      var @provider.id = @Html(helpers.json(provider.options(repository).map { case (value, label) =>
        Map("value" -> value, "label" -> label)
      }));
      @Html(provider.additionalScript)
    }
  }
@@ -23,14 +25,14 @@ $(function(){
          match: /\B@{provider.prefix}([\-+\w]*)$/,
          search: function (term, callback) {
            callback($.map(@{provider.id}, function (proposal) {
-              return proposal.indexOf(term) === 0 ? proposal : null;
+              return proposal.value.indexOf(term) === 0 ? proposal : null;
            }));
          },
-          template: function (value) {
+          template: function (option) {
            return @{Html(provider.template)};
          },
-          replace: function (value) {
+          replace: function (option) {
-            return '@{provider.prefix}' + value + '@{provider.suffix}';
+            return '@{provider.prefix}' + @{Html(provider.replace)} + '@{provider.suffix}';
          },
          index: 1
        },
@@ -63,10 +65,8 @@ $(function(){
 }
@dropzone(clickable: Boolean, textareaId: Option[String]) = {
  url: '@context.path/upload/file/@repository.owner/@repository.name',
-  maxFilesize: 10,
+  maxFilesize: @{FileUtil.MaxFileSize / 1024 / 1024},
  clickable: @clickable,
  acceptedFiles: @Html(FileUtil.mimeTypeWhiteList.mkString("'", ",", "'")),
  dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, JPG, DOCX, PPTX, XLSX, TXT, or PDF.',
  previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your files...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
  success: function(file, id) {
    var attachFile = (file.type.match(/image\/.*/) ? '\n![' + file.name.split('.')[0] : '\n[' + file.name) +
--- a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html
@@ -4,7 +4,8 @@
@import gitbucket.core.view.helpers
@gitbucket.core.helper.html.dropdown(
  value  = if(branch.length == 40) branch.substring(0, 10) else branch,
-  prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree"
+  prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree",
  maxValueWidth = "200px"
 ) {
  <li><div id="branch-control-title">Switch branches<button id="branch-control-close" class="pull-right">&times</button></div></li>
  <li><input id="branch-control-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="Find or create branch ..."/></li>
@@ -12,7 +13,7 @@
  @if(hasWritePermission) {
    <li id="create-branch" style="display: none;">
      <a><form action="@helpers.url(repository)/branches" method="post" style="margin: 0;">
-        <span class="new-branch-name">Create branch:&nbsp;<span class="new-branch"></span></span>
+        <span class="strong">Create branch:&nbsp;<span class="new-branch"></span></span>
        <br><span style="padding-left: 17px;">from&nbsp;'@branch'</span>
        <input type="hidden" name="new">
        <input type="hidden" name="from" value="@branch">
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -10,9 +10,15 @@
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
@if(showIndex){
  <div class="pull-right" style="margin-bottom: 10px;">
-    <div class="btn-group" data-toggle="buttons-radio">
+    @if(oldCommitId.isEmpty && newCommitId.isDefined) {
-      <input type="button" id="btn-unified" class="btn btn-default btn-small active" value="Unified">
+      <a href="@helpers.url(repository)/patch/@newCommitId" class="btn btn-default">Patch</a>
-      <input type="button" id="btn-split" class="btn btn-default btn-small" value="Split">
+    }
    @if(oldCommitId.isDefined && newCommitId.isDefined) {
      <a href="@helpers.url(repository)/patch/@oldCommitId...@newCommitId" class="btn btn-default">Patch</a>
    }
    <div class="btn-group" data-toggle="buttons">
      <input type="button" id="btn-unified" class="btn btn-default active" value="Unified">
      <input type="button" id="btn-split" class="btn btn-default" value="Split">
    </div>
  </div>
  Showing <a href="javascript:void(0);" id="toggle-file-list">@diffs.size changed @helpers.plural(diffs.size, "file")</a>
@@ -151,20 +157,21 @@ $(function(){
  }
  window.viewType = 1;
  if(("&" + location.search.substring(1)).indexOf("&diff=split") != -1){
    $('.container').removeClass('container').addClass('container-wide');
    window.viewType = 0;
  }
  renderDiffs();
  $('#btn-unified').click(function(){
    window.viewType = 1;
-    $('.container-wide').removeClass('container-wide').addClass('container');
+    $('#btn-unified').addClass('active');
    $('#btn-split').removeClass('active');
    renderDiffs();
  });
  $('#btn-split').click(function(){
    window.viewType = 0;
-    $('.container').removeClass('container').addClass('container-wide');
+    $('#btn-unified').removeClass('active');
    $('#btn-split').addClass('active');
    renderDiffs();
  });
@@ -174,6 +181,7 @@ $(function(){
    }
    $(this).closest('table').find('.not-diff').toggle();
  });
  $('.ignore-whitespace').change(function() {
    renderOneDiff($(this).closest("table").find(".diffText"), viewType);
  });
@@ -188,36 +196,23 @@ $(function(){
    }
    return $('<tr class="not-diff"><td colspan="3" class="comment-box-container"></td></tr>');
  }
  if (typeof $('#show-notes')[0] !== 'undefined' && !$('#show-notes')[0].checked) {
    $('#comment-list').children('.inline-comment').hide();
  }
-  $('.diff-outside').on('click','table.diff .add-comment',function() {
+
-    var $this  = $(this);
+  function showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr){
-    var $tr    = $this.closest('tr');
+    // assemble Ajax url
-    var $check = $this.closest('table:not(.diff)').find('.toggle-notes');
+    var url = '@helpers.url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName@issueId.map { id => + '&issueId=@id' };
    var url    = '';
    if (!$check.prop('checked')) {
      $check.prop('checked', true).trigger('change');
    }
    if (!$tr.nextAll(':not(.not-diff):first').prev().hasClass('inline-comment-form')) {
      var commitId = $this.closest('.table-bordered').attr('commitId'),
      fileName = $this.closest('.table-bordered').attr('fileName'),
      oldLineNumber, newLineNumber,
      url = '@helpers.url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName@issueId.map { id => + '&issueId=@id' };
      if (viewType == 0) {
        oldLineNumber = $this.parent().prev('.oldline').attr('line-number');
        newLineNumber = $this.parent().prev('.newline').attr('line-number');
      } else {
        oldLineNumber = $this.parent().prevAll('.oldline').attr('line-number');
        newLineNumber = $this.parent().prevAll('.newline').attr('line-number');
      }
    if (!isNaN(oldLineNumber) && oldLineNumber) {
      url += ('&oldLineNumber=' + oldLineNumber)
    }
    if (!isNaN(newLineNumber) && newLineNumber) {
      url += ('&newLineNumber=' + newLineNumber)
    }
    // send Ajax request
    $.get(url, { dataType : 'html' }, function(responseContent) {
      // create container
      var tmp;
      if (!isNaN(oldLineNumber) && oldLineNumber) {
        if (!isNaN(newLineNumber) && newLineNumber) {
@@ -228,13 +223,56 @@ $(function(){
      } else {
        tmp = getInlineContainer('new');
      }
      // add comment textarea
      tmp.addClass('inline-comment-form').children('.comment-box-container').html(responseContent);
      $tr.nextAll(':not(.not-diff):first').before(tmp);
      // hide reply comment field
      $(tmp).closest('.not-diff').prev().find('.reply-comment').closest('.not-diff').hide();
      // focus textarea
      tmp.find('textarea').focus();
    });
  }
  // Add comment button
  $('.diff-outside').on('click','table.diff .add-comment',function() {
    var $this  = $(this);
    var $tr    = $this.closest('tr');
    var $check = $this.closest('table:not(.diff)').find('.toggle-notes');
    if (!$check.prop('checked')) {
      $check.prop('checked', true).trigger('change');
    }
    if (!$tr.nextAll(':not(.not-diff):first').prev().hasClass('inline-comment-form')) {
      var commitId = $this.closest('.table-bordered').attr('commitId'),
      fileName = $this.closest('.table-bordered').attr('fileName'),
      oldLineNumber, newLineNumber;
      if (viewType == 0) {
        oldLineNumber = $this.parent().prev('.oldline').attr('line-number');
        newLineNumber = $this.parent().prev('.newline').attr('line-number');
      } else {
        oldLineNumber = $this.parent().prevAll('.oldline').attr('line-number');
        newLineNumber = $this.parent().prevAll('.newline').attr('line-number');
      }
      showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr);
    }
  }).on('click', 'table.diff .btn-default', function() {
    // Cancel comment form
    $(this).closest('.not-diff').prev().find('.reply-comment').closest('.not-diff').show();
    $(this).closest('.inline-comment-form').remove();
  });
  // Reply comment
  $('.diff-outside').on('click', '.reply-comment',function(){
    var $this = $(this);
    var $tr    = $this.closest('tr');
    var commitId = $this.closest('.table-bordered').attr('commitId');
    var fileName = $this.data('filename');
    var oldLineNumber = $this.data('oldline');
    var newLineNumber = $this.data('newline');
    showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr);
  });
  function renderOneCommitCommentIntoDiff($v, diff){
    var filename = $v.attr('filename');
    var oldline  = $v.attr('oldline');
@@ -257,6 +295,7 @@ $(function(){
      tmp.hide();
    }
  }
  function renderStatBar(add, del){
    if(add + del > 5){
      if(add){
@@ -282,6 +321,7 @@ $(function(){
    }
    return ret;
  }
  function renderOneDiff(diffText, viewType){
    var table = diffText.closest("table[data-diff-id]");
    var i = table.data("diff-id");
@@ -305,12 +345,59 @@ $(function(){
        }
      });
    }
    return table;
  }
  function renderReplyComment($table){
    var elements = {};
    var filename, newline, oldline;
    $table.find('.comment-box-container .inline-comment').each(function(i, e){
      filename = $(e).attr('filename');
      newline = $(e).attr('newline');
      oldline = $(e).attr('oldline');
      var key = filename + '-' + newline + '-' + oldline;
      elements[key] = {
        element: $(e),
        filename: filename,
        newline: newline,
        oldline: oldline
      };
    });
    for(var key in elements){
      filename = elements[key]['filename'];
      oldline = elements[key]['oldline'];
      newline = elements[key]['newline'];
      var $v = $('<div class="commit-comment-box reply-comment-box">')
        .append($('<input type="text" class="form-control reply-comment" placeholder="Reply...">')
          .data('filename', filename)
          .data('newline',  newline)
          .data('oldline',  oldline));
      var tmp;
      if (typeof oldline !== 'undefined') {
        if (typeof newline !== 'undefined') {
          tmp = getInlineContainer();
        } else {
          tmp = getInlineContainer('old');
        }
        tmp.children('td:first').html($v);
      } else {
        tmp = getInlineContainer('new');
        tmp.children('td:last').html($v);
      }
      elements[key]['element'].closest('.not-diff').after(tmp);
    }
  }
  function renderDiffs(){
    var i = 0, diffs = $('.diffText');
    function render(){
      if(diffs[i]){
-        renderOneDiff($(diffs[i]), viewType);
+        var $table = renderOneDiff($(diffs[i]), viewType);
        @if(hasWritePermission) {
          renderReplyComment($table);
        }
        i++;
        setTimeout(render);
      }
--- a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
@@ -1,11 +1,12 @@
@(value : String  = "",
  prefix: String  = "",
  style : String  = "",
  maxValueWidth : String  = "",
  right : Boolean = false,
  filter: (String, String)  = ("",""))(body: Html)
@defining(if(filter._1.isEmpty) "" else filter._1 + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId =>
  <div class="btn-group" @if(style.nonEmpty){style="@style"}>
-    <button
+    <button id = "test"
        class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
      @if(value.isEmpty){
        <i class="octicon octicon-gear"></i>
@@ -13,7 +14,10 @@
        @if(prefix.nonEmpty){
          <span class="muted">@prefix:</span>
        }
-        <span class="strong">@value</span>
+        <span class="strong"
              @if(maxValueWidth.nonEmpty){style="display:inline-block; vertical-align:bottom; overflow-x:hidden; max-width:@maxValueWidth; text-overflow:ellipsis"}>
          @value
        </span>
      }
      <span class="caret"></span>
    </button>
@@ -26,7 +30,7 @@
  </div>
  @if(filterId.nonEmpty) {
    <script>
-    $(window).load(function(){
+    $(window).on('load', function(){
      $('#@{filterId}-input').parent().click(function(e) {
        e.stopPropagation();
      });
--- a/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html
@@ -1,7 +1,7 @@
@(account: Option[gitbucket.core.model.Account])(implicit context: gitbucket.core.controller.Context)
 <div id="avatar" class="muted">
  @if(account.nonEmpty && account.get.image.nonEmpty){
-    <img src="@context.path/@account.get.userName/_avatar" style="with: 120px; height: 120px;"/>
+    <img src="@context.path/@account.get.userName/_avatar" style="width: 120px; height: 120px;"/>
  } else {
    <div id="clickable">Upload Image</div>
  }
--- a/Show More
+++ b/Show More
`@@ -1 +1 @@`
	`addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")`	`addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0")`