Copy only LFS dir and insert default priorities in forking repository

Release 4.14.1
(refs #1631 )Copy repository files directory only if it exists
2026-05-09 02:07:08 +02:00 · 2017-07-05 00:21:15 +09:00 · 2017-07-05 00:01:33 +09:00 · 2017-07-04 23:57:18 +09:00
750 changed files with 148973 additions and 180209 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,6 +1,7 @@
-# The guidelines for contributing
+# Guideline for Issues

- 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.
- You can edit the GitBucket documentation on Wiki if you have a GitHub account. When you find any mistakes or lacks in the documentation, please update it directly.
- All your contributions are handled as [Apache Software License, Version 2.0](https://github.com/gitbucket/gitbucket/blob/master/LICENSE). When you create a pull request or update the documentation, we assume you agreed this clause.
+- 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 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.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-### Before submitting an issue to GitBucket I have first:
+### Before submitting an issue to Gitbucket I have first:

 - [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
 - [] searched for similar already existing issue
@@ -9,10 +9,11 @@
 ## Issue
 **Impacted version**: xxxx

-**Deployment mode**: *explain here how you use GitBucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
+**Deployment mode**: *explain here how you use gitbucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*

 **Problem description**:
 - *be as explicit has you can*
 - *describe the problem and its symptoms*
 - *explain how to reproduce*
 - *attach whatever information that can help understanding the context (screen capture, log files)*
+- *do your best to use a correct english (re-read yourself)*
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-### Before submitting a pull-request to GitBucket I have first:
+### Before submitting a pull-request to Gitbucket I have first:

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

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

 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.

-What's New in 4.22.x
+Release Notes
 -------------
-### 4.22.0 - 3 Mar 2018
- Pull request merge strategy settings
- Create repository with an empty commit
- Improve database viewer
- Update maven-repository-plugin
+### 4.14.1 - 4 Jul 2017
+- Bug fix: Possibility of error in forking repository

-See the [change log](CHANGELOG.md) for all of the updates.
+### 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/build.sbt
+++ b/build.sbt
@@ -1,21 +1,16 @@
-import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
-import com.typesafe.sbt.pgp.PgpKeys._
-
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.22.0"
-val ScalatraVersion = "2.6.1"
-val JettyVersion = "9.4.7.v20170914"
+val GitBucketVersion = "4.14.1"
+val ScalatraVersion = "2.5.0"
+val JettyVersion = "9.3.19.v20170502"

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

 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.4"
+scalaVersion := "2.12.2"

 // dependency settings
 resolvers ++= Seq(
@@ -26,45 +21,42 @@ resolvers ++= Seq(
  "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
 )
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.10.0.201712302008-r",
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.10.0.201712302008-r",
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.7.0.201704051617-r",
+  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.7.0.201704051617-r",
  "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
  "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-forms"               % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"               % "3.5.3",
-  "commons-io"                      %  "commons-io"                   % "2.6",
+  "org.json4s"                      %% "json4s-jackson"               % "3.5.1",
+  "io.github.gitbucket"             %% "scalatra-forms"               % "1.1.0",
+  "commons-io"                      %  "commons-io"                   % "2.5",
  "io.github.gitbucket"             %  "solidbase"                    % "1.0.2",
-  "io.github.gitbucket"             %  "markedj"                      % "1.0.15",
-  "org.apache.commons"              %  "commons-compress"             % "1.15",
-  "org.apache.commons"              %  "commons-email"                % "1.5",
-  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.4",
-  "org.apache.sshd"                 %  "apache-sshd"                  % "1.6.0" exclude("org.slf4j","slf4j-jdk14"),
-  "org.apache.tika"                 %  "tika-core"                    % "1.17",
-  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.10",
+  "io.github.gitbucket"             %  "markedj"                      % "1.0.12",
+  "org.apache.commons"              %  "commons-compress"             % "1.13",
+  "org.apache.commons"              %  "commons-email"                % "1.4",
+  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.3",
+  "org.apache.sshd"                 %  "apache-sshd"                  % "1.4.0" exclude("org.slf4j","slf4j-jdk14"),
+  "org.apache.tika"                 %  "tika-core"                    % "1.14",
+  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.8",
+  "joda-time"                       %  "joda-time"                    % "2.9.9",
  "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
-  "com.h2database"                  %  "h2"                           % "1.4.196",
-  "org.mariadb.jdbc"                %  "mariadb-java-client"          % "2.2.2",
-  "org.postgresql"                  %  "postgresql"                   % "42.1.4",
+  "com.h2database"                  %  "h2"                           % "1.4.195",
+  "mysql"                           %  "mysql-connector-java"         % "6.0.6",
+  "org.postgresql"                  %  "postgresql"                   % "42.0.0",
  "ch.qos.logback"                  %  "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      %  "HikariCP"                     % "2.7.4",
-  "com.typesafe"                    %  "config"                       % "1.3.2",
-  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.8",
+  "com.zaxxer"                      %  "HikariCP"                     % "2.6.1",
+  "com.typesafe"                    %  "config"                       % "1.3.1",
+  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.0",
  "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.1.Final",
-  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.1-akka-2.5.x" exclude("c3p0","c3p0"),
+  "org.cache2k"                     %  "cache2k-all"                  % "1.0.0.CR1",
+  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.0-akka-2.4.x" exclude("c3p0","c3p0"),
  "net.coobird"                     %  "thumbnailator"                % "0.4.8",
-  "com.github.zafarkhaja"           %  "java-semver"                  % "0.9.0",
-  "com.nimbusds"                    %  "oauth2-oidc-sdk"              % "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.13.0"         % "test",
-  "com.wix"                         %  "wix-embedded-mysql"           % "3.0.0"          % "test",
-  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.6"            % "test",
-  "net.i2p.crypto"                  % "eddsa"                         % "0.2.0",
-  "is.tagomor.woothee"              % "woothee-java"                  % "1.7.0"
+  "org.mockito"                     %  "mockito-core"                 % "2.7.22"         % "test",
+  "com.wix"                         %  "wix-embedded-mysql"           % "2.1.4"          % "test",
+  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.0"            % "test"
 )

 // Compiler settings
@@ -93,28 +85,17 @@ assemblyMergeStrategy in assembly := {
 }

 // JRebel
-//Seq(jrebelSettings: _*)
+Seq(jrebelSettings: _*)

-//jrebel.webLinks += (target in webappPrepare).value
-//jrebel.enabled := System.getenv().get("JREBEL") != null
+jrebel.webLinks += (target in webappPrepare).value
+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") }
+  Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
 }

 // Create executable war file
-val ExecutableConfig = config("executable").hide
-Keys.ivyConfigurations += ExecutableConfig
+val executableConfig = config("executable").hide
+Keys.ivyConfigurations += executableConfig
 libraryDependencies ++= Seq(
  "org.eclipse.jetty" % "jetty-security"     % JettyVersion % "executable",
  "org.eclipse.jetty" % "jetty-webapp"       % JettyVersion % "executable",
@@ -129,8 +110,8 @@ libraryDependencies ++= Seq(

 val executableKey = TaskKey[File]("executable")
 executableKey := {
-  import java.util.jar.Attributes.{Name => AttrName}
-  import java.util.jar.{Manifest => JarManifest}
+  import java.util.jar.{ Manifest => JarManifest }
+  import java.util.jar.Attributes.{ Name => AttrName }

  val workDir   = Keys.target.value / "executable"
  val warName   = Keys.name.value + ".war"
@@ -143,7 +124,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/") ||
@@ -162,25 +143,14 @@ executableKey := {
    IO copyFile (classDir / name, temp / name)
  }

-  // include plugins
-  val pluginsDir = temp / "WEB-INF" / "classes" / "plugins"
-  IO createDirectory (pluginsDir)
-  IO copyFile(Keys.baseDirectory.value / "plugins.json", pluginsDir / "plugins.json")
-
-  val json = IO read(Keys.baseDirectory.value / "plugins.json")
-  PluginsJson.getUrls(json).foreach { url =>
-    log info s"Download: ${url}"
-    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.allPaths --- PathFinder(temp)).get pair { file => IO.relativizeFile(temp, file) }
+  val contentMappings   = (temp.*** --- PathFinder(temp)).get pair relativeTo(temp)
  val manifest          = new JarManifest
-  manifest.getMainAttributes put (AttrName.MANIFEST_VERSION, "1.0")
-  manifest.getMainAttributes put (AttrName.MAIN_CLASS,       "JettyLauncher")
+  manifest.getMainAttributes put (AttrName.MANIFEST_VERSION,    "1.0")
+  manifest.getMainAttributes put (AttrName.MAIN_CLASS,          "JettyLauncher")
  val outputFile    = workDir / warName
-  IO jar (contentMappings.map { case (file, path) => (file, path.toString) } , outputFile, manifest)
+  IO jar (contentMappings, outputFile, manifest)

  // generate checksums
  Seq(
@@ -200,7 +170,7 @@ executableKey := {
 publishTo := {
  val nexus = "https://oss.sonatype.org/"
  if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
-  else                                         Some("releases"  at nexus + "service/local/staging/deploy/maven2")
+  else                             Some("releases"  at nexus + "service/local/staging/deploy/maven2")
 }
 publishMavenStyle := true
 pomIncludeRepository := { _ => false }
@@ -249,8 +219,3 @@ 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
@@ -1,21 +0,0 @@
-module gitbucket 1.0;
-
-require {
-	type smtp_port_t;
-	type tomcat_t;
-	type tomcat_var_lib_t;
-	type unreserved_port_t;
-
-	class file { execute };
-	class tcp_socket { name_bind };
-	class tcp_socket { name_connect };
-}
-
-# allow tomcat to send emails
-allow tomcat_t smtp_port_t:tcp_socket { name_connect };
-
-# allow file executes, required during repo creation
-allow tomcat_t tomcat_var_lib_t:file { execute };
-
-# allow tomcat to serve repositories via SSH
-allow tomcat_t unreserved_port_t:tcp_socket { name_bind };
--- a/contrib/linux/redhat/selinux/readme.md
+++ b/contrib/linux/redhat/selinux/readme.md
@@ -1,32 +0,0 @@
-# Red Hat Enterprise Linux / CentOS SELinux policy module for GitBucket
-
-One way to run GitBucket on Enterprise Linux is under Tomcat. Since EL 7.4, Tomcat is no longer unconfined.
-Thus since 7.4, Enterprise Linux blocks certain operations that are required for GitBucket to work properly:
-
-* Tomcat is not allowed to connect to SMTP ports, which is required to send email notifications.
-* Tomcat is not allowed to execute files, which is required for creating repositories.
-* Tomcat is not allowed to act as a server on unreserved ports, which is required for serving repositories via SSH.
-
-To mitigate this, you can use the SELinux policy module provided as `gitbucket.te`. You can deploy the module with the
-attached script, e.g.:
-
-~~~
-./sedeploy.sh gitbucket
-~~~
-
-You most likely also need to fix file contexts on your system. Assuming a new, default Tomcat installation on 7.4, you
-can do so by issuing the following commands:
-
-~~~
-GITBUCKET_HOME='/usr/share/tomcat/.gitbucket'
-mkdir -p ${GITBUCKET_HOME}
-chown tomcat.tomcat ${GITBUCKET_HOME}
-semanage fcontext -a -t tomcat_var_lib_t "${GITBUCKET_HOME}(/.*)?"
-restorecon -rv ${GITBUCKET_HOME}
-
-JAVA_CONF='/usr/share/tomcat/.java'
-mkdir -p ${JAVA_CONF}
-chown tomcat.tomcat ${JAVA_CONF}
-semanage fcontext -a -t tomcat_cache_t "${JAVA_CONF}(/.*)?"
-restorecon -rv ${JAVA_CONF}
-~~~
--- a/contrib/linux/redhat/selinux/sedeploy.sh
+++ b/contrib/linux/redhat/selinux/sedeploy.sh
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MODULE=${1}
-
-# this will create a .mod file
-checkmodule -M -m -o ${MODULE}.mod ${MODULE}.te
-
-# this will create a compiled semodule
-semodule_package -m ${MODULE}.mod -o ${MODULE}.pp
-
-# this will install the module
-semodule -i ${MODULE}.pp
--- a/doc/comment_action.md
+++ b/doc/comment_action.md
@@ -6,22 +6,17 @@ The details are saved at `ISSUE_COMMENT` table.
 To determine if it was any operation, you see the `ACTION` column.
 And in the case of some actions, `CONTENT` column value contains additional information.

-|ACTION          |CONTENT               |
-|----------------|----------------------|
-|comment         |comment               |
-|close_comment   |comment               |
-|reopen_comment  |comment               |
-|close           |"Close"               |
-|reopen          |"Reopen"              |
-|commit          |comment commitId      |
-|merge           |comment               |
-|delete_branch   |branchName            |
-|refer           |issueId:title         |
-|add_label       |labelName             |
-|delete_label    |labelName             |
-|change_priority |oldPriority:priority  |
-|change_milestone|oldMilestone:milestone|
-|assign          |oldAssigned:assigned  |
+|ACTION         |CONTENT          |
+|---------------|-----------------|
+|comment        |comment          |
+|close_comment  |comment          |
+|reopen_comment |comment          |
+|close          |"Close"          |
+|reopen         |"Reopen"         |
+|commit         |comment commitId |
+|merge          |comment          |
+|delete_branch  |branchName       |
+|refer          |issueId:title    |

 ### comment

@@ -59,23 +54,3 @@ Therefore, this comment is not displayed, and not counted as a comment.

 This value is saved when other issue or issue comment contains reference to the issue like `#issueId`.
 At the same time, store id and title of the referrer issue as `id:title`.
-
-### add_label
-
-This value is saved when users have added the label.
-
-### delete_label
-
-This value is saved when users have deleted the label.
-
-### change_priority
-
-This value is saved when users have changed the priority.
-
-### change_milestone
-
-This value is saved when users have changed the milestone.
-
-### assign
-
-This value is saved when users have assign issue/PR to user or remove the assign.
--- a/doc/jrebel.md
+++ b/doc/jrebel.md
@@ -1,25 +1,35 @@
 JRebel integration (optional)
 =============================

-[JRebel](https://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
-JRebel is generally able to eliminate the need for the slow "app restart" per modification of codes. Alsp it's only used during development, and doesn't change your deployed app in any way.
+[JRebel](http://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 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 [myJRebel](https://my.jrebel.com/register). You will need to create an account.
+Sign up for a [usage plan](https://my.jrebel.com/). You will need to create an account.

 ## 2. Download JRebel

-Download the most recent ["nosetup" JRebel zip](https://zeroturnaround.com/software/jrebel/download/prev-releases/).
+Download the most recent ["nosetup" JRebel zip](http://zeroturnaround.com/software/jrebel/download/prev-releases/).
 Next, unzip the downloaded file.

 ## 3. Activate

-Follow `readme.txt` in the extracted directory to activate your downloaded JRebel.
+Follow the [instructions on the JRebel website](http://zeroturnaround.com/software/jrebel/download/prev-releases/) 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.

@@ -28,16 +38,17 @@ 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 set the environment variable `JREBEL`.
-For example, if you unzipped your JRebel download in your home directory, you would use:
+To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux), and add the following line:

 ```bash
-export JREBEL=~/jrebel/legacy/jrebel.jar      # legacy agent
-export JREBEL=~/jrebel/lib/libjrebel64.dylib  # new agent
+export JREBEL=/path/to/jrebel/jrebel.jar
 ```

-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.
+For example, if you unzipped your JRebel download in your home directory, you whould use:
+
+```bash
+export JREBEL=~/jrebel/jrebel.jar
+```

 Now reload your shell:

@@ -62,26 +73,39 @@ $ ./sbt
 You will start the servlet container slightly differently now that you're using sbt.

 ```
-> jetty:quickstart
+> jetty:start
 :
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  #############################################################
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  Legacy Agent 7.0.15 (201709080836)
-2017-09-21 15:46:35 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  Over the last 2 days JRebel prevented
-2017-09-21 15:46:35 JRebel:  at least 8 redeploys/restarts saving you about 0.3 hours.
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  Licensed to Naoki Takezoe (using myJRebel).
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:
-2017-09-21 15:46:35 JRebel:  #############################################################
-2017-09-21 15:46:35 JRebel:
+[info] starting server ...
+[success] Total time: 3 s, completed Jan 3, 2016 9:47:55 PM
+2016-01-03 21:47:57 JRebel:
+2016-01-03 21:47:57 JRebel: A newer version '6.3.1' is available for download
+2016-01-03 21:47:57 JRebel: from http://zeroturnaround.com/software/jrebel/download/
+2016-01-03 21:47:57 JRebel:
+2016-01-03 21:47:58 JRebel: Contacting myJRebel server ..
+2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/classes' will be monitored for changes.
+2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/test-classes' will be monitored for changes.
+2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/webapp' will be monitored for changes.
+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:  JRebel Legacy Agent 6.2.5 (201509291538)
+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:
 :

-> ~compile
-[success] Total time: 2 s, completed 2017/09/21 15:50:06
+> ~ copy-resources
+[success] Total time: 0 s, completed Jan 3, 2016 9:13:54 PM
 1. Waiting for source changes... (press enter to interrupt)
 ```

@@ -90,11 +114,12 @@ For example, you can change the title on `src/main/twirl/gitbucket/core/main.sca

 ```html
 :
-  <a href="@context.path/" class="logo">
-    <img src="@helpers.assets("/common/images/gitbucket.svg")" style="width: 24px; height: 24px; display: inline;"/>
-    GitBucket
+  <a class="navbar-brand" href="@path/">
+    <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px;"/>GitBucket
+    @defining(AutoUpdate.getCurrentVersion){ version =>
+      <span class="header-version">@version.majorVersion.@version.minorVersion</span>
+    }
    change code !!!!!!!!!!!!!!!!
-    <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span>
  </a>
 :
 ```
@@ -103,17 +128,21 @@ If JRebel is doing is correctly installed you will see a notice for you:

 ```
 1. Waiting for source changes... (press enter to interrupt)
-[info] Compiling 1 Scala source to /Users/naoki.takezoe/gitbucket/target/scala-2.12/classes...
-[success] Total time: 1 s, completed 2017/09/21 15:55:40
+2016-01-03 21:48:42 JRebel: Reloading class 'gitbucket.core.html.main$'.
+[info] Wrote rebel.xml to /git/gitbucket/target/scala-2.11/resource_managed/main/rebel.xml
+[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)
-2017-09-21 15:55:40 JRebel: Reloading class 'gitbucket.core.html.main$'.
+2016-01-03 21:49:13 JRebel: Reloading class 'gitbucket.core.html.main$'.
 ```

 ## 6. Limitations

-JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routing patterns, there is nothing JRebel can do, you will have to restart by `jetty:quickstart`.
+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`.
--- a/doc/licenses.md
+++ b/doc/licenses.md
@@ -1,101 +0,0 @@
-# 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/notification.md
+++ b/doc/notification.md
@@ -0,0 +1,24 @@
+Notification Email
+========
+
+GitBucket can send email notification to users if this feature is enabled by an administrator.
+
+The timing of the notification are as follows:
+
+##### at the issue registration (new issue, new pull request)
+When a record is saved into the ```ISSUE``` table, GitBucket does the notification.
+
+##### at the comment registration
+Among the records in the ```ISSUE_COMMENT``` table, them to be counted as a comment (i.e. the record ```ACTION``` column value is "comment" or "close_comment" or "reopen_comment") are saved, GitBucket does the notification.
+
+##### at the status update (close, reopen, merge)
+When the ```CLOSED``` column value is updated, GitBucket does the notification.
+
+Notified users are as follows:
+
+* individual repository's owner
+* group members of group repository
+* collaborators
+* participants
+
+However, the person performing the operation is excluded from the notification.
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -6,7 +6,7 @@ Developer's Guide
 * [Authentication in Controller](authenticator.md)
 * [About Action in Issue Comment](comment_action.md)
 * [Activity Types](activity.md)
+ * [Notification Email](notification.md)
 * [Automatic Schema Updating](auto_update.md)
 * [Release Operation](release.md)
 * [JRebel integration (optional)](jrebel.md)
- * [Licenses](licenses.md)
--- a/plugins.json
+++ b/plugins.json
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "notifications",
-    "name": "Notifications Plugin",
-    "description": "Provides notifications feature on GitBucket.",
-    "versions": [
-      {
-        "version": "1.4.0",
-        "range": ">=4.19.0",
-        "url": "https://github.com/gitbucket/gitbucket-notifications-plugin/releases/download/1.4.0/gitbucket-notifications-plugin_2.12-1.4.0.jar"
-      }
-    ],
-    "default": true
-  },
-  {
-    "id": "emoji",
-    "name": "Emoji Plugin",
-    "description": "Provides Emoji support for GitBucket.",
-    "versions": [
-      {
-        "version": "4.5.0",
-        "range": ">=4.18.0",
-        "url": "https://github.com/gitbucket/gitbucket-emoji-plugin/releases/download/4.5.0/gitbucket-emoji-plugin_2.12-4.5.0.jar"
-      }
-    ],
-    "default": false
-  },
-  {
-    "id": "gist",
-    "name": "Gist Plugin",
-    "description": "Provides Gist feature on GitBucket.",
-    "versions": [
-      {
-        "version": "4.12.0",
-        "range": ">=4.21.0",
-        "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.12.0/gitbucket-gist-plugin-assembly-4.12.0.jar"
-      }
-    ],
-    "default": false
-  },
-  {
-    "id": "pages",
-    "name": "Pages Plugin",
-    "description": "Project pages for gitbucket",
-    "versions": [
-      {
-        "version": "1.6.0",
-        "range": ">=4.19.0",
-        "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,13 +1,13 @@
-import java.security.MessageDigest
+import java.security.MessageDigest;
 import scala.annotation._
 import sbt._
-import io._
+import sbt.Using._

 object Checksums {
  private val bufferSize = 2048

  def generate(source:File, target:File, algorithm:String):Unit =
-      sbt.IO write (target, compute(source, algorithm))
+      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
@@ -1,16 +0,0 @@
-import com.eclipsesource.json.Json
-import scala.collection.JavaConverters._
-
-object PluginsJson {
-
-  def getUrls(json: String): Seq[String] = {
-    val value = Json.parse(json)
-    value.asArray.values.asScala.map { plugin =>
-      val pluginObject = plugin.asObject
-      val latestVersionObject = pluginObject.get("versions").asArray.asScala.head.asObject
-      latestVersionObject.get("url").asString
-    }
-  }
-
-}
-
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=0.13.15
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -1 +0,0 @@
-libraryDependencies += "com.eclipsesource.minimal-json" % "minimal-json" % "0.9.4"
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,10 +1,8 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

-addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.13")
-addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.5")
-//addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "4.0.0")
-//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
-addSbtPlugin("org.scalatra.sbt"     % "sbt-scalatra"      % "1.0.1")
-addSbtPlugin("com.jsuereth"         % "sbt-pgp"           % "1.1.0")
-addSbtCoursier
-addSbtPlugin("com.typesafe.sbt"     % "sbt-license-report" % "1.2.0")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.0")
+addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.3")
+addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "2.1.1")
+addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-pgp"           % "0.8.3")
+addSbtPlugin("io.get-coursier"      % "sbt-coursier"      % "1.0.0-M15")
--- a/project/project/plugins.sbt
+++ b/project/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -40,7 +40,7 @@ public class JettyLauncher {
                            }
                            break;
                        case "--max_file_size":
-                            System.setProperty("gitbucket.maxFileSize", dim[1]);
+                            System.setProperty("gitbucket.maxFileSize", dim[2]);
                            break;
                        case "--gitbucket.home":
                            System.setProperty("gitbucket.home", dim[1]);
@@ -48,12 +48,6 @@ public class JettyLauncher {
                        case "--temp_dir":
                            tmpDirPath = dim[1];
                            break;
-                        case "--plugin_dir":
-                            System.setProperty("gitbucket.pluginDir", dim[1]);
-                            break;
-                        case "--validate_password":
-                            System.setProperty("gitbucket.validate.password", dim[1]);
-                            break;
                    }
                }
            }
--- a/src/main/resources/update/gitbucket-core_4.21.xml
+++ b/src/main/resources/update/gitbucket-core_4.21.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <createTable tableName="RELEASE">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="TAG" type="varchar(100)" nullable="false"/>
-    <column name="NAME" type="varchar(100)" nullable="false"/>
-    <column name="AUTHOR" type="varchar(100)" nullable="false"/>
-    <column name="CONTENT" type="text" nullable="true"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_RELEASE_PK" tableName="RELEASE" columnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
-  <addForeignKeyConstraint constraintName="IDX_RELEASE_FK0" baseTableName="RELEASE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <createTable tableName="RELEASE_ASSET">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="TAG" type="varchar(100)" nullable="false"/>
-    <column name="RELEASE_ASSET_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="FILE_NAME" type="varchar(260)" nullable="false"/>
-    <column name="LABEL" type="varchar(100)" nullable="true"/>
-    <column name="SIZE" type="bigint" nullable="false"/>
-    <column name="UPLOADER" type="varchar(100)" nullable="false"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_RELEASE_ASSET_PK" tableName="RELEASE_ASSET" columnNames="USER_NAME, REPOSITORY_NAME, TAG, FILE_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_RELEASE_ASSET_FK1" baseTableName="RELEASE_ASSET" baseColumnNames="USER_NAME, REPOSITORY_NAME, TAG" referencedTableName="RELEASE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
-
-  <createTable tableName="ACCOUNT_FEDERATION">
-    <column name="ISSUER" type="varchar(100)" nullable="false"/>
-    <column name="SUBJECT" type="varchar(100)" nullable="false"/>
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-  </createTable>
-  <addPrimaryKey constraintName="IDX_ACCOUNT_FEDERATION_PK" tableName="ACCOUNT_FEDERATION" columnNames="ISSUER, SUBJECT"/>
-  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_FEDERATION_FK0" baseTableName="ACCOUNT_FEDERATION" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.22.xml
+++ b/src/main/resources/update/gitbucket-core_4.22.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <addColumn tableName="REPOSITORY">
-    <column name="MERGE_OPTIONS" type="varchar(200)" nullable="false" defaultValue="merge-commit,squash,rebase"/>
-    <column name="DEFAULT_MERGE_OPTION" type="varchar(100)" nullable="false" defaultValue="merge-commit"/>
-  </addColumn>
-</changeSet>
--- 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.{ReleaseController, _}
+import gitbucket.core.controller._
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.servlet._
@@ -25,33 +25,30 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
    context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
    context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
    context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
+    context.addFilter("ghCompatRepositoryAccessFilter", new GHCompatRepositoryAccessFilter)
+    context.getFilterRegistration("ghCompatRepositoryAccessFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")

    // Register controllers
-    context.mount(new PreProcessController, "/*")
+    context.mount(new AnonymousAccessController, "/*")

-    context.addFilter("pluginControllerFilter", new PluginControllerFilter)
-    context.getFilterRegistration("pluginControllerFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    PluginRegistry().getControllers.foreach { case (controller, path) =>
+      context.mount(controller, path)
+    }

+    context.mount(new IndexController, "/")
+    context.mount(new ApiController, "/api/v3")
    context.mount(new FileUploadController, "/upload")
-
-    val filter = new CompositeScalatraFilter()
-    filter.mount(new IndexController, "/")
-    filter.mount(new ApiController, "/api/v3")
-    filter.mount(new SystemSettingsController, "/admin")
-    filter.mount(new DashboardController, "/*")
-    filter.mount(new AccountController, "/*")
-    filter.mount(new RepositoryViewerController, "/*")
-    filter.mount(new WikiController, "/*")
-    filter.mount(new LabelsController, "/*")
-    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, "/*")
+    context.mount(new SystemSettingsController, "/admin")
+    context.mount(new DashboardController, "/*")
+    context.mount(new AccountController, "/*")
+    context.mount(new RepositoryViewerController, "/*")
+    context.mount(new WikiController, "/*")
+    context.mount(new LabelsController, "/*")
+    context.mount(new PrioritiesController, "/*")
+    context.mount(new MilestonesController, "/*")
+    context.mount(new IssuesController, "/*")
+    context.mount(new PullRequestsController, "/*")
+    context.mount(new RepositorySettingsController, "/*")

    // 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
@@ -39,22 +39,5 @@ object GitBucketCoreModule extends Module("gitbucket-core",
    new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
    new SqlMigration("update/gitbucket-core_4.14.sql")
  ),
-  new Version("4.14.1"),
-  new Version("4.15.0"),
-  new Version("4.16.0"),
-  new Version("4.17.0"),
-  new Version("4.18.0"),
-  new Version("4.19.0"),
-  new Version("4.19.1"),
-  new Version("4.19.2"),
-  new Version("4.19.3"),
-  new Version("4.20.0"),
-  new Version("4.21.0",
-    new LiquibaseMigration("update/gitbucket-core_4.21.xml")
-  ),
-  new Version("4.21.1"),
-  new Version("4.21.2"),
-  new Version("4.22.0",
-    new LiquibaseMigration("update/gitbucket-core_4.22.xml")
-  )
+  new Version("4.14.1")
 )
--- 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, None, commit.id, false, false)
+    val diffs = JGitUtil.getDiffs(git, commit.id, false)
    ApiCommit(
      id        = commit.id,
      message   = commit.fullMessage,
      timestamp = commit.commitTime,
-      added     = diffs.collect {
+      added     = diffs._1.collect {
        case x if x.changeType == DiffEntry.ChangeType.ADD    => x.newPath
      },
-      removed   = diffs.collect {
+      removed   = diffs._1.collect {
        case x if x.changeType == DiffEntry.ChangeType.DELETE => x.oldPath
      },
-      modified  = diffs.collect {
+      modified  = diffs._1.collect {
        case x if x.changeType != DiffEntry.ChangeType.ADD && x.changeType != DiffEntry.ChangeType.DELETE => x.newPath
      },
      author    = ApiPersonIdent.author(commit),
      committer = ApiPersonIdent.committer(commit)
    )(repositoryName, urlIsHtmlUrl)
  }
-  def forWebhookPayload(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = apply(git, repositoryName, commit, true)
+  def forPushPayload(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
@@ -1,124 +0,0 @@
-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,13 +1,6 @@
 package gitbucket.core.api

 /**
- * Path for API url.
- * If set path '/repos/aa/bb' then, expand 'http://server:port/repos/aa/bb' when converted to json.
+ * path for api url. if set path '/repos/aa/bb' then, expand 'http://server:post/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,8 +19,7 @@ case class ApiPullRequest(
  merged_by: Option[ApiUser],
  title: String,
  body: String,
-  user: ApiUser,
-  assignee: Option[ApiUser]){
+  user: 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")
@@ -40,12 +39,10 @@ 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(
@@ -62,16 +59,14 @@ object ApiPullRequest{
      merged_by  = mergedComment.map { case (_, account) => ApiUser(account) },
      title      = issue.title,
      body       = issue.content.getOrElse(""),
-      user       = user,
-      assignee   = assignee
+      user       = user
    )

  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,7 +24,6 @@ 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{
@@ -51,18 +50,17 @@ object ApiRepository{
  def apply(repositoryInfo: RepositoryInfo, owner: Account): ApiRepository =
    this(repositoryInfo.repository, ApiUser(owner))

-  def forWebhookPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
+  def forPushPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount, urlIsHtmlUrl=true)

  def forDummyPayload(owner: ApiUser): ApiRepository =
    ApiRepository(
-      name           = "dummy",
-      full_name      = s"${owner.login}/dummy",
-      description    = "",
-      watchers       = 0,
-      forks          = 0,
-      `private`      = false,
-      default_branch = "master",
-      owner          = owner
-    )(true)
+      name="dummy",
+      full_name=s"${owner.login}/dummy",
+      description="",
+      watchers=0,
+      forks=0,
+      `private`=false,
+      default_branch="master",
+      owner=owner)(true)
 }
--- a/src/main/scala/gitbucket/core/api/JsonFormat.scala
+++ b/src/main/scala/gitbucket/core/api/JsonFormat.scala
@@ -1,24 +1,23 @@
 package gitbucket.core.api

-import java.time._
-import java.time.format.DateTimeFormatter
-import java.util.Date
-
-import scala.util.Try
-
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import org.joda.time.format._
 import org.json4s._
 import org.json4s.jackson.Serialization
+import java.util.Date
+import scala.util.Try

 object JsonFormat {

-  case class Context(baseUrl: String, sshUrl: Option[String])
+  case class Context(baseUrl: String)

-  val parserISO = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
+  val parserISO = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")

  val jsonFormats = Serialization.formats(NoTypeHints) + new CustomSerializer[Date](format =>
    (
-      { case JString(s) => Try(Date.from(Instant.parse(s))).getOrElse(throw new MappingException("Can't convert " + s + " to Date")) },
-      { case x: Date => JString(OffsetDateTime.ofInstant(x.toInstant, ZoneId.of("UTC")).format(parserISO)) }
+      { case JString(s) => Try(parserISO.parseDateTime(s)).toOption.map(_.toDate).getOrElse(throw new MappingException("Can't convert " + s + " to Date")) },
+      { case x: Date => JString(parserISO.print(new DateTime(x).withZone(DateTimeZone.UTC))) }
    )
  ) + FieldSerializer[ApiUser]() +
    FieldSerializer[ApiPullRequest]() +
@@ -34,31 +33,23 @@ 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](_ => ({
-    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
-  }))
+  def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>
+    (
+      {
+        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)
+      }
+    )
+  )

  /**
   * convert object to json string
   */
-  def apply(obj: AnyRef)(implicit c: Context): String =
-    Serialization.write(obj)(jsonFormats + apiPathSerializer(c) + sshPathSerializer(c))
+  def apply(obj: AnyRef)(implicit c: Context): String = Serialization.write(obj)(jsonFormats + apiPathSerializer(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, Role, WebHook, WebHookContentType}
+import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, RepositoryWebHookEvent, Role, WebHook, WebHookContentType}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
@@ -12,9 +12,10 @@ 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
@@ -86,16 +87,15 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    "clearImage"  -> trim(label("Clear image" ,boolean()))
  )(EditGroupForm.apply)

-  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, initOption: String, sourceUrl: Option[String])
+  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
  case class ForkRepositoryForm(owner: String, name: String)

  val newRepositoryForm = mapping(
-    "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()))),
-    "isPrivate" -> trim(label("Repository Type", boolean())),
-    "initOption" -> trim(label("Initialize option", text(required))),
-    "sourceUrl" -> trim(label("Source URL", optionalRequired(_.value("initOption") == "COPY", text())))
+    "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()))),
+    "isPrivate"    -> trim(label("Repository Type", boolean())),
+    "createReadme" -> trim(label("Create README"  , boolean()))
  )(RepositoryCreationForm.apply)

  val forkRepositoryForm = mapping(
@@ -137,17 +137,16 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  }

  private def accountWebhookEvents = new ValueType[Set[WebHook.Event]]{
-    def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
+    def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
      WebHook.Event.values.flatMap { t =>
-        params.optionValue(name + "." + t.name).map(_ => t)
+        params.get(name + "." + t.name).map(_ => t)
      }.toSet
    }
-    def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] =
-      if(convert(name, params, messages).isEmpty){
-        Seq(name -> messages("error.required").format(name))
-      } else {
-        Nil
-      }
+    def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+      Seq(name -> messages("error.required").format(name))
+    } else {
+      Nil
+    }
  }


@@ -233,10 +232,6 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    } getOrElse NotFound()
  })

-  get("/captures/(.*)".r) {
-    multiParams("captures").head
-  }
-
  get("/:userName/_delete")(oneselfOnly {
    val userName = params("userName")

@@ -461,6 +456,7 @@ 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,7 +523,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  post("/new", newRepositoryForm)(usersOnly { form =>
    LockUtil.lock(s"${form.owner}/${form.name}"){
      if(getRepository(form.owner, form.name).isEmpty){
-        createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.initOption, form.sourceUrl)
+        // Create the repository
+        createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.createReadme)
+
+        // Call hooks
+        PluginRegistry().getRepositoryHooks.foreach(_.created(form.owner, form.name))
      }
    }

@@ -561,15 +561,66 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      val loginUserName = loginAccount.userName
      val accountName   = form.accountName

-      if (getRepository(accountName, repository.name).isDefined ||
-        (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))) {
-        // redirect to the repository if repository already exists
-        redirect(s"/${accountName}/${repository.name}")
-      } else {
-        // fork repository asynchronously
-        forkRepository(accountName, repository, loginUserName)
-        // redirect to the repository
-        redirect(s"/${accountName}/${repository.name}")
+      LockUtil.lock(s"${accountName}/${repository.name}"){
+        if(getRepository(accountName, repository.name).isDefined ||
+            (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))){
+          // redirect to the repository if repository already exists
+          redirect(s"/${accountName}/${repository.name}")
+        } else {
+          // Insert to the database at first
+          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))
+
+          // redirect to the repository
+          redirect(s"/${accountName}/${repository.name}")
+        }
      }
    } else BadRequest()
  })
@@ -580,14 +631,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  }

  private def uniqueRepository: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
-      for {
-        userName <- params.optionValue("owner")
-        _        <- getRepositoryNamesOfUser(userName).find(_ == value)
-      } yield {
-        "Repository already exists."
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("owner").flatMap { userName =>
+        getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
      }
-    }
  }

  private def members: Constraint = new Constraint(){
--- a/src/main/scala/gitbucket/core/controller/AnonymousAccessController.scala
+++ b/src/main/scala/gitbucket/core/controller/AnonymousAccessController.scala
@@ -0,0 +1,14 @@
+package gitbucket.core.controller
+
+class AnonymousAccessController extends AnonymousAccessControllerBase
+
+trait AnonymousAccessControllerBase extends ControllerBase {
+  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
+    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
+      !context.currentPath.startsWith("/register")) {
+      Unauthorized()
+    } else {
+      pass()
+    }
+  }
+}
--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -5,19 +5,15 @@ import gitbucket.core.model._
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service._
-import gitbucket.core.util.Directory._
-import gitbucket.core.util.Implicits._
-import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util._
-import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
+import gitbucket.core.util.Implicits._
+import gitbucket.core.view.helpers.{renderMarkup, isRenderable}
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.revwalk.RevWalk
-import org.scalatra.{Created, NoContent, UnprocessableEntity}
-
+import org.scalatra.{NoContent, UnprocessableEntity, Created}
 import scala.collection.JavaConverters._
-import scala.concurrent.Await
-import scala.concurrent.duration.Duration

 class ApiController extends ApiControllerBase
  with RepositoryService
@@ -53,7 +49,6 @@ trait ApiControllerBase extends ControllerBase {
    with LabelsService
    with MilestonesService
    with PullRequestService
-    with CommitsService
    with CommitStatusService
    with RepositoryCreationService
    with IssueCreationService
@@ -129,10 +124,10 @@ trait ApiControllerBase extends ControllerBase {
  /**
    * https://developer.github.com/v3/repos/branches/#get-branch
    */
-  get ("/api/v3/repos/:owner/:repo/branches/*")(referrersOnly { repository =>
+  get ("/api/v3/repos/:owner/:repo/branches/:branch")(referrersOnly { repository =>
    //import gitbucket.core.api._
    (for{
-      branch <- params.get("splat") if repository.branchList.contains(branch)
+      branch     <- params.get("branch") if repository.branchList.contains(branch)
      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
    } yield {
      val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
@@ -145,13 +140,12 @@ trait ApiControllerBase extends ControllerBase {
   */
  get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
-      val (dirName, fileName) = pathStr.lastIndexOf('/') match {
-        case -1 =>
-          (".", pathStr)
-        case n =>
-          (pathStr.take(n), pathStr.drop(n + 1))
+      val path = new java.io.File(pathStr)
+      val dirName = path.getParent match {
+        case null => "."
+        case s => s
      }
-      getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
+      getFileList(git, revision, dirName).find(f => f.name.equals(path.getName))
    }

    val path = multiParams("splat").head match {
@@ -204,24 +198,13 @@ trait ApiControllerBase extends ControllerBase {
  /*
   * https://developer.github.com/v3/git/refs/#get-a-reference
   */
-  get("/api/v3/repos/:owner/:repo/git/refs/*") (referrersOnly { repository =>
+  get("/api/v3/repos/:owner/:repo/git/*") (referrersOnly { repository =>
    val revstr = multiParams("splat").head
    using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
-      val ref = git.getRepository().findRef(revstr)
-
-      if(ref != null){
-        val sha = ref.getObjectId().name()
-        JsonFormat(ApiRef(revstr, ApiObject(sha)))
-
-      } else {
-        val refs = git.getRepository().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))
-        })
-      }
+      //JsonFormat( (revstr, git.getRepository().resolve(revstr)) )
+      // getRef is deprecated by jgit-4.2. use exactRef() or findRef()
+      val sha = git.getRepository().exactRef(revstr).getObjectId().name()
+      JsonFormat(ApiRef(revstr, ApiObject(sha)))
    }
  })

@@ -263,8 +246,7 @@ trait ApiControllerBase extends ControllerBase {
    } yield {
      LockUtil.lock(s"${owner}/${data.name}") {
        if(getRepository(owner, data.name).isEmpty){
-          val f = createRepository(context.loginAccount.get, owner, data.name, data.description, data.`private`, data.auto_init)
-          Await.result(f, Duration.Inf)
+          createRepository(context.loginAccount.get, owner, data.name, data.description, data.`private`, data.auto_init)
          val repository = getRepository(owner, data.name).get
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
        } else {
@@ -288,8 +270,7 @@ trait ApiControllerBase extends ControllerBase {
    } yield {
      LockUtil.lock(s"${groupName}/${data.name}") {
        if(getRepository(groupName, data.name).isEmpty){
-          val f = createRepository(context.loginAccount.get, groupName, data.name, data.description, data.`private`, data.auto_init)
-          Await.result(f, Duration.Inf)
+          createRepository(context.loginAccount.get, groupName, data.name, data.description, data.`private`, data.auto_init)
          val repository = getRepository(groupName, data.name).get
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
        } else {
@@ -305,10 +286,10 @@ trait ApiControllerBase extends ControllerBase {
  /**
   * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
   */
-  patch("/api/v3/repos/:owner/:repo/branches/*")(ownerOnly { repository =>
+  patch("/api/v3/repos/:owner/:repo/branches/:branch")(ownerOnly { repository =>
    import gitbucket.core.api._
    (for{
-      branch     <- params.get("splat") if repository.branchList.contains(branch)
+      branch     <- params.get("branch") if repository.branchList.contains(branch)
      protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
    } yield {
@@ -400,7 +381,7 @@ trait ApiControllerBase extends ControllerBase {
  get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
    (for{
      issueId  <- params("id").toIntOpt
-      comments =  getCommentsForApi(repository.owner, repository.name, issueId)
+      comments =  getCommentsForApi(repository.owner, repository.name, issueId.toInt)
    } yield {
      JsonFormat(comments.map{ case (issueComment, user, issue) => ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest) })
    }) getOrElse NotFound()
@@ -517,7 +498,7 @@ trait ApiControllerBase extends ControllerBase {
    val condition = IssueSearchCondition(request)
    val baseOwner = getAccountByUserName(repository.owner).get

-    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] =
+    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account)] =
      searchPullRequestByApi(
        condition = condition,
        offset    = (page - 1) * PullRequestLimit,
@@ -525,14 +506,13 @@ trait ApiControllerBase extends ControllerBase {
        repos     = repository.owner -> repository.name
      )

-    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
+    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) =>
      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)
      )
    })
@@ -549,7 +529,6 @@ 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(
@@ -558,7 +537,6 @@ 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()
@@ -649,52 +627,6 @@ 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,39 +4,36 @@ import java.io.FileInputStream

 import gitbucket.core.api.ApiError
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
+import gitbucket.core.service.{AccountService, SystemSettingsService,RepositoryService}
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 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
 import org.eclipse.jgit.treewalk._
 import org.apache.commons.io.IOUtils
-import org.slf4j.LoggerFactory

 /**
 * Provides generic features for controller implementations.
 */
 abstract class ControllerBase extends ScalatraFilter
-  with ValidationSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
+  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
  with SystemSettingsService {

-  private val logger = LoggerFactory.getLogger(getClass)
-
  implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats

  before("/api/v3/*") {
@@ -44,11 +41,25 @@ abstract class ControllerBase extends ScalatraFilter
  }

  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
-    val httpRequest = request.asInstanceOf[HttpServletRequest]
-    val context     = request.getServletContext.getContextPath
-    val path        = httpRequest.getRequestURI.substring(context.length)
+    val httpRequest  = request.asInstanceOf[HttpServletRequest]
+    val httpResponse = response.asInstanceOf[HttpServletResponse]
+    val context      = request.getServletContext.getContextPath
+    val path         = httpRequest.getRequestURI.substring(context.length)

-    if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
+    if(path.startsWith("/console/")){
+      val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val baseUrl = this.baseUrl(httpRequest)
+      if(account == null){
+        // Redirect to login form
+        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
+      } else if(account.isAdmin){
+        // H2 Console (administrators only)
+        chain.doFilter(request, response)
+      } else {
+        // Redirect to dashboard
+        httpResponse.sendRedirect(baseUrl + "/")
+      }
+    } else if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
      // Git repository
      chain.doFilter(request, response)
    } else {
@@ -114,24 +125,12 @@ 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("/"))
@@ -148,20 +147,6 @@ abstract class ControllerBase extends ScalatraFilter
      }
    }

-  error{
-    case e => {
-      logger.error(s"Catch unhandled error in request: ${request}", e)
-      if(request.hasAttribute(Keys.Request.Ajax)){
-        org.scalatra.InternalServerError()
-      } else if(request.hasAttribute(Keys.Request.APIv3)){
-        contentType = formats("json")
-        org.scalatra.InternalServerError(ApiError("Internal Server Error"))
-      } else {
-        org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
-      }
-    }
-  }
-
  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
                   absolutize: Boolean = true, withSessionId: Boolean = true)
@@ -175,10 +160,10 @@ 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, Seq[String]], messages: Messages): Seq[(String, String)] =
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Seq[(String, String)] =
      valueType.validate(name, trim(value), params, messages)

-    private def trim(value: String): String = if(value == null) null else value.replace("\r\n", "").trim
+    private def trim(value: String): String = if(value == null) null else value.replaceAll("\r\n", "").trim
  }

  /**
@@ -313,14 +298,13 @@ trait AccountManagementControllerBase extends ControllerBase {
  }

  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
      getAccountByMailAddress(value, true)
-        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName) }
+        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
        .map    { _ => "Mail address is already registered." }
-    }
  }

-  val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets", "signin", "signout", "register", "activities.atom", "sidebar-collapse", "groups", "new")
+  val allReservedNames = Set("git", "admin", "upload", "api")
  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/DashboardController.scala
+++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala
@@ -8,7 +8,7 @@ import gitbucket.core.service.IssuesService._

 class DashboardController extends DashboardControllerBase
  with IssuesService with PullRequestService with RepositoryService with AccountService with CommitsService
-  with LabelsService with PrioritiesService with MilestonesService with UsersAuthenticator
+  with UsersAuthenticator

 trait DashboardControllerBase extends ControllerBase {
  self: IssuesService with PullRequestService with RepositoryService with AccountService
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -1,7 +1,8 @@
 package gitbucket.core.controller

 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, RepositoryService, ReleaseService}
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
 import gitbucket.core.util.SyntaxSugars._
@@ -19,13 +20,14 @@ import org.apache.commons.io.{FileUtils, IOUtils}
 *
 * This servlet saves uploaded file.
 */
-class FileUploadController extends ScalatraServlet
-  with FileUploadSupport
-  with RepositoryService
-  with AccountService
-  with ReleaseService{
+class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {

-  configureMultipartHandling(MultipartConfig(maxFileSize = Some(FileUtil.MaxFileSize)))
+  val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
+    System.getProperty("gitbucket.maxFileSize").toLong
+  else
+    3 * 1024 * 1024
+
+  configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize)))

  post("/image"){
    execute({ (file, fileId) =>
@@ -46,7 +48,7 @@ class FileUploadController extends ScalatraServlet
      FileUtils.writeByteArrayToFile(new java.io.File(
        getAttachedDir(params("owner"), params("repository")),
        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
-    }, _ => true)
+    }, FileUtil.isUploadableType)
  }

  post("/wiki/:owner/:repository"){
@@ -78,30 +80,16 @@ class FileUploadController extends ScalatraServlet
              builder.finish()

              val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-                Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, s"Uploaded ${fileName}")
+                Constants.HEAD, loginAccount.userName, loginAccount.mailAddress, s"Uploaded ${fileName}")

              fileName
            }
          }
-        }, _ => true)
+        }, FileUtil.isUploadableType)
      }
    } 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 =>
@@ -125,11 +113,10 @@ class FileUploadController extends ScalatraServlet
    }
  }

-  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,49 +1,29 @@
 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 LabelsService
-  with MilestonesService
-  with PrioritiesService
-  with UsersAuthenticator
-  with ReferrerAuthenticator
-  with AccountFederationService
-  with OpenIDConnectService
+  with RepositoryService with ActivityService with AccountService with RepositorySearchService with IssuesService
+  with UsersAuthenticator with ReferrerAuthenticator


 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService
-    with ActivityService
-    with AccountService
-    with RepositorySearchService
-    with UsersAuthenticator
-    with ReferrerAuthenticator
-    with OpenIDConnectService =>
+  self: RepositoryService with ActivityService with AccountService with RepositorySearchService
+    with UsersAuthenticator with ReferrerAuthenticator =>

-  case class SignInForm(userName: String, password: String, hash: Option[String])
+  case class SignInForm(userName: String, password: String)

  val signinForm = mapping(
    "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required))),
-    "hash" -> trim(optional(text()))
+    "password" -> trim(label("Password", text(required)))
  )(SignInForm.apply)

 //  val searchForm = mapping(
@@ -54,7 +34,6 @@ 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 =>
@@ -75,59 +54,13 @@ trait IndexControllerBase extends ControllerBase {

  post("/signin", signinForm){ form =>
    authenticate(context.settings, form.userName, form.password) match {
-      case Some(account) =>
-        flash.get(Keys.Flash.Redirect) match {
-          case Some(redirectUrl: String) => signin(account, redirectUrl + form.hash.getOrElse(""))
-          case _ => signin(account)
-        }
-      case None =>
+      case Some(account) => 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()
    }
  }

@@ -141,7 +74,7 @@ trait IndexControllerBase extends ControllerBase {
    xml.feed(getRecentActivities())
  }

-  post("/sidebar-collapse"){
+  get("/sidebar-collapse"){
    if(params("collapse") == "true"){
      session.setAttribute("sidebar-collapse", "true")
    }  else {
@@ -151,9 +84,9 @@ trait IndexControllerBase extends ControllerBase {
  }

  /**
-    * Set account information into HttpSession and redirect.
-    */
-  private def signin(account: Account, redirectUrl: String = "/") = {
+   * Set account information into HttpSession and redirect.
+   */
+  private def signin(account: Account) = {
    session.setAttribute(Keys.Session.LoginAccount, account)
    updateLastLoginDate(account.userName)

@@ -161,10 +94,14 @@ trait IndexControllerBase extends ControllerBase {
      redirect("/" + account.userName + "/_edit")
    }

-    if (redirectUrl.stripSuffix("/") == request.getContextPath) {
+    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
+      if(redirectUrl.stripSuffix("/") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
+    }.getOrElse {
      redirect("/")
-    } else {
-      redirect(redirectUrl)
    }
  }

@@ -183,12 +120,7 @@ trait IndexControllerBase extends ControllerBase {
            case (true, false) => !t.isGroupAccount
            case (false, true) => t.isGroupAccount
            case (false, false) => false
-          }}.map { t =>
-            Map(
-              "label" -> s"<b>@${t.userName}</b> ${t.fullName}",
-              "value" -> t.userName
-            )
-          }
+          }}.map { t => 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 org.scalatra.forms._
+import io.github.gitbucket.scalatra.forms._
 import org.scalatra.{BadRequest, Ok}


@@ -193,7 +193,7 @@ trait IssuesControllerBase extends ControllerBase {
    defining(repository.owner, repository.name){ case (owner, name) =>
      getComment(owner, name, params("id")).map { comment =>
        if(isEditableContent(owner, name, comment.commentedUserName)){
-          updateComment(comment.issueId, comment.commentId, form.content)
+          updateComment(comment.commentId, form.content)
          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
        } else Unauthorized()
      } getOrElse NotFound()
@@ -204,7 +204,7 @@ trait IssuesControllerBase extends ControllerBase {
    defining(repository.owner, repository.name){ case (owner, name) =>
      getComment(owner, name, params("id")).map { comment =>
        if(isEditableContent(owner, name, comment.commentedUserName)){
-          Ok(deleteComment(comment.issueId, comment.commentId))
+          Ok(deleteComment(comment.commentId))
        } else Unauthorized()
      } getOrElse NotFound()
    }
@@ -271,25 +271,25 @@ trait IssuesControllerBase extends ControllerBase {

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

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

  ajaxPost("/:owner/:repository/issues/:id/assign")(writableUsersOnly { repository =>
-    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"), true)
+    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
    Ok("updated")
  })

  ajaxPost("/:owner/:repository/issues/:id/milestone")(writableUsersOnly { repository =>
-    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"), true)
+    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"))
    milestoneId("milestoneId").map { milestoneId =>
      getMilestonesWithIssueCount(repository.owner, repository.name)
          .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) =>
@@ -299,8 +299,7 @@ trait IssuesControllerBase extends ControllerBase {
  })

  ajaxPost("/:owner/:repository/issues/:id/priority")(writableUsersOnly { repository =>
-    val priority = priorityId("priorityId")
-    updatePriorityId(repository.owner, repository.name, params("id").toInt, priority, true)
+    updatePriorityId(repository.owner, repository.name, params("id").toInt, priorityId("priorityId"))
    Ok("updated")
  })

@@ -326,7 +325,7 @@ trait IssuesControllerBase extends ControllerBase {
    params("value").toIntOpt.map{ labelId =>
      executeBatch(repository) { issueId =>
        getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
-          registerIssueLabel(repository.owner, repository.name, issueId, labelId, true)
+          registerIssueLabel(repository.owner, repository.name, issueId, labelId)
        }
      }
    } getOrElse NotFound()
@@ -335,7 +334,7 @@ trait IssuesControllerBase extends ControllerBase {
  post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
    defining(assignedUserName("value")){ value =>
      executeBatch(repository) {
-        updateAssignedUserName(repository.owner, repository.name, _, value, true)
+        updateAssignedUserName(repository.owner, repository.name, _, value)
      }
    }
  })
@@ -343,7 +342,7 @@ trait IssuesControllerBase extends ControllerBase {
  post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
    defining(milestoneId("value")){ value =>
      executeBatch(repository) {
-        updateMilestoneId(repository.owner, repository.name, _, value, true)
+        updateMilestoneId(repository.owner, repository.name, _, value)
      }
    }
  })
@@ -351,7 +350,7 @@ trait IssuesControllerBase extends ControllerBase {
  post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
    defining(priorityId("value")){ value =>
      executeBatch(repository) {
-        updatePriorityId(repository.owner, repository.name, _, value, true)
+        updatePriorityId(repository.owner, repository.name, _, value)
      }
    }
  })
--- a/src/main/scala/gitbucket/core/controller/LabelsController.scala
+++ b/src/main/scala/gitbucket/core/controller/LabelsController.scala
@@ -1,18 +1,16 @@
 package gitbucket.core.controller

 import gitbucket.core.issues.labels.html
-import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService, MilestonesService, PrioritiesService}
+import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService}
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars._
-import org.scalatra.forms._
+import io.github.gitbucket.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.scalatra.Ok

 class LabelsController extends LabelsControllerBase
-  with IssuesService with RepositoryService with AccountService
-  with LabelsService with PrioritiesService with MilestonesService
-  with ReferrerAuthenticator with WritableUsersAuthenticator
+  with LabelsService with IssuesService with RepositoryService with AccountService
+with ReferrerAuthenticator with WritableUsersAuthenticator

 trait LabelsControllerBase extends ControllerBase {
  self: LabelsService with IssuesService with RepositoryService
@@ -84,10 +82,10 @@ trait LabelsControllerBase extends ControllerBase {
  }

  private def uniqueLabelName: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
-      val owner      = params.value("owner")
-      val repository = params.value("repository")
-      params.optionValue("labelId").map { labelId =>
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+      val owner = params("owner")
+      val repository = params("repository")
+      params.get("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 org.scalatra.forms._
+import io.github.gitbucket.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
@@ -1,40 +0,0 @@
-package gitbucket.core.controller
-
-import org.scalatra.MovedPermanently
-
-class PreProcessController extends PreProcessControllerBase
-
-trait PreProcessControllerBase extends ControllerBase {
-
-  /**
-   * Provides GitHub compatible URLs for Git client.
-   *
-   * <ul>
-   *   <li>git clone http://localhost:8080/owner/repo</li>
-   *   <li>git clone http://localhost:8080/owner/repo.git</li>
-   * </ul>
-   *
-   * @see https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols
-   */
-  get("/*/*/info/refs") {
-    val query = Option(request.getQueryString).map("?" + _).getOrElse("")
-    halt(MovedPermanently(baseUrl + "/git" + request.getRequestURI + query))
-  }
-
-  /**
-   * Filter requests from anonymous users.
-   *
-   * If anonymous access is allowed, pass all requests.
-   * But if it's not allowed, demands authentication except some paths.
-   */
-  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
-    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
-      !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
@@ -1,18 +1,16 @@
 package gitbucket.core.controller

 import gitbucket.core.issues.priorities.html
-import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService, MilestonesService, PrioritiesService}
+import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, PrioritiesService}
 import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars._
-import org.scalatra.forms._
+import io.github.gitbucket.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.scalatra.Ok

 class PrioritiesController extends PrioritiesControllerBase
-  with IssuesService with RepositoryService with AccountService
-  with LabelsService with PrioritiesService with MilestonesService
-  with ReferrerAuthenticator with WritableUsersAuthenticator
+  with PrioritiesService with IssuesService with RepositoryService with AccountService
+with ReferrerAuthenticator with WritableUsersAuthenticator

 trait PrioritiesControllerBase extends ControllerBase {
  self: PrioritiesService with IssuesService with RepositoryService
@@ -100,10 +98,10 @@ trait PrioritiesControllerBase extends ControllerBase {
  }

  private def uniquePriorityName: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
-      val owner      = params.value("owner")
-      val repository = params.value("repository")
-      params.optionValue("priorityId").map { priorityId =>
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+      val owner = params("owner")
+      val repository = params("repository")
+      params.get("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,11 +13,9 @@ import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
-import org.scalatra.forms._
+import io.github.gitbucket.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.PersonIdent
-import org.eclipse.jgit.revwalk.RevWalk
-import org.scalatra.BadRequest

 import scala.collection.JavaConverters._

@@ -52,8 +50,7 @@ trait PullRequestsControllerBase extends ControllerBase {
  )(PullRequestForm.apply)

  val mergeForm = mapping(
-    "message"  -> trim(label("Message", text(required))),
-    "strategy" -> trim(label("Strategy", text(required)))
+    "message" -> trim(label("Message", text(required)))
  )(MergeForm.apply)

  case class PullRequestForm(
@@ -72,7 +69,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    labelNames: Option[String]
  )

-  case class MergeForm(message: String, strategy: String)
+  case class MergeForm(message: String)

  get("/:owner/:repository/pulls")(referrersOnly { repository =>
    val q = request.getParameter("q")
@@ -118,13 +115,13 @@ trait PullRequestsControllerBase extends ControllerBase {
      val owner = repository.owner
      val name  = repository.name
      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
-        val conflictMessage = LockUtil.lock(s"${owner}/${name}"){
+        val hasConflict = 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(
-          conflictMessage      = conflictMessage,
+           hasConflict         = hasConflict,
           commitStatues       = getCommitStatues(owner, name, pullreq.commitIdTo),
           branchProtection    = branchProtection,
           branchIsOutOfDate   = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
@@ -249,69 +246,48 @@ trait PullRequestsControllerBase extends ControllerBase {
    params("id").toIntOpt.flatMap { issueId =>
      val owner = repository.owner
      val name  = repository.name
-      if(repository.repository.options.mergeOptions.split(",").contains(form.strategy)){
-        LockUtil.lock(s"${owner}/${name}"){
-          getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
-            using(Git.open(getRepositoryDir(owner, name))) { git =>
-              // mark issue as merged and close.
-              val loginAccount = context.loginAccount.get
-              val commentId = createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
-              createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
-              updateClosed(owner, name, issueId, true)
+      LockUtil.lock(s"${owner}/${name}"){
+        getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
+          using(Git.open(getRepositoryDir(owner, name))) { git =>
+            // mark issue as merged and close.
+            val loginAccount = context.loginAccount.get
+            createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
+            createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
+            updateClosed(owner, name, issueId, true)

-              // record activity
-              recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
+            // record activity
+            recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)

-              val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
-                pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
+            // merge git repository
+            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))

-              val revCommits = using(new RevWalk( git.getRepository )){ revWalk =>
-                commits.flatten.map { commit =>
-                  revWalk.parseCommit(git.getRepository.resolve(commit.id))
-                }
-              }.reverse
+            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
+              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)

-              // merge git repository
-              form.strategy match {
-                case "merge-commit" =>
-                  mergePullRequest(git, pullreq.branch, issueId,
-                    s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" + form.message,
-                    new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
-                case "rebase" =>
-                  rebasePullRequest(git, pullreq.branch, issueId, revCommits,
-                    new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
-                case "squash" =>
-                  squashPullRequest(git, pullreq.branch, issueId,
-                    s"${issue.title} (#${issueId})\n\n" + form.message,
-                    new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+            // close issue by content of pull request
+            val defaultBranch = getRepository(owner, name).get.repository.defaultBranch
+            if(pullreq.branch == defaultBranch){
+              commits.flatten.foreach { commit =>
+                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
              }
-
-              // close issue by content of pull request
-              val defaultBranch = getRepository(owner, name).get.repository.defaultBranch
-              if(pullreq.branch == defaultBranch){
-                commits.flatten.foreach { commit =>
-                  closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
-                }
-                closeIssuesFromMessage(issue.title + " " + issue.content.getOrElse(""), loginAccount.userName, owner, name)
-                closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
-              }
-
-              updatePullRequests(owner, name, pullreq.branch)
-
-              // call web hook
-              callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
-
-              // call hooks
-              PluginRegistry().getPullRequestHooks.foreach{ h =>
-                h.addedComment(commentId, form.message, issue, repository)
-                h.merged(issue, repository)
-              }
-
-              redirect(s"/${owner}/${name}/pull/${issueId}")
+              closeIssuesFromMessage(issue.title + " " + issue.content.getOrElse(""), loginAccount.userName, owner, name)
+              closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
            }
+
+            updatePullRequests(owner, name, pullreq.branch)
+
+            // call web hook
+            callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
+
+            // call hooks
+            PluginRegistry().getPullRequestHooks.foreach(_.merged(issue, repository))
+
+            redirect(s"/${owner}/${name}/pull/${issueId}")
          }
        }
-      } else Some(BadRequest())
+      }
    } getOrElse NotFound()
  })

@@ -345,8 +321,8 @@ trait PullRequestsControllerBase extends ControllerBase {

  get("/:owner/:repository/compare/*...*")(referrersOnly { forkedRepository =>
    val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, originId) = parseCompareIdentifier(origin, forkedRepository.owner)
-    val (forkedOwner, forkedId) = parseCompareIdentifier(forked, forkedRepository.owner)
+    val (originOwner, originId) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, forkedId) = parseCompareIdentifie(forked, forkedRepository.owner)

    (for(
      originRepositoryName <- if(originOwner == forkedOwner) {
@@ -354,7 +330,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(_.userName == originOwner).map(_.repositoryName)
+        getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
      } else if(Some(originOwner) == forkedRepository.repository.originUserName){
        // Original repository
        forkedRepository.repository.originRepositoryName
@@ -372,20 +348,16 @@ trait PullRequestsControllerBase extends ControllerBase {
        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
      ){ case (oldGit, newGit) =>
        val (oldId, newId) =
-          if(originRepository.branchList.contains(originId)){
-            val forkedId2 = forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
-
-            val originId2 = JGitUtil.getForkedCommitId(oldGit, newGit,
+          if(originRepository.branchList.contains(originId) && forkedRepository.branchList.contains(forkedId)){
+            // Branch name
+            val rootId = JGitUtil.getForkedCommitId(oldGit, newGit,
              originRepository.owner, originRepository.name, originId,
-              forkedRepository.owner, forkedRepository.name, forkedId2)
-
-            (Option(oldGit.getRepository.resolve(originId2)),  Option(newGit.getRepository.resolve(forkedId2)))
+              forkedRepository.owner, forkedRepository.name, forkedId)

+            (Option(oldGit.getRepository.resolve(rootId)),  Option(newGit.getRepository.resolve(forkedId)))
          } else {
-            val originId2 = originRepository.tags.collectFirst { case x if x.name == originId => x.id }.getOrElse(originId)
-            val forkedId2 = forkedRepository.tags.collectFirst { case x if x.name == forkedId => x.id }.getOrElse(forkedId)
-
-            (Option(oldGit.getRepository.resolve(originId2)), Option(newGit.getRepository.resolve(forkedId2)))
+            // Commit id
+            (Option(oldGit.getRepository.resolve(originId)), Option(newGit.getRepository.resolve(forkedId)))
          }

        (oldId, newId) match {
@@ -406,12 +378,9 @@ trait PullRequestsControllerBase extends ControllerBase {
              commits,
              diffs,
              ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
-                case (Some(userName), Some(repositoryName)) => getRepository(userName, repositoryName) match {
-                  case Some(x) => x.repository :: getForkedRepositories(userName, repositoryName)
-                  case None    => getForkedRepositories(userName, repositoryName)
-                }
-                case _ => forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-              }).map { repository => (repository.userName, repository.repositoryName) },
+                case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
+                case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+              }).filter { case (owner, name) => hasGuestRole(owner, name, context.loginAccount) },
              commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList,
              originId,
              forkedId,
@@ -439,15 +408,15 @@ trait PullRequestsControllerBase extends ControllerBase {

  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(readableUsersOnly { forkedRepository =>
    val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, tmpOriginBranch) = parseCompareIdentifier(origin, forkedRepository.owner)
-    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifier(forked, forkedRepository.owner)
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)

    (for(
      originRepositoryName <- if(originOwner == forkedOwner){
        Some(forkedRepository.name)
      } else {
        forkedRepository.repository.originRepositoryName.orElse {
-          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_.userName == originOwner).map(_.repositoryName)
+          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
      };
      originRepository <- getRepository(originOwner, originRepositoryName)
@@ -462,7 +431,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          checkConflict(originRepository.owner, originRepository.name, originBranch,
                        forkedRepository.owner, forkedRepository.name, forkedBranch)
        }
-        html.mergecheck(conflict.isDefined)
+        html.mergecheck(conflict)
      }
    }) getOrElse NotFound()
  })
@@ -527,42 +496,13 @@ 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 parseCompareIdentifier(value: String, defaultOwner: String): (String, String) =
+  private def parseCompareIdentifie(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
@@ -1,151 +0,0 @@
-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,10 +1,7 @@
 package gitbucket.core.controller

-import java.time.{LocalDateTime, ZoneId, ZoneOffset}
-import java.util.Date
-
 import gitbucket.core.settings.html
-import gitbucket.core.model.{RepositoryWebHook, WebHook}
+import gitbucket.core.model.{WebHook, RepositoryWebHook}
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.util._
@@ -12,7 +9,7 @@ import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import org.scalatra.forms._
+import io.github.gitbucket.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.eclipse.jgit.api.Git
@@ -39,27 +36,19 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    externalIssuesUrl: Option[String],
    wikiOption: String,
    externalWikiUrl: Option[String],
-    allowFork: Boolean,
-    mergeOptions: Seq[String],
-    defaultMergeOption: String
+    allowFork: Boolean
  )

  val optionsForm = mapping(
-    "repositoryName"     -> trim(label("Repository Name"    , text(required, maxlength(100), repository, renameRepositoryName))),
-    "description"        -> trim(label("Description"        , optional(text()))),
-    "isPrivate"          -> trim(label("Repository Type"    , boolean())),
-    "issuesOption"       -> trim(label("Issues Option"      , text(required, featureOption))),
-    "externalIssuesUrl"  -> trim(label("External Issues URL", optional(text(maxlength(200))))),
-    "wikiOption"         -> trim(label("Wiki Option"        , text(required, featureOption))),
-    "externalWikiUrl"    -> trim(label("External Wiki URL"  , optional(text(maxlength(200))))),
-    "allowFork"          -> trim(label("Allow Forking"      , boolean())),
-    "mergeOptions"       -> mergeOptions,
-    "defaultMergeOption" -> trim(label("Default merge strategy", text(required)))
-  )(OptionsForm.apply).verifying { form =>
-    if(!form.mergeOptions.contains(form.defaultMergeOption)){
-      Seq("defaultMergeOption" -> s"This merge strategy isn't enabled.")
-    } else Nil
-  }
+    "repositoryName"    -> trim(label("Repository Name"    , text(required, maxlength(100), repository, renameRepositoryName))),
+    "description"       -> trim(label("Description"        , optional(text()))),
+    "isPrivate"         -> trim(label("Repository Type"    , boolean())),
+    "issuesOption"      -> trim(label("Issues Option"      , text(required, featureOption))),
+    "externalIssuesUrl" -> trim(label("External Issues URL", optional(text(maxlength(200))))),
+    "wikiOption"        -> trim(label("Wiki Option"        , text(required, featureOption))),
+    "externalWikiUrl"   -> trim(label("External Wiki URL"  , optional(text(maxlength(200))))),
+    "allowFork"         -> trim(label("Allow Forking"      , boolean()))
+  )(OptionsForm.apply)

  // for default branch
  case class DefaultBranchForm(defaultBranch: String)
@@ -126,9 +115,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      form.externalIssuesUrl,
      form.wikiOption,
      form.externalWikiUrl,
-      form.allowFork,
-      form.mergeOptions,
-      form.defaultMergeOption
+      form.allowFork
    )
    // Change repository name
    if(repository.name != form.repositoryName){
@@ -152,9 +139,6 @@ 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))
    }
@@ -166,7 +150,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  get("/:owner/:repository/settings/branches")(ownerOnly { repository =>
    val protecteions = getProtectedBranchList(repository.owner, repository.name)
    html.branches(repository, protecteions, flash.get("info"))
-  })
+  });

  /** Update default branch */
  post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) =>
@@ -191,8 +175,7 @@ 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,
-        Date.from(LocalDateTime.now.minusWeeks(1).toInstant(ZoneOffset.UTC))).toSet
+      val lastWeeks = getRecentStatuesContexts(repository.owner, repository.name, org.joda.time.LocalDateTime.now.minusWeeks(1).toDate).toSet
      val knownContexts = (lastWeeks ++ protection.status.contexts).toSeq.sortBy(identity)
      html.branchprotection(repository, branch, protection, knownContexts, flash.get("info"))
    }
@@ -360,12 +343,20 @@ trait RepositorySettingsControllerBase extends ControllerBase {
            FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
          }
        }
-        // Move files directory
-        defining(getRepositoryFilesDir(repository.owner, repository.name)){ dir =>
-          if(dir.isDirectory) {
-            FileUtils.moveDirectory(dir, getRepositoryFilesDir(form.newOwner, repository.name))
+        // Move lfs directory
+        defining(getLfsDir(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))
+          }
+        }
+        // Delere parent directory
+        FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))

        // Call hooks
        PluginRegistry().getRepositoryHooks.foreach(_.transferred(repository.owner, form.newOwner, repository.name))
@@ -385,7 +376,9 @@ 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))
-      FileUtils.deleteDirectory(getRepositoryFilesDir(repository.owner, repository.name))
+      val lfsDir = getLfsDir(repository.owner, repository.name)
+      FileUtils.deleteDirectory(lfsDir)
+      FileUtil.deleteDirectoryIfEmpty(lfsDir.getParentFile())

      // Call hooks
      PluginRegistry().getRepositoryHooks.foreach(_.deleted(repository.owner, repository.name))
@@ -400,7 +393,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().call()
+        git.gc();
      }
    }
    flash += "info" -> "Garbage collection has been executed."
@@ -442,12 +435,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  }

  private def webhookEvents = new ValueType[Set[WebHook.Event]]{
-    def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Set[WebHook.Event] = {
+    def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
      WebHook.Event.values.flatMap { t =>
        params.get(name + "." + t.name).map(_ => t)
      }.toSet
    }
-    def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+    def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
      Seq(name -> messages("error.required").format(name))
    } else {
      Nil
@@ -473,22 +466,19 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Duplicate check for the rename repository name.
   */
  private def renameRepositoryName: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] = {
-      for {
-        repoName <- params.optionValue("repository") if repoName != value
-        userName <- params.optionValue("owner")
-        _        <- getRepositoryNamesOfUser(userName).find(_ == value)
-      } yield {
-        "Repository already exists."
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("repository").filter(_ != value).flatMap { _ =>
+        params.get("owner").flatMap { userName =>
+          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        }
      }
-    }
  }

  /**
   *
   */
  private def featureOption: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] =
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
      if(Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
  }

@@ -509,21 +499,4 @@ trait RepositorySettingsControllerBase extends ControllerBase {
        }
      }
  }
-
-  private def mergeOptions = new ValueType[Seq[String]]{
-    override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = {
-      params.get("mergeOptions").getOrElse(Nil)
-    }
-    override def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = {
-      val mergeOptions = params.get("mergeOptions").getOrElse(Nil)
-      if(mergeOptions.isEmpty){
-        Seq("mergeOptions" -> "At least one option must be enabled.")
-      } else if(!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))){
-        Seq("mergeOptions" -> "mergeOptions are invalid.")
-      } else {
-        Nil
-      }
-    }
-  }
-
 }
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -13,26 +13,23 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import gitbucket.core.model.{Account, CommitState, CommitStatus, WebHook}
+import gitbucket.core.model.{Account, WebHook}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers
-import org.scalatra.forms._
+import io.github.gitbucket.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.{ArchiveCommand, Git}
 import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
 import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib._
-import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
-import org.json4s.jackson.Serialization
 import org.scalatra._
 import org.scalatra.i18n.Messages


 class RepositoryViewerController extends RepositoryViewerControllerBase
  with RepositoryService with AccountService with ActivityService with IssuesService with WebHookService with CommitsService
-  with LabelsService with MilestonesService with PrioritiesService
  with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator with PullRequestService with CommitStatusService
  with WebHookPullRequestService with WebHookPullRequestReviewCommentService with ProtectedBranchService

@@ -150,32 +147,14 @@ 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 =>
-          getRepository(owner, repository).map(gitbucket.core.html.goget(_)) getOrElse NotFound()
-        }
-        case _ => referrersOnly(fileList(_))
+    params.get("go-get") match {
+      case Some("1") => defining(request.paths){ paths =>
+        getRepository(paths(0), paths(1)).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.
   */
@@ -195,24 +174,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    val (branchName, path) = repository.splitPath(multiParams("splat").head)
    val page = params.get("page").flatMap(_.toIntOpt).getOrElse(1)

-    def getStatuses(sha: String): List[CommitStatus] = {
-      getCommitStatues(repository.owner, repository.name, sha)
-    }
-
-    def getSummary(statuses: List[CommitStatus]): (CommitState, String) = {
-      val stateMap = statuses.groupBy(_.state)
-      val state = CommitState.combine(stateMap.keySet)
-      val summary = stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ")
-      state -> summary
-    }
-
    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
        case Right((logs, hasNext)) =>
          html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
            logs.splitWith{ (commit1, commit2) =>
              view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
-            }, page, hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), getStatuses, getSummary)
+            }, page, hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
        case Left(_) => NotFound()
      }
    }
@@ -245,7 +213,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {

  post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
    val files = form.uploadFiles.split("\n").map { line =>
-      val i = line.indexOf(':')
+      val i = line.indexOf(":")
      CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
    }

@@ -254,7 +222,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      branch     = form.branch,
      path       = form.path,
      files      = files,
-      message    = form.message.getOrElse("Add files via upload")
+      message    = form.message.getOrElse(s"Add files via upload")
    )

    if(form.path.length == 0){
@@ -341,7 +309,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      commit      = form.commit
    )

-    redirect(s"/${repository.owner}/${repository.name}/blob/${urlEncode(form.branch)}/${
+    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
      if (form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
    }")
  })
@@ -402,7 +370,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  })

  private def isLfsFile(git: Git, objectId: ObjectId): Boolean = {
-    JGitUtil.getObjectLoaderFromId(git, objectId)(JGitUtil.isLfsPointer).getOrElse(false)
+    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+      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/*"){
@@ -417,7 +391,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
-      Serialization.write(Map(
+      Map(
        "root"  -> s"${context.baseUrl}/${repository.owner}/${repository.name}",
        "id"    -> id,
        "path"  -> path,
@@ -432,9 +406,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            "prevPath" -> blame.prevPath,
            "commited" -> blame.commitTime.getTime,
            "message"  -> blame.message,
-            "lines" -> blame.lines
-          )
-        }))
+            "lines"    -> blame.lines)
+        })
    }
  })

@@ -447,14 +420,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    try {
      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
        defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) { revCommit =>
-          val diffs = JGitUtil.getDiffs(git, None, id, true, false)
-          val oldCommitId = JGitUtil.getParentCommitId(git, id)
-
-          html.commit(id, new JGitUtil.CommitInfo(revCommit),
-            JGitUtil.getBranchesOfCommit(git, revCommit.getName),
-            JGitUtil.getTagsOfCommit(git, revCommit.getName),
-            getCommitComments(repository.owner, repository.name, id, true),
-            repository, diffs, oldCommitId, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+          JGitUtil.getDiffs(git, id) match {
+            case (diffs, oldCommitId) =>
+              html.commit(id, new JGitUtil.CommitInfo(revCommit),
+                JGitUtil.getBranchesOfCommit(git, revCommit.getName),
+                JGitUtil.getTagsOfCommit(git, revCommit.getName),
+                getCommitComments(repository.owner, repository.name, id, true),
+                repository, diffs, oldCommitId, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+          }
        }
      }
    } catch {
@@ -462,31 +435,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }
  })

-  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,
@@ -519,13 +467,9 @@ 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)
-          PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId, form.content, issue, repository))
-          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)
+        recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content)
+        callPullRequestReviewCommentWebHook("create", comment, repository, issueId, 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)
  })
@@ -629,8 +573,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  /**
   * Displays tags.
   */
-  get("/:owner/:repository/tags")(referrersOnly { repository =>
-    redirect(s"${repository.owner}/${repository.name}/releases")
+  get("/:owner/:repository/tags")(referrersOnly {
+    html.tags(_)
  })

  /**
@@ -654,8 +598,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          repository.repository.originRepositoryName.getOrElse(repository.name)),
        getForkedRepositories(
          repository.repository.originUserName.getOrElse(repository.owner),
-          repository.repository.originRepositoryName.getOrElse(repository.name)
-        ).map { repository => (repository.userName, repository.repositoryName) },
+          repository.repository.originRepositoryName.getOrElse(repository.name)),
        context.loginAccount match {
          case None => List()
          case account: Option[Account] => getGroupsByUserName(account.get.userName)
@@ -687,8 +630,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }
  })

-  case class UploadFiles(branch: String, path: String, fileIds: Map[String,String], message: String) {
-    lazy val isValid: Boolean = fileIds.nonEmpty
+  case class UploadFiles(branch: String, path: String, fileIds : Map[String,String], message: String) {
+    lazy val isValid: Boolean = fileIds.size > 0
  }

  case class CommitFile(id: String, name: String)
@@ -759,63 +702,39 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        f(git, headTip, builder, inserter)

        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
-          headName, loginAccount.fullName, loginAccount.mailAddress, message)
+          headName, loginAccount.userName, loginAccount.mailAddress, message)

        inserter.flush()
        inserter.close()

-        val receivePack = new ReceivePack(git.getRepository)
-        val receiveCommand = new ReceiveCommand(headTip, commitId, headName)
+        // update refs
+        val refUpdate = git.getRepository.updateRef(headName)
+        refUpdate.setNewObjectId(commitId)
+        refUpdate.setForceUpdate(false)
+        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        refUpdate.update()

-        // call post commit hook
-        val error = PluginRegistry().getReceiveHooks.flatMap { hook =>
-          hook.preReceive(repository.owner, repository.name, receivePack, receiveCommand, loginAccount.userName)
-        }.headOption
+        // update pull request
+        updatePullRequests(repository.owner, repository.name, branch)

-        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()
+        // record activity
+        val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))

-          case None =>
-            // update refs
-            val refUpdate = git.getRepository.updateRef(headName)
-            refUpdate.setNewObjectId(commitId)
-            refUpdate.setForceUpdate(false)
-            refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
-            refUpdate.update()
+        // create issue comment by commit message
+        createIssueComment(repository.owner, repository.name, commitInfo)

-            // update pull request
-            updatePullRequests(repository.owner, repository.name, branch)
+        // close issue by commit message
+        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)

-            // record activity
-            val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-            recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
-
-            // create issue comment by commit message
-            createIssueComment(repository.owner, repository.name, commitInfo)
-
-            // 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))
-            callWebHookOf(repository.owner, repository.name, WebHook.Push) {
-              getAccountByUserName(repository.owner).map{ ownerAccount =>
-                WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
-                  oldId = headTip, newId = commitId)
-              }
-            }
+        //call web hook
+        callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
+        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        callWebHookOf(repository.owner, repository.name, WebHook.Push) {
+          getAccountByUserName(repository.owner).map{ ownerAccount =>
+            WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
+              oldId = headTip, newId = commitId)
+          }
        }
      }
    }
@@ -843,7 +762,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, context.settings.baseUrl)
+            val files = JGitUtil.getFileList(git, revision, path)
            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,33 +2,23 @@ package gitbucket.core.controller

 import java.io.FileInputStream

-import com.github.zafarkhaja.semver.{Version => Semver}
-import gitbucket.core.GitBucketCoreModule
 import gitbucket.core.admin.html
-import gitbucket.core.plugin.{PluginInfoBase, PluginRegistry, PluginRepository}
-import gitbucket.core.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.service.{AccountService, RepositoryService, SystemSettingsService}
 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 gitbucket.core.ssh.SshServer
+import gitbucket.core.plugin.PluginRegistry
+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 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 =>

@@ -69,15 +59,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
        "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
        "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)))
+    )(Ldap.apply))
  )(SystemSettings.apply).verifying { settings =>
    Vector(
      if(settings.ssh && settings.baseUrl.isEmpty){
@@ -165,73 +147,8 @@ 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.settings(flash.get("info"))
+    html.system(flash.get("info"))
  })

  post("/admin/system", form)(adminOnly { form =>
@@ -252,13 +169,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {

  post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
    try {
-      new Mailer(context.settings.copy(smtp = Some(form.smtp), notification = true)).send(
-        to           = form.testAddress,
-        subject      = "Test message from GitBucket",
-        textMsg      = "This is a test message from GitBucket.",
-        htmlMsg      = None,
-        loginAccount = context.loginAccount
-      )
+      new Mailer(form.smtp).send(form.testAddress,
+        "Test message from GitBucket", "This is a test message from GitBucket.",
+        context.loginAccount.get)

      "Test mail has been sent to: " + form.testAddress

@@ -268,83 +181,18 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  })

  get("/admin/plugins")(adminOnly {
-    // Installed plugins
-    val enabledPlugins = PluginRegistry().getPlugins()
-
-    val gitbucketVersion = Semver.valueOf(GitBucketCoreModule.getVersions.asScala.last.getVersion)
-
-    // Plugins in the local repository
-    val repositoryPlugins = PluginRepository.getPlugins()
-      .filterNot { meta =>
-        enabledPlugins.exists { plugin => plugin.pluginId == meta.id &&
-          Semver.valueOf(plugin.pluginVersion).greaterThanOrEqualTo(Semver.valueOf(meta.latestVersion.version))
-        }
-      }.map { meta =>
-        (meta, meta.versions.reverse.find { version => gitbucketVersion.satisfies(version.range) })
-      }.collect { case (meta, Some(version)) =>
-        new PluginInfoBase(
-          pluginId      = meta.id,
-          pluginName    = meta.name,
-          pluginVersion = version.version,
-          description   = meta.description
-        )
-      }
-
-    // Merge
-    val plugins = enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false))
-
-    html.plugins(plugins, flash.get("info"))
-  })
-
-  post("/admin/plugins/_reload")(adminOnly {
-    PluginRegistry.reload(request.getServletContext(), loadSystemSettings(), request2Session(request).conn)
-    flash += "info" -> "All plugins were reloaded."
-    redirect("/admin/plugins")
-  })
-
-  post("/admin/plugins/:pluginId/:version/_uninstall")(adminOnly {
-    val pluginId = params("pluginId")
-    val version  = params("version")
-    PluginRegistry().getPlugins()
-      .collect { case plugin if (plugin.pluginId == pluginId && plugin.pluginVersion == version) => plugin }
-      .foreach { _ =>
-        PluginRegistry.uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
-        flash += "info" -> s"${pluginId} was uninstalled."
-      }
-    redirect("/admin/plugins")
-  })
-
-  post("/admin/plugins/:pluginId/:version/_install")(adminOnly {
-    val pluginId = params("pluginId")
-    val version  = params("version")
-    /// TODO!!!!
-    PluginRepository.getPlugins()
-      .collect { case meta if meta.id == pluginId => (meta, meta.versions.find(_.version == version) )}
-      .foreach { case (meta, version) =>
-        version.foreach { version =>
-          // TODO Install version!
-          PluginRegistry.install(
-            new java.io.File(PluginHome, s".repository/${version.file}"),
-            request.getServletContext,
-            loadSystemSettings(),
-            request2Session(request).conn
-          )
-          flash += "info" -> s"${pluginId} was installed."
-        }
-      }
-    redirect("/admin/plugins")
+    html.plugins(PluginRegistry().getPlugins())
  })


  get("/admin/users")(adminOnly {
    val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
-    val includeGroups = params.get("includeGroups").map(_.toBoolean).getOrElse(false)
-    val users          = getAllUsers(includeRemoved, includeGroups)
+    val users          = getAllUsers(includeRemoved)
    val members        = users.collect { case account if(account.isGroupAccount) =>
      account.userName -> getGroupMembers(account.userName).map(_.userName)
    }.toMap

-    html.userlist(users, members, includeRemoved, includeGroups)
+    html.userlist(users, members, includeRemoved)
  })

  get("/admin/users/_newuser")(adminOnly {
--- a/src/main/scala/gitbucket/core/controller/ValidationSupport.scala
+++ b/src/main/scala/gitbucket/core/controller/ValidationSupport.scala
@@ -1,91 +0,0 @@
-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 org.scalatra.forms._
+import io.github.gitbucket.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, Some(from), to, true, false).filter(_.newPath == pageName + ".md"), repository,
+      html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).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, Some(from), to, true, false), repository,
+      html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
        isEditable(repository), flash.get("info"))
    }
  })
@@ -219,18 +219,15 @@ 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"))

-      getPathObjectId(git, path, revCommit).map { objectId =>
-        responseRawFile(git, objectId, path, repository)
-      } getOrElse NotFound()
-    }
+    getFileContent(repository.owner, repository.name, path).map { bytes =>
+      RawData(FileUtil.getContentType(path, bytes), bytes)
+    } getOrElse NotFound()
  })

  private def unique: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, Seq[String]], messages: Messages): Option[String] =
-      getWikiPageList(params.value("owner"), params.value("repository")).find(_ == value).map(_ => "Page already exists.")
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      getWikiPageList(params("owner"), params("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
@@ -1,19 +0,0 @@
-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 com.github.takezoe.slick.blocking.BlockingJdbcProfile
 import gitbucket.core.util.DatabaseConfig
+import com.github.takezoe.slick.blocking.BlockingJdbcProfile

 trait Profile {
  val profile: BlockingJdbcProfile
@@ -61,10 +61,7 @@ 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
@@ -1,34 +0,0 @@
-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
@@ -1,40 +0,0 @@
-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/model/Repository.scala
+++ b/src/main/scala/gitbucket/core/model/Repository.scala
@@ -22,13 +22,11 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
    val wikiOption           = column[String]("WIKI_OPTION")
    val externalWikiUrl      = column[String]("EXTERNAL_WIKI_URL")
    val allowFork            = column[Boolean]("ALLOW_FORK")
-    val mergeOptions         = column[String]("MERGE_OPTIONS")
-    val defaultMergeOption   = column[String]("DEFAULT_MERGE_OPTION")

    def * = (
      (userName, repositoryName, isPrivate, description.?, defaultBranch,
      registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?),
-      (issuesOption, externalIssuesUrl.?, wikiOption, externalWikiUrl.?, allowFork, mergeOptions, defaultMergeOption)
+      (issuesOption, externalIssuesUrl.?, wikiOption, externalWikiUrl.?, allowFork)
    ).shaped <> (
      { case (repository, options) =>
        Repository(
@@ -90,7 +88,5 @@ case class RepositoryOptions(
  externalIssuesUrl: Option[String],
  wikiOption: String,
  externalWikiUrl: Option[String],
-  allowFork: Boolean,
-  mergeOptions: String,
-  defaultMergeOption: String
+  allowFork: Boolean
 )
--- a/src/main/scala/gitbucket/core/plugin/IssueHook.scala
+++ b/src/main/scala/gitbucket/core/plugin/IssueHook.scala
@@ -3,20 +3,18 @@ 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 session: Session, 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 session: Session, context: Context): Unit = ()
-  def reopened(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
+  def created(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def addedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def closed(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def reopened(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()

 }

 trait PullRequestHook extends IssueHook {

-  def merged(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
+  def merged(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()

 }
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -8,7 +8,6 @@ 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

 /**
@@ -122,16 +121,6 @@ abstract class Plugin {
   */
  def pullRequestHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[PullRequestHook] = Nil

-  /**
-   * Override to add repository headers.
-   */
-  val repositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = Nil
-
-  /**
-   * Override to add repository headers.
-   */
-  def repositoryHeaders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Html]] = Nil
-
  /**
   * Override to add global menus.
   */
@@ -242,17 +231,6 @@ 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.
@@ -288,9 +266,6 @@ abstract class Plugin {
    (pullRequestHooks ++ pullRequestHooks(registry, context, settings)).foreach { pullRequestHook =>
      registry.addPullRequestHook(pullRequestHook)
    }
-    (repositoryHeaders ++ repositoryHeaders(registry, context, settings)).foreach { repositoryHeader =>
-      registry.addRepositoryHeader(repositoryHeader)
-    }
    (globalMenus ++ globalMenus(registry, context, settings)).foreach { globalMenu =>
      registry.addGlobalMenu(globalMenu)
    }
@@ -312,8 +287,8 @@ abstract class Plugin {
    (dashboardTabs ++ dashboardTabs(registry, context, settings)).foreach { dashboardTab =>
      registry.addDashboardTab(dashboardTab)
    }
-    (issueSidebars ++ issueSidebars(registry, context, settings)).foreach { issueSidebarComponent =>
-      registry.addIssueSidebar(issueSidebarComponent)
+    (issueSidebars ++ issueSidebars(registry, context, settings)).foreach { issueSidebar =>
+      registry.addIssueSidebar(issueSidebar)
    }
    (assetsMappings ++ assetsMappings(registry, context, settings)).foreach { assetMapping =>
      registry.addAssetsMapping((assetMapping._1, assetMapping._2, getClass.getClassLoader))
@@ -324,23 +299,14 @@ abstract class Plugin {
    (suggestionProviders ++ suggestionProviders(registry, context, settings)).foreach { suggestionProvider =>
      registry.addSuggestionProvider(suggestionProvider)
    }
-    (sshCommandProviders ++ sshCommandProviders(registry, context, settings)).foreach { sshCommandProvider =>
-      registry.addSshCommandProvider(sshCommandProvider)
-    }
  }

  /**
-   * This method is invoked when the plugin system is shutting down.
+   * This method is invoked in shutdown of plugin system.
   * If the plugin has any resources, release them in this method.
   */
  def shutdown(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {}

-//  /**
-//   * This method is invoked when this plugin is uninstalled.
-//   * Cleanup database or any other resources in this method if necessary.
-//   */
-//  def uninstall(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {}
-
  /**
   * Helper method to get a resource from classpath.
   */
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -0,0 +1,258 @@
+package gitbucket.core.plugin
+
+import java.io.{File, FilenameFilter, InputStream}
+import java.net.URLClassLoader
+import java.util.Base64
+import javax.servlet.ServletContext
+
+import gitbucket.core.controller.{Context, ControllerBase}
+import gitbucket.core.model.{Account, Issue}
+import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.service.SystemSettingsService.SystemSettings
+import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.DatabaseConfig
+import gitbucket.core.util.Directory._
+import io.github.gitbucket.solidbase.Solidbase
+import io.github.gitbucket.solidbase.manager.JDBCVersionManager
+import io.github.gitbucket.solidbase.model.Module
+import org.slf4j.LoggerFactory
+import play.twirl.api.Html
+
+import scala.collection.mutable
+import scala.collection.mutable.ListBuffer
+
+class PluginRegistry {
+
+  private val plugins = new ListBuffer[PluginInfo]
+  private val javaScripts = new ListBuffer[(String, String)]
+  private val controllers = new ListBuffer[(ControllerBase, String)]
+  private val images = mutable.Map[String, String]()
+  private val renderers = mutable.Map[String, Renderer]()
+  renderers ++= Seq(
+    "md" -> MarkdownRenderer, "markdown" -> MarkdownRenderer
+  )
+  private val repositoryRoutings = new ListBuffer[GitRepositoryRouting]
+  private val accountHooks = new ListBuffer[AccountHook]
+  private val receiveHooks = new ListBuffer[ReceiveHook]
+  receiveHooks += new ProtectedBranchReceiveHook()
+
+  private val repositoryHooks = new ListBuffer[RepositoryHook]
+  private val issueHooks = new ListBuffer[IssueHook]
+  issueHooks += new gitbucket.core.util.Notifier.IssueHook()
+
+  private val pullRequestHooks = new ListBuffer[PullRequestHook]
+  pullRequestHooks += new gitbucket.core.util.Notifier.PullRequestHook()
+
+  private val globalMenus = new ListBuffer[(Context) => Option[Link]]
+  private val repositoryMenus = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
+  private val repositorySettingTabs = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
+  private val profileTabs = new ListBuffer[(Account, Context) => Option[Link]]
+  private val systemSettingMenus = new ListBuffer[(Context) => Option[Link]]
+  private val accountSettingMenus = new ListBuffer[(Context) => Option[Link]]
+  private val dashboardTabs = new ListBuffer[(Context) => Option[Link]]
+  private val issueSidebars = new ListBuffer[(Issue, RepositoryInfo, Context) => Option[Html]]
+  private val assetsMappings = new ListBuffer[(String, String, ClassLoader)]
+  private val textDecorators = new ListBuffer[TextDecorator]
+
+  private val suggestionProviders = new ListBuffer[SuggestionProvider]
+  suggestionProviders += new UserNameSuggestionProvider()
+
+  def addPlugin(pluginInfo: PluginInfo): Unit = plugins += pluginInfo
+
+  def getPlugins(): List[PluginInfo] = plugins.toList
+
+  def addImage(id: String, bytes: Array[Byte]): Unit = {
+    val encoded = Base64.getEncoder.encodeToString(bytes)
+    images += ((id, encoded))
+  }
+
+  @deprecated("Use addImage(id: String, bytes: Array[Byte]) instead", "3.4.0")
+  def addImage(id: String, in: InputStream): Unit = {
+    val bytes = using(in){ in =>
+      val bytes = new Array[Byte](in.available)
+      in.read(bytes)
+      bytes
+    }
+    addImage(id, bytes)
+  }
+
+  def getImage(id: String): String = images(id)
+
+  def addController(path: String, controller: ControllerBase): Unit = controllers += ((controller, path))
+
+  @deprecated("Use addController(path: String, controller: ControllerBase) instead", "3.4.0")
+  def addController(controller: ControllerBase, path: String): Unit = addController(path, controller)
+
+  def getControllers(): Seq[(ControllerBase, String)] = controllers.toSeq
+
+  def addJavaScript(path: String, script: String): Unit = javaScripts += ((path, script))
+
+  def getJavaScript(currentPath: String): List[String] = javaScripts.filter(x => currentPath.matches(x._1)).toList.map(_._2)
+
+  def addRenderer(extension: String, renderer: Renderer): Unit = renderers += ((extension, renderer))
+
+  def getRenderer(extension: String): Renderer = renderers.getOrElse(extension, DefaultRenderer)
+
+  def renderableExtensions: Seq[String] = renderers.keys.toSeq
+
+  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = repositoryRoutings += routing
+
+  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = repositoryRoutings.toSeq
+
+  def getRepositoryRouting(repositoryPath: String): Option[GitRepositoryRouting] = {
+    PluginRegistry().getRepositoryRoutings().find {
+      case GitRepositoryRouting(urlPath, _, _) => {
+        repositoryPath.matches("/" + urlPath + "(/.*)?")
+      }
+    }
+  }
+
+  def addAccountHook(accountHook: AccountHook): Unit = accountHooks += accountHook
+
+  def getAccountHooks: Seq[AccountHook] = accountHooks.toSeq
+
+  def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks += commitHook
+
+  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq
+
+  def addRepositoryHook(repositoryHook: RepositoryHook): Unit = repositoryHooks += repositoryHook
+
+  def getRepositoryHooks: Seq[RepositoryHook] = repositoryHooks.toSeq
+
+  def addIssueHook(issueHook: IssueHook): Unit = issueHooks += issueHook
+
+  def getIssueHooks: Seq[IssueHook] = issueHooks.toSeq
+
+  def addPullRequestHook(pullRequestHook: PullRequestHook): Unit = pullRequestHooks += pullRequestHook
+
+  def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.toSeq
+
+  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus += globalMenu
+
+  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq
+
+  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus += repositoryMenu
+
+  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.toSeq
+
+  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs += repositorySettingTab
+
+  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.toSeq
+
+  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = profileTabs += profileTab
+
+  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.toSeq
+
+  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus += systemSettingMenu
+
+  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.toSeq
+
+  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus += accountSettingMenu
+
+  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.toSeq
+
+  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = dashboardTabs += dashboardTab
+
+  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.toSeq
+
+  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars += issueSidebar
+
+  def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.toSeq
+
+  def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings += assetsMapping
+
+  def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.toSeq
+
+  def addTextDecorator(textDecorator: TextDecorator): Unit = textDecorators += textDecorator
+
+  def getTextDecorators: Seq[TextDecorator] = textDecorators.toSeq
+
+  def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders += suggestionProvider
+
+  def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.toSeq
+}
+
+/**
+ * Provides entry point to PluginRegistry.
+ */
+object PluginRegistry {
+
+  private val logger = LoggerFactory.getLogger(classOf[PluginRegistry])
+
+  private val instance = new PluginRegistry()
+
+  /**
+   * Returns the PluginRegistry singleton instance.
+   */
+  def apply(): PluginRegistry = instance
+
+  /**
+   * Initializes all installed plugins.
+   */
+  def initialize(context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = {
+    val pluginDir = new File(PluginHome)
+    val manager = new JDBCVersionManager(conn)
+
+    if(pluginDir.exists && pluginDir.isDirectory){
+      pluginDir.listFiles(new FilenameFilter {
+        override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
+      }).sortBy(_.getName).foreach { pluginJar =>
+        val classLoader = new URLClassLoader(Array(pluginJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
+        try {
+          val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin]
+
+          // Migration
+          val solidbase = new Solidbase()
+          solidbase.migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
+
+          // Check version
+          val databaseVersion = manager.getCurrentVersion(plugin.pluginId)
+          val pluginVersion = plugin.versions.last.getVersion
+          if(databaseVersion != pluginVersion){
+            throw new IllegalStateException(s"Plugin version is ${pluginVersion}, but database version is ${databaseVersion}")
+          }
+
+          // Initialize
+          plugin.initialize(instance, context, settings)
+          instance.addPlugin(PluginInfo(
+            pluginId      = plugin.pluginId,
+            pluginName    = plugin.pluginName,
+            pluginVersion = plugin.versions.last.getVersion,
+            description   = plugin.description,
+            pluginClass   = plugin
+          ))
+
+        } catch {
+          case e: Throwable => {
+            logger.error(s"Error during plugin initialization: ${pluginJar.getAbsolutePath}", e)
+          }
+        }
+      }
+    }
+  }
+
+  def shutdown(context: ServletContext, settings: SystemSettings): Unit = {
+    instance.getPlugins().foreach { pluginInfo =>
+      try {
+        pluginInfo.pluginClass.shutdown(instance, context, settings)
+      } catch {
+        case e: Exception => {
+          logger.error(s"Error during plugin shutdown", e)
+        }
+      }
+    }
+  }
+
+
+}
+
+case class Link(id: String, label: String, path: String, icon: Option[String] = None)
+
+case class PluginInfo(
+  pluginId: String,
+  pluginName: String,
+  pluginVersion: String,
+  description: String,
+  pluginClass: Plugin
+)
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
@@ -1,425 +0,0 @@
-package gitbucket.core.plugin
-
-import java.io.{File, FilenameFilter, InputStream}
-import java.net.URLClassLoader
-import java.nio.file.{Files, Paths, StandardWatchEventKinds}
-import java.util.Base64
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.concurrent.ConcurrentLinkedQueue
-import java.util.concurrent.ConcurrentHashMap
-import javax.servlet.ServletContext
-
-import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.{Account, Issue}
-import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
-import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.service.SystemSettingsService
-import gitbucket.core.service.SystemSettingsService.SystemSettings
-import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.DatabaseConfig
-import gitbucket.core.util.Directory._
-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
-
-import scala.collection.JavaConverters._
-
-class PluginRegistry {
-
-  private val plugins = new ConcurrentLinkedQueue[PluginInfo]
-  private val javaScripts = new ConcurrentLinkedQueue[(String, String)]
-  private val controllers = new ConcurrentLinkedQueue[(ControllerBase, String)]
-  private val images = new ConcurrentHashMap[String, String]
-  private val renderers = new ConcurrentHashMap[String, Renderer]
-  renderers.put("md", MarkdownRenderer)
-  renderers.put("markdown", MarkdownRenderer)
-  private val repositoryRoutings = new ConcurrentLinkedQueue[GitRepositoryRouting]
-  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]]
-  private val repositorySettingTabs = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Link]]
-  private val profileTabs = new ConcurrentLinkedQueue[(Account, Context) => Option[Link]]
-  private val systemSettingMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
-  private val accountSettingMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
-  private val dashboardTabs = new ConcurrentLinkedQueue[(Context) => Option[Link]]
-  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)
-
-  def getPlugins(): List[PluginInfo] = plugins.asScala.toList
-
-  def addImage(id: String, bytes: Array[Byte]): Unit = {
-    val encoded = Base64.getEncoder.encodeToString(bytes)
-    images.put(id, encoded)
-  }
-
-  @deprecated("Use addImage(id: String, bytes: Array[Byte]) instead", "3.4.0")
-  def addImage(id: String, in: InputStream): Unit = {
-    val bytes = using(in){ in =>
-      val bytes = new Array[Byte](in.available)
-      in.read(bytes)
-      bytes
-    }
-    addImage(id, bytes)
-  }
-
-  def getImage(id: String): String = images.get(id)
-
-  def addController(path: String, controller: ControllerBase): Unit = controllers.add((controller, path))
-
-  @deprecated("Use addController(path: String, controller: ControllerBase) instead", "3.4.0")
-  def addController(controller: ControllerBase, path: String): Unit = addController(path, controller)
-
-  def getControllers(): Seq[(ControllerBase, String)] = controllers.asScala.toSeq
-
-  def addJavaScript(path: String, script: String): Unit = javaScripts.add((path, script)) //javaScripts += ((path, script))
-
-  def getJavaScript(currentPath: String): List[String] = javaScripts.asScala.filter(x => currentPath.matches(x._1)).toList.map(_._2)
-
-  def addRenderer(extension: String, renderer: Renderer): Unit = renderers.put(extension, renderer)
-
-  def getRenderer(extension: String): Renderer = renderers.asScala.getOrElse(extension, DefaultRenderer)
-
-  def renderableExtensions: Seq[String] = renderers.keys.asScala.toSeq
-
-  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = repositoryRoutings.add(routing)
-
-  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = repositoryRoutings.asScala.toSeq
-
-  def getRepositoryRouting(repositoryPath: String): Option[GitRepositoryRouting] = {
-    PluginRegistry().getRepositoryRoutings().find {
-      case GitRepositoryRouting(urlPath, _, _) => {
-        repositoryPath.matches("/" + urlPath + "(/.*)?")
-      }
-    }
-  }
-
-  def addAccountHook(accountHook: AccountHook): Unit = accountHooks.add(accountHook)
-
-  def getAccountHooks: Seq[AccountHook] = accountHooks.asScala.toSeq
-
-  def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks.add(commitHook)
-
-  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.asScala.toSeq
-
-  def addRepositoryHook(repositoryHook: RepositoryHook): Unit = repositoryHooks.add(repositoryHook)
-
-  def getRepositoryHooks: Seq[RepositoryHook] = repositoryHooks.asScala.toSeq
-
-  def addIssueHook(issueHook: IssueHook): Unit = issueHooks.add(issueHook)
-
-  def getIssueHooks: Seq[IssueHook] = issueHooks.asScala.toSeq
-
-  def addPullRequestHook(pullRequestHook: PullRequestHook): Unit = pullRequestHooks.add(pullRequestHook)
-
-  def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.asScala.toSeq
-
-  def addRepositoryHeader(repositoryHeader: (RepositoryInfo, Context) => Option[Html]): Unit = repositoryHeaders.add(repositoryHeader)
-
-  def getRepositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = repositoryHeaders.asScala.toSeq
-
-  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus.add(globalMenu)
-
-  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.asScala.toSeq
-
-  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus.add(repositoryMenu)
-
-  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.asScala.toSeq
-
-  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs.add(repositorySettingTab)
-
-  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.asScala.toSeq
-
-  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = profileTabs.add(profileTab)
-
-  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.asScala.toSeq
-
-  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus.add(systemSettingMenu)
-
-  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.asScala.toSeq
-
-  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus.add(accountSettingMenu)
-
-  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.asScala.toSeq
-
-  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = dashboardTabs.add(dashboardTab)
-
-  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.asScala.toSeq
-
-  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars.add(issueSidebar)
-
-  def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.asScala.toSeq
-
-  def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings.add(assetsMapping)
-
-  def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.asScala.toSeq
-
-  def addTextDecorator(textDecorator: TextDecorator): Unit = textDecorators.add(textDecorator)
-
-  def getTextDecorators: Seq[TextDecorator] = textDecorators.asScala.toSeq
-
-  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
-}
-
-/**
- * Provides entry point to PluginRegistry.
- */
-object PluginRegistry {
-
-  private val logger = LoggerFactory.getLogger(classOf[PluginRegistry])
-
-  private var instance = new PluginRegistry()
-
-  private var watcher: PluginWatchThread = null
-  private var extraWatcher: PluginWatchThread = null
-  private val initializing = new AtomicBoolean(false)
-
-  /**
-   * Returns the PluginRegistry singleton instance.
-   */
-  def apply(): PluginRegistry = instance
-
-  /**
-   * Reload all plugins.
-   */
-  def reload(context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
-    shutdown(context, settings)
-    instance = new PluginRegistry()
-    initialize(context, settings, conn)
-  }
-
-  /**
-   * Uninstall a specified plugin.
-   */
-  def uninstall(pluginId: String, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
-    instance.getPlugins()
-      .collect { case plugin if plugin.pluginId == pluginId => plugin }
-      .foreach { plugin =>
-//      try {
-//        plugin.pluginClass.uninstall(instance, context, settings)
-//      } catch {
-//        case e: Exception =>
-//          logger.error(s"Error during uninstalling plugin: ${plugin.pluginJar.getName}", e)
-//      }
-        shutdown(context, settings)
-        plugin.pluginJar.delete()
-        instance = new PluginRegistry()
-        initialize(context, settings, conn)
-      }
-  }
-
-  /**
-   * Install a plugin from a specified jar file.
-   */
-  def install(file: File, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
-    shutdown(context, settings)
-    FileUtils.copyFile(file, new File(PluginHome, file.getName))
-    instance = new PluginRegistry()
-    initialize(context, settings, conn)
-  }
-
-  private def listPluginJars(dir: File): Seq[File] = {
-    dir.listFiles(new FilenameFilter {
-      override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
-    }).toSeq.sortBy(_.getName).reverse
-  }
-
-  lazy val extraPluginDir: Option[String] = Option(System.getProperty("gitbucket.pluginDir"))
-
-  /**
-   * Initializes all installed plugins.
-   */
-  def initialize(context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
-    val pluginDir = new File(PluginHome)
-    val manager = new JDBCVersionManager(conn)
-
-    // Clean installed directory
-    val installedDir = new File(PluginHome, ".installed")
-    if(installedDir.exists){
-      FileUtils.deleteDirectory(installedDir)
-    }
-    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}")
-      val classLoader = new URLClassLoader(Array(installedJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
-      try {
-        val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin]
-        val pluginId = plugin.pluginId
-
-        // Check duplication
-        instance.getPlugins().find(_.pluginId == pluginId) match {
-          case Some(x) => {
-            logger.warn(s"Plugin ${pluginId} is duplicated. ${x.pluginJar.getName} is available.")
-          }
-          case None => {
-            // Migration
-            val solidbase = new Solidbase()
-            solidbase.migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
-
-            // Check database version
-            val databaseVersion = manager.getCurrentVersion(plugin.pluginId)
-            val pluginVersion = plugin.versions.last.getVersion
-            if (databaseVersion != pluginVersion) {
-              throw new IllegalStateException(s"Plugin version is ${pluginVersion}, but database version is ${databaseVersion}")
-            }
-
-            // Initialize
-            plugin.initialize(instance, context, settings)
-            instance.addPlugin(PluginInfo(
-              pluginId      = plugin.pluginId,
-              pluginName    = plugin.pluginName,
-              pluginVersion = plugin.versions.last.getVersion,
-              description   = plugin.description,
-              pluginClass   = plugin,
-              pluginJar     = pluginJar,
-              classLoader   = classLoader
-            ))
-          }
-        }
-      } catch {
-        case e: Throwable => logger.error(s"Error during plugin initialization: ${pluginJar.getName}", e)
-      }
-    }
-
-    if(watcher == null){
-      watcher = new PluginWatchThread(context, PluginHome)
-      watcher.start()
-    }
-
-    extraPluginDir.foreach { extraDir =>
-      if(extraWatcher == null){
-        extraWatcher = new PluginWatchThread(context, extraDir)
-        extraWatcher.start()
-      }
-    }
-  }
-
-  def shutdown(context: ServletContext, settings: SystemSettings): Unit = synchronized {
-    instance.getPlugins().foreach { plugin =>
-      try {
-        plugin.pluginClass.shutdown(instance, context, settings)
-        if(watcher != null){
-          watcher.interrupt()
-          watcher = null
-        }
-        if(extraWatcher != null){
-          extraWatcher.interrupt()
-          extraWatcher = null
-        }
-      } catch {
-        case e: Exception => {
-          logger.error(s"Error during plugin shutdown: ${plugin.pluginJar.getName}", e)
-        }
-      } finally {
-        plugin.classLoader.close()
-      }
-    }
-  }
-
-}
-
-case class Link(
-  id: String,
-  label: String,
-  path: String,
-  icon: Option[String] = None
-)
-
-class PluginInfoBase(
-  val pluginId: String,
-  val pluginName: String,
-  val pluginVersion: String,
-  val description: String
-)
-
-case class PluginInfo(
-  override val pluginId: String,
-  override val pluginName: String,
-  override val pluginVersion: String,
-  override val description: String,
-  pluginClass: Plugin,
-  pluginJar: File,
-  classLoader: URLClassLoader
-) extends PluginInfoBase(pluginId, pluginName, pluginVersion, description)
-
-class PluginWatchThread(context: ServletContext, dir: String) extends Thread with SystemSettingsService {
-  import gitbucket.core.model.Profile.profile.blockingApi._
-  import scala.collection.JavaConverters._
-
-  private val logger = LoggerFactory.getLogger(classOf[PluginWatchThread])
-
-  override def run(): Unit = {
-    val path = Paths.get(dir)
-    if(!Files.exists(path)){
-      Files.createDirectories(path)
-    }
-    val fs = path.getFileSystem
-    val watcher = fs.newWatchService
-
-    val watchKey = path.register(watcher,
-      StandardWatchEventKinds.ENTRY_CREATE,
-      StandardWatchEventKinds.ENTRY_MODIFY,
-      StandardWatchEventKinds.ENTRY_DELETE,
-      StandardWatchEventKinds.OVERFLOW)
-
-    logger.info("Start PluginWatchThread: " + path)
-
-    try {
-      while (watchKey.isValid()) {
-        val detectedWatchKey = watcher.take()
-        val events = detectedWatchKey.pollEvents.asScala.filter { e =>
-          e.context.toString != ".installed" && !e.context.toString.endsWith(".bak")
-        }
-        if(events.nonEmpty){
-          events.foreach { event =>
-            logger.info(event.kind + ": " + event.context)
-          }
-          new Thread {
-            override def run(): Unit = {
-                gitbucket.core.servlet.Database() withTransaction { session =>
-                logger.info("Reloading plugins...")
-                PluginRegistry.reload(context, loadSystemSettings(), session.conn)
-                logger.info("Reloading finished.")
-              }
-            }
-          }.start()
-        }
-        detectedWatchKey.reset()
-      }
-    } catch {
-      case _: InterruptedException => watchKey.cancel()
-    }
-
-    logger.info("Shutdown PluginWatchThread")
-  }
-
-}
--- a/src/main/scala/gitbucket/core/plugin/PluginRepository.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRepository.scala
@@ -1,43 +0,0 @@
-package gitbucket.core.plugin
-
-import org.json4s._
-import gitbucket.core.util.Directory._
-import org.apache.commons.io.FileUtils
-
-object PluginRepository {
-  implicit val formats = DefaultFormats
-
-  def parsePluginJson(json: String): Seq[PluginMetadata] = {
-    org.json4s.jackson.JsonMethods.parse(json).extract[Seq[PluginMetadata]]
-  }
-
-  lazy val LocalRepositoryDir = new java.io.File(PluginHome, ".repository")
-  lazy val LocalRepositoryIndexFile = new java.io.File(LocalRepositoryDir, "plugins.json")
-
-  def getPlugins(): Seq[PluginMetadata] = {
-    if(LocalRepositoryIndexFile.exists){
-      parsePluginJson(FileUtils.readFileToString(LocalRepositoryIndexFile, "UTF-8"))
-    } else Nil
-  }
-
-}
-
-// Mapped from plugins.json
-case class PluginMetadata(
-  id: String,
-  name: String,
-  description: String,
-  versions: Seq[VersionDef],
-  default: Boolean = false
-){
-  lazy val latestVersion: VersionDef = versions.last
-}
-
-case class VersionDef(
-  version: String,
-  url: String,
-  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,7 +3,6 @@ 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

 /**
@@ -34,7 +33,12 @@ object MarkdownRenderer extends Renderer {

 object DefaultRenderer extends Renderer {
  override def render(request: RenderRequest): Html = {
-    Html(s"""<tt><pre class="plain">${urlLink(request.fileContent)}</pre></tt>""")
+    import request._
+    Html(
+      s"<tt>${
+        fileContent.split("(\\r\\n)|\\n").map(xml.Utility.escape(_)).mkString("<br/>")
+      }</tt>"
+    )
  }
 }

@@ -47,4 +51,4 @@ case class RenderRequest(
  enableRefsLink: Boolean,
  enableAnchor: Boolean,
  context: Context
-)
+)
--- a/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
+++ b/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
@@ -3,92 +3,15 @@ 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]

-  /**
-   * 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 values(repository: RepositoryInfo): Seq[String]
+  def template(implicit context: Context): String = "value"
  def additionalScript(implicit context: Context): String = ""

 }
@@ -97,6 +20,8 @@ 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
@@ -1,77 +0,0 @@
-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, "[DUMMY]", 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,14 +96,12 @@ 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, includeGroups: Boolean = true)(implicit s: Session): List[Account] =
-  {
-    Accounts filter { t =>
-      (1.bind === 1.bind) &&
-        (t.groupAccount === false.bind, !includeGroups) &&
-        (t.removed === false.bind, !includeRemoved)
-    } sortBy(_.userName) list
-  }
+  def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
+    if(includeRemoved){
+      Accounts sortBy(_.userName) list
+    } else {
+      Accounts filter (_.removed === false.bind) sortBy(_.userName) list
+    }

  def isLastAdministrator(account: Account)(implicit s: Session): Boolean = {
    if(account.isAdmin){
--- a/src/main/scala/gitbucket/core/service/ActivityService.scala
+++ b/src/main/scala/gitbucket/core/service/ActivityService.scala
@@ -190,13 +190,6 @@ 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/HandleCommentService.scala
+++ b/src/main/scala/gitbucket/core/service/HandleCommentService.scala
@@ -50,7 +50,7 @@ trait HandleCommentService {
            id
        }

-        actionActivity.foreach { f => f(owner, name, userName, issue.issueId, issue.title) }
+        actionActivity foreach ( _ (owner, name, userName, issue.issueId, issue.title) )

        // call web hooks
        action match {
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -4,7 +4,6 @@ import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.controller.Context
 import gitbucket.core.model.{Issue, PullRequest, IssueComment, IssueLabel, Label, Account, Repository, CommitState, Role}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile._
@@ -12,7 +11,7 @@ import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType

 trait IssuesService {
-  self: AccountService with RepositoryService with LabelsService with PrioritiesService with MilestonesService =>
+  self: AccountService with RepositoryService =>
  import IssuesService._

  def getIssue(owner: String, repository: String, issueId: String)(implicit s: Session) =
@@ -33,11 +32,8 @@ trait IssuesService {
    .list

  def getMergedComment(owner: String, repository: String, issueId: Int)(implicit s: Session): Option[(IssueComment, Account)] = {
-    IssueComments.filter(_.byIssue(owner, repository, issueId))
-      .filter(_.action === "merge".bind)
-      .join(Accounts).on { case  t1 ~ t2 => t1.commentedUserName === t2.userName }
-      .map { case t1 ~ t2 => (t1, t2)}
-      .firstOption
+    getCommentsForApi(owner, repository, issueId)
+      .collectFirst { case (comment, account, _) if comment.action == "merged" => (comment, account) }
  }

  def getComment(owner: String, repository: String, commentId: String)(implicit s: Session): Option[IssueComment] = {
@@ -203,16 +199,15 @@ 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, Option[Account])] = {
+                            (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, 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    (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 ~ t6      => t6.userName === t4.userName }
-      .joinLeft(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => t7.userName === t1.assignedUserName}
-      .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) }
+      .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(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 }
+      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
+      .map    { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => (t1, t5, t2.commentCount, t3, t4, t6) }
      .list
  }

@@ -322,41 +317,16 @@ trait IssuesService {
    } get
  }

-  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int, insertComment: Boolean = false)(implicit context: Context, s: Session): Int = {
-    if (insertComment) {
-      IssueComments insert IssueComment(
-        userName = owner,
-        repositoryName = repository,
-        issueId = issueId,
-        action = "add_label",
-        commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
-        content = getLabel(owner, repository, labelId).map(_.labelName).getOrElse("Unknown label"),
-        registeredDate = currentDate,
-        updatedDate = currentDate
-      )
-    }
+  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session): Int = {
    IssueLabels insert IssueLabel(owner, repository, issueId, labelId)
  }

-  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int, insertComment: Boolean = false)(implicit context: Context, s: Session): Int = {
-    if (insertComment) {
-      IssueComments insert IssueComment(
-        userName = owner,
-        repositoryName = repository,
-        issueId = issueId,
-        action = "delete_label",
-        commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
-        content = getLabel(owner, repository, labelId).map(_.labelName).getOrElse("Unknown label"),
-        registeredDate = currentDate,
-        updatedDate = currentDate
-      )
-    }
+  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session): Int = {
    IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
  }

  def createComment(owner: String, repository: String, loginUser: String,
      issueId: Int, content: String, action: String)(implicit s: Session): Int = {
-    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
    IssueComments returning IssueComments.map(_.commentId) insert IssueComment(
      userName          = owner,
      repositoryName    = repository,
@@ -372,82 +342,31 @@ trait IssuesService {
    Issues
      .filter (_.byPrimaryKey(owner, repository, issueId))
      .map { t => (t.title, t.content.?, t.updatedDate) }
-      .update(title, content, currentDate)
+      .update (title, content, currentDate)
  }

-  def updateAssignedUserName(owner: String, repository: String, issueId: Int, assignedUserName: Option[String], insertComment: Boolean = false)(implicit context: Context, s: Session): Int = {
-    if (insertComment) {
-      val oldAssigned = getIssue(owner, repository, s"${issueId}").get.assignedUserName.getOrElse("Not assigned")
-      val assigned = assignedUserName.getOrElse("Not assigned")
-      IssueComments insert IssueComment(
-        userName = owner,
-        repositoryName = repository,
-        issueId = issueId,
-        action = "assign",
-        commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
-        content = s"${oldAssigned}:${assigned}",
-        registeredDate = currentDate,
-        updatedDate = currentDate
-      )
-    }
-    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.assignedUserName?, t.updatedDate)).update(assignedUserName, currentDate)
+  def updateAssignedUserName(owner: String, repository: String, issueId: Int, assignedUserName: Option[String])(implicit s: Session): Int = {
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
  }

-  def updateMilestoneId(owner: String, repository: String, issueId: Int, milestoneId: Option[Int], insertComment: Boolean = false)(implicit context: Context, s: Session): Int = {
-    if (insertComment) {
-      val oldMilestoneName = getIssue(owner, repository, s"${issueId}").get.milestoneId.map(getMilestone(owner, repository, _).map(_.title).getOrElse("Unknown milestone")).getOrElse("No milestone")
-      val milestoneName = milestoneId.map(getMilestone(owner, repository, _).map(_.title).getOrElse("Unknown milestone")).getOrElse("No milestone")
-      IssueComments insert IssueComment(
-        userName = owner,
-        repositoryName = repository,
-        issueId = issueId,
-        action = "change_milestone",
-        commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
-        content = s"${oldMilestoneName}:${milestoneName}",
-        registeredDate = currentDate,
-        updatedDate = currentDate
-      )
-    }
-    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.milestoneId?, t.updatedDate)).update(milestoneId, currentDate)
+  def updateMilestoneId(owner: String, repository: String, issueId: Int, milestoneId: Option[Int])(implicit s: Session): Int = {
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
  }

-  def updatePriorityId(owner: String, repository: String, issueId: Int, priorityId: Option[Int], insertComment: Boolean = false)(implicit context: Context, s: Session): Int = {
-    if (insertComment) {
-      val oldPriorityName = getIssue(owner, repository, s"${issueId}").get.priorityId.map(getPriority(owner, repository, _).map(_.priorityName).getOrElse("Unknown priority")).getOrElse("No priority")
-      val priorityName = priorityId.map(getPriority(owner, repository, _).map(_.priorityName).getOrElse("Unknown priority")).getOrElse("No priority")
-      IssueComments insert IssueComment(
-        userName = owner,
-        repositoryName = repository,
-        issueId = issueId,
-        action = "change_priority",
-        commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"),
-        content = s"${oldPriorityName}:${priorityName}",
-        registeredDate = currentDate,
-        updatedDate = currentDate
-      )
-    }
-    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.priorityId?, t.updatedDate)).update(priorityId, currentDate)
+  def updatePriorityId(owner: String, repository: String, issueId: Int, priorityId: Option[Int])(implicit s: Session): Int = {
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.priorityId?).update (priorityId)
  }

-  def updateComment(issueId: Int, commentId: Int, content: String)(implicit s: Session): Int = {
-    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
-    IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
+  def updateComment(commentId: Int, content: String)(implicit s: Session): Int = {
+    IssueComments.filter (_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
  }

-  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 deleteComment(commentId: Int)(implicit s: Session): Int = {
+    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)
+    (Issues filter (_.byPrimaryKey(owner, repository, issueId)) map(t => (t.closed, t.updatedDate))).update((closed, currentDate))
  }

  /**
@@ -530,22 +449,16 @@ 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){
-        val userName = getAccountByMailAddress(commit.committerEmailAddress).map(_.userName).getOrElse(commit.committerName)
-        createComment(owner, repository, userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+        getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
+          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+        }
      }
    }
  }

  def getAssignableUserNames(owner: String, repository: String)(implicit s: Session): List[String] = {
    (getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER)) :::
-      (getAccountByUserName(owner) match {
-        case Some(x) if x.isGroupAccount =>
-          getGroupMembers(owner).map(_.userName)
-        case Some(_) =>
-          List(owner)
-        case None =>
-          Nil
-      })).distinct.sorted
+      (if (getAccountByUserName(owner).get.isGroupAccount) getGroupMembers(owner).map(_.userName) else List(owner))).distinct.sorted
  }

 }
@@ -584,14 +497,14 @@ object IssuesService {
      ).flatten ++
      labels.map(label => s"label:${label}") ++
      List(
-        milestone.map {
+        milestone.map { _ match {
          case Some(x) => s"milestone:${x}"
          case None    => "no:milestone"
-        },
-        priority.map {
+        }},
+        priority.map { _ match {
          case Some(x) => s"priority:${x}"
          case None    => "no:priority"
-        },
+        }},
        (sort, direction) match {
          case ("created" , "desc") => None
          case ("created" , "asc" ) => Some("sort:created-asc")
--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/src/main/scala/gitbucket/core/service/MergeService.scala
@@ -3,55 +3,40 @@ 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.{CommitBuilder, ObjectId, PersonIdent, Repository}
-import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
-
-import scala.collection.JavaConverters._
+import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent, Repository}
+import org.eclipse.jgit.revwalk.RevWalk

 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): Option[String] = {
+  def checkConflict(userName: String, repositoryName: String, branch: String, issueId: Int): Boolean = {
    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
-      new MergeCacheInfo(git, branch, issueId).checkConflict()
+      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[Option[String]] = {
+  def checkConflictCache(userName: String, repositoryName: String, branch: String, issueId: Int): Option[Boolean] = {
    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
-      new MergeCacheInfo(git, branch, issueId).checkConflictCache()
+      MergeCacheInfo(git, branch, issueId).checkConflictCache()
    }
  }
-
-  /** merge the pull request with a merge commit */
-  def mergePullRequest(git: Git, branch: String, issueId: Int, message: String, committer: PersonIdent): Unit = {
-    new MergeCacheInfo(git, branch, issueId).merge(message, committer)
+  /** merge pull request */
+  def mergePullRequest(git:Git, branch: String, issueId: Int, message:String, committer:PersonIdent): Unit = {
+    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 =>
@@ -61,12 +46,11 @@ 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): Either[String, (ObjectId, ObjectId, ObjectId)] = {
+                      remoteUserName: String, remoteRepositoryName: String, remoteBranch: String): Option[(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}"
@@ -83,12 +67,12 @@ trait MergeService {
        val mergeTip = git.getRepository.resolve(tmpRefName)
        try {
          if(merger.merge(mergeBaseTip, mergeTip)){
-            Right((merger.getResultTreeId, mergeBaseTip, mergeTip))
+            Some((merger.getResultTreeId, mergeBaseTip, mergeTip))
          } else {
-            Left(createConflictMessage(mergeTip, mergeBaseTip, merger))
+            None
          }
        } catch {
-          case e: NoMergeBaseException => Left(e.toString)
+          case e: NoMergeBaseException =>  None
        }
      } finally {
        val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
@@ -97,33 +81,30 @@ trait MergeService {
      }
    }
  }
-
  /**
-   * Checks whether conflict will be caused in merging. Returns `Some(errorMessage)` if conflict will be caused.
+   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
   */
  def checkConflict(userName: String, repositoryName: String, branch: String,
-                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Option[String] =
-    tryMergeRemote(userName, repositoryName, branch, requestUserName, requestRepositoryName, requestBranch).left.toOption
+                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean =
+    tryMergeRemote(userName, repositoryName, branch, requestUserName, requestRepositoryName, requestBranch).isEmpty

  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 merge commit id
+    // return treeId
    def createMergeCommit(repository: Repository, treeId: ObjectId, committer: PersonIdent, message: String, parents: Seq[ObjectId]): ObjectId = {
      val mergeCommit = new CommitBuilder()
      mergeCommit.setTreeId(treeId)
@@ -132,14 +113,14 @@ object MergeService{
      mergeCommit.setCommitter(committer)
      mergeCommit.setMessage(message)
      // insertObject and got mergeCommit Object Id
-      using(repository.newObjectInserter){ inserter =>
-        val mergeCommitId = inserter.insert(mergeCommit)
-        inserter.flush()
-        mergeCommitId
-      }
+      val inserter = repository.newObjectInserter
+      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 = {
+    def updateRefs(repository: Repository, ref: String, newObjectId: ObjectId, force: Boolean, committer: PersonIdent, refLogMessage: Option[String] = None):Unit = {
+      // update refs
      val refUpdate = repository.updateRef(ref)
      refUpdate.setNewObjectId(newObjectId)
      refUpdate.setForceUpdate(force)
@@ -148,41 +129,33 @@ object MergeService{
      refUpdate.update()
    }
  }
-
-  class MergeCacheInfo(git: Git, branch: String, issueId: Int){
-
-    private val repository = git.getRepository
-
-    private val mergedBranchName     = s"refs/pull/${issueId}/merge"
-    private val conflictedBranchName = s"refs/pull/${issueId}/conflict"
-
+  case class MergeCacheInfo(git:Git, branch:String, issueId:Int){
+    val repository = git.getRepository
+    val mergedBranchName = s"refs/pull/${issueId}/merge"
+    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[Option[String]] = {
-      Option(repository.resolve(mergedBranchName)).flatMap { merged =>
+    lazy val mergeTip = repository.resolve(s"refs/pull/${issueId}/head")
+    def checkConflictCache(): Option[Boolean] = {
+      Option(repository.resolve(mergedBranchName)).flatMap{ merged =>
          if(parseCommit(merged).getParents().toSet == Set( mergeBaseTip, mergeTip )){
            // merged branch exists
-            Some(None)
+            Some(false)
          } else {
            None
          }
      }.orElse(Option(repository.resolve(conflictedBranchName)).flatMap{ conflicted =>
-        val commit = parseCommit(conflicted)
-        if(commit.getParents().toSet == Set( mergeBaseTip, mergeTip )){
+        if(parseCommit(conflicted).getParents().toSet == Set( mergeBaseTip, mergeTip )){
          // conflict branch exists
-          Some(Some(commit.getFullMessage))
+          Some(true)
        } else {
          None
        }
      })
    }
-
-    def checkConflict(): Option[String] ={
+    def checkConflict():Boolean ={
      checkConflictCache.getOrElse(checkConflictForce)
    }
-
-    def checkConflictForce(): Option[String] ={
+    def checkConflictForce():Boolean ={
      val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
      val conflicted = try {
        !merger.merge(mergeBaseTip, mergeTip)
@@ -190,115 +163,36 @@ object MergeService{
        case e: NoMergeBaseException => true
      }
      val mergeTipCommit = using(new RevWalk( repository ))(_.parseCommit( mergeTip ))
-      val committer = mergeTipCommit.getCommitterIdent
-
-      def _updateBranch(treeId: ObjectId, message: String, branchName: String){
+      val committer = mergeTipCommit.getCommitterIdent;
+      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 {
-        val message = createConflictMessage(mergeTip, mergeBaseTip, merger)
-        _updateBranch(mergeTipCommit.getTree().getId(), message, conflictedBranchName)
+        updateBranch(mergeTipCommit.getTree().getId(), s"can't merge ${mergeTip.name} into ${mergeBaseTip.name}", conflictedBranchName)
        git.branchDelete().setForce(true).setBranchNames(mergedBranchName).call()
-        Some(message)
      }
+      conflicted
    }
-
    // update branch from cache
-    def merge(message: String, committer: PersonIdent) = {
-      if(checkConflict().isDefined){
+    def merge(message:String, committer:PersonIdent) = {
+      if(checkConflict()){
        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
@@ -1,191 +0,0 @@
-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,10 +1,11 @@
 package gitbucket.core.service

-import gitbucket.core.model.{Session => _, _}
+import gitbucket.core.model.{ProtectedBranch, ProtectedBranchContext, CommitState}
 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 {
@@ -17,11 +18,10 @@ trait ProtectedBranchService {
      .filter(_._1.byPrimaryKey(owner, repository, branch))
      .list
      .groupBy(_._1)
-      .headOption
      .map { p => p._1 -> p._2.flatMap(_._2) }
      .map { case (t1, contexts) =>
        new ProtectedBranchInfo(t1.userName, t1.repositoryName, true, contexts, t1.statusCheckAdmin)
-      }
+      }.headOption

  def getProtectedBranchInfo(owner: String, repository: String, branch: String)(implicit session: Session): ProtectedBranchInfo =
    getProtectedBranchInfoOpt(owner, repository, branch).getOrElse(ProtectedBranchInfo.disabled(owner, repository))
@@ -45,17 +45,12 @@ trait ProtectedBranchService {

 object ProtectedBranchService {

-  class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService with RepositoryService with AccountService {
+  class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService {
    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)
-        }
+        getProtectedBranchInfo(owner, repository, branch).getStopReason(receivePack.isAllowNonFastForwards, command, pusher)
      } else {
        None
      }
@@ -78,19 +73,10 @@ object ProtectedBranchService {
     * Include administrators
     * Enforce required status checks for repository administrators.
     */
-    includeAdministrators: Boolean) extends AccountService with RepositoryService with CommitStatusService {
+    includeAdministrators: Boolean) extends AccountService with CommitStatusService {

    def isAdministrator(pusher: String)(implicit session: Session): Boolean =
-      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
-        }
+      pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager)

    /**
     * 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: Option[Boolean])
+  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean)
                              (implicit s: Session): List[PullRequest] =
    PullRequests
      .join(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
@@ -87,16 +87,16 @@ trait PullRequestService { self: IssuesService with CommitsService =>
        (t1.requestUserName       === userName.bind) &&
        (t1.requestRepositoryName === repositoryName.bind) &&
        (t1.requestBranch         === branch.bind) &&
-        (t2.closed                === closed.get.bind, closed.isDefined)
+        (t2.closed                === closed.bind)
      }
      .map { case (t1, t2) => t1 }
      .list

  /**
   * for repository viewer.
-   * 1. find pull request from `branch` to other branch on same repository
+   * 1. find pull request from from `branch` to othre branch on same repository
   *   1. return if exists pull request to `defaultBranch`
-   *   2. return if exists pull request to other branch
+   *   2. return if exists pull request to othre branch
   * 2. return None
   */
  def getPullRequestFromBranch(userName: String, repositoryName: String, branch: String, defaultBranch: String)
@@ -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, Some(false)).foreach { pullreq =>
+    getPullRequestsByRequest(owner, repository, branch, 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, Some(oldId.getName), newId.getName, true, false)
+      val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)

      (commits, diffs)
    }
@@ -244,8 +244,8 @@ object PullRequestService {
  case class PullRequestCount(userName: String, count: Int)

  case class MergeStatus(
-    conflictMessage: Option[String],
-    commitStatues: List[CommitStatus],
+    hasConflict: Boolean,
+    commitStatues:List[CommitStatus],
    branchProtection: ProtectedBranchService.ProtectedBranchInfo,
    branchIsOutOfDate: Boolean,
    hasUpdatePermission: Boolean,
@@ -253,13 +253,12 @@ 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))
-    val hasProblem = hasRequiredStatusProblem || hasConflict || (statuses.nonEmpty && CommitState.combine(statuses.map(_.state).toSet) != CommitState.SUCCESS)
-    val canUpdate  = branchIsOutOfDate  && !hasConflict
-    val canMerge   = hasMergePermission && !hasConflict && !hasRequiredStatusProblem
+    val hasProblem = hasRequiredStatusProblem || hasConflict || (!statuses.isEmpty && CommitState.combine(statuses.map(_.state).toSet) != CommitState.SUCCESS)
+    val canUpdate = branchIsOutOfDate && !hasConflict
+    val canMerge = hasMergePermission && !hasConflict && !hasRequiredStatusProblem
    lazy val commitStateSummary:(CommitState, String) = {
      val stateMap = statuses.groupBy(_.state)
      val state = CommitState.combine(stateMap.keySet)
--- a/src/main/scala/gitbucket/core/service/ReleaseService.scala
+++ b/src/main/scala/gitbucket/core/service/ReleaseService.scala
@@ -1,87 +0,0 @@
-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,209 +1,71 @@
 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.{FileUtil, JGitUtil, LockUtil}
-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 gitbucket.core.util.JGitUtil
+import gitbucket.core.model.Account
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.dircache.DirCache
-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)
-  }
-
-}
+import org.eclipse.jgit.lib.{FileMode, Constants}

 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): 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, createReadme: Boolean)
+                      (implicit s: Session) {
+    val ownerAccount  = getAccountByUserName(owner).get
+    val loginUserName = loginAccount.userName

-  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
+    // Insert to the database at first
+    insertRepository(name, owner, description, isPrivate)

-        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
+//    // Add collaborators for group repository
+//    if(ownerAccount.isGroupAccount){
+//      getGroupMembers(owner).foreach { member =>
+//        addCollaborator(owner, name, member.userName)
+//      }
+//    }

+    // Insert default labels
+    insertDefaultLabels(owner, name)

-        // Insert to the database at first
-        insertRepository(name, owner, description, isPrivate)
+    // Insert default priorities
+    insertDefaultPriorities(owner, name)

-        //    // Add collaborators for group repository
-        //    if(ownerAccount.isGroupAccount){
-        //      getGroupMembers(owner).foreach { member =>
-        //        addCollaborator(owner, name, member.userName)
-        //      }
-        //    }
+    // Create the actual repository
+    val gitdir = getRepositoryDir(owner, name)
+    JGitUtil.initRepository(gitdir)

-        // Insert default labels
-        insertDefaultLabels(owner, name)
-
-        // Insert default priorities
-        insertDefaultPriorities(owner, name)
-
-        // Create the actual repository
-        val gitdir = getRepositoryDir(owner, name)
-        JGitUtil.initRepository(gitdir)
-
-        if (initOption == "README" || initOption == "EMPTY_COMMIT") {
-          using(Git.open(gitdir)) { git =>
-            val builder = DirCache.newInCore.builder()
-            val inserter = git.getRepository.newObjectInserter()
-            val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-
-            if (initOption == "README") {
-              val content = if (description.nonEmpty) {
-                name + "\n" +
-                  "===============\n" +
-                  "\n" +
-                  description.get
-              } else {
-                name + "\n" +
-                  "===============\n"
-              }
-
-              builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE,
-                inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
-            }
-            builder.finish()
-
-            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-              Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, "Initial commit")
-          }
+    if(createReadme){
+      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){
+          name + "\n" +
+            "===============\n" +
+            "\n" +
+            description.get
+        } else {
+          name + "\n" +
+            "===============\n"
        }

-        copyRepositoryDir.foreach { dir =>
-          try {
-            using(Git.open(dir)) { git =>
-              git.push().setRemote(gitdir.toURI.toString).setPushAll().setPushTags().call()
-            }
-          } finally {
-            FileUtils.deleteQuietly(dir)
-          }
-        }
+        builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE,
+          inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
+        builder.finish()

-        // Create Wiki repository
-        createWikiRepository(loginAccount, owner, name)
-
-        // Record activity
-        recordCreateRepositoryActivity(owner, name, loginUserName)
-
-        // Call hooks
-        PluginRegistry().getRepositoryHooks.foreach(_.created(owner, name))
+        JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+          Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, "Initial commit")
      }
-
-      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)
+    // Create Wiki repository
+    createWikiRepository(loginAccount, owner, 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))
-    }
+    // Record activity
+    recordCreateRepositoryActivity(owner, name, loginUserName)
  }

  def insertDefaultLabels(userName: String, repositoryName: String)(implicit s: Session): Unit = {
--- a/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
@@ -67,7 +67,7 @@ trait RepositorySearchService { self: IssuesService =>
        files.map { case (path, text) =>
          val (highlightText, lineNumber) = getHighlightText(text, query)
          FileSearchResult(
-            path.stripSuffix(".md"),
+            path.replaceFirst("\\.md$", ""),
            commits(path).getCommitterIdent.getWhen,
            highlightText,
            lineNumber)
--- 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, Release}
+import gitbucket.core.model.{Account, Collaborator, Repository, RepositoryOptions, Role}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
@@ -46,9 +46,7 @@ trait RepositoryService { self: AccountService =>
          externalIssuesUrl    = None,
          wikiOption           = "PUBLIC", // TODO DISABLE for the forked repository?
          externalWikiUrl      = None,
-          allowFork            = true,
-          mergeOptions         = "merge-commit,squash,rebase",
-          defaultMergeOption   = "merge-commit"
+          allowFork            = true
        )
      )

@@ -77,8 +75,6 @@ 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)
@@ -99,9 +95,9 @@ trait RepositoryService { self: AccountService =>

        RepositoryWebHooks     .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
        RepositoryWebHookEvents.insertAll(webHookEvents .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-        Milestones             .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-        Priorities             .insertAll(priorities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-        IssueId                .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+        Milestones   .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Priorities   .insertAll(priorities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        IssueId      .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)

        val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
        val newPriorities = Priorities.filter(_.byRepository(newUserName, newRepositoryName)).list
@@ -124,8 +120,6 @@ 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 =>
@@ -141,7 +135,7 @@ trait RepositoryService { self: AccountService =>
          repositoryName = newRepositoryName
        )) :_*)

-        // TODO Drop transferred owner from collaborators?
+        // TODO Drop transfered owner from collaborators?
        Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)

        // Update activity messages
@@ -165,23 +159,21 @@ 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
-    IssueLabels             .filter(_.byRepository(userName, repositoryName)).delete
-    Labels                  .filter(_.byRepository(userName, repositoryName)).delete
-    IssueComments           .filter(_.byRepository(userName, repositoryName)).delete
-    PullRequests            .filter(_.byRepository(userName, repositoryName)).delete
-    Issues                  .filter(_.byRepository(userName, repositoryName)).delete
-    Priorities              .filter(_.byRepository(userName, repositoryName)).delete
-    IssueId                 .filter(_.byRepository(userName, repositoryName)).delete
-    Milestones              .filter(_.byRepository(userName, repositoryName)).delete
+    Activities    .filter(_.byRepository(userName, repositoryName)).delete
+    Collaborators .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
+    PullRequests  .filter(_.byRepository(userName, repositoryName)).delete
+    Issues        .filter(_.byRepository(userName, repositoryName)).delete
+    Priorities    .filter(_.byRepository(userName, repositoryName)).delete
+    IssueId       .filter(_.byRepository(userName, repositoryName)).delete
+    Milestones    .filter(_.byRepository(userName, repositoryName)).delete
    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
+    DeployKeys    .filter(_.byRepository(userName, repositoryName)).delete
+    Repositories  .filter(_.byRepository(userName, repositoryName)).delete

    // Update ORIGIN_USER_NAME and ORIGIN_REPOSITORY_NAME
    Repositories
@@ -364,36 +356,14 @@ trait RepositoryService { self: AccountService =>
  /**
   * Save repository options.
   */
-  def saveRepositoryOptions(userName: String, repositoryName: String, description: Option[String], isPrivate: Boolean,
-      issuesOption: String, externalIssuesUrl: Option[String], wikiOption: String, externalWikiUrl: Option[String],
-      allowFork: Boolean, mergeOptions: Seq[String], defaultMergeOption: String)(implicit s: Session): Unit = {
-
+  def saveRepositoryOptions(userName: String, repositoryName: String,
+      description: Option[String], isPrivate: Boolean,
+      issuesOption: String, externalIssuesUrl: Option[String],
+      wikiOption: String, externalWikiUrl: Option[String],
+      allowFork: Boolean)(implicit s: Session): Unit =
    Repositories.filter(_.byRepository(userName, repositoryName))
-      .map { r => (
-        r.description.?,
-        r.isPrivate,
-        r.issuesOption,
-        r.externalIssuesUrl.?,
-        r.wikiOption,
-        r.externalWikiUrl.?,
-        r.allowFork,
-        r.mergeOptions,
-        r.defaultMergeOption,
-        r.updatedDate
-      ) }
-      .update (
-        description,
-        isPrivate,
-        issuesOption,
-        externalIssuesUrl,
-        wikiOption,
-        externalWikiUrl,
-        allowFork,
-        mergeOptions.mkString(","),
-        defaultMergeOption,
-        currentDate
-      )
-  }
+      .map { r => (r.description.?, r.isPrivate, r.issuesOption, r.externalIssuesUrl.?, r.wikiOption, r.externalWikiUrl.?, r.allowFork, r.updatedDate) }
+      .update (description, isPrivate, issuesOption, externalIssuesUrl, wikiOption, externalWikiUrl, allowFork, currentDate)

  def saveRepositoryDefaultBranch(userName: String, repositoryName: String,
      defaultBranch: String)(implicit s: Session): Unit =
@@ -420,7 +390,7 @@ trait RepositoryService { self: AccountService =>
    Collaborators
      .join(Accounts).on(_.collaboratorName === _.userName)
      .filter { case (t1, t2) => t1.byRepository(userName, repositoryName) }
-      .map    { case (t1, t2) => (t1, t2.groupAccount) }
+      .map { case (t1, t2) => (t1, t2.groupAccount) }
      .sortBy { case (t1, t2) => t1.collaboratorName }
      .list

@@ -432,26 +402,17 @@ trait RepositoryService { self: AccountService =>
    val q1 = Collaborators
      .join(Accounts).on { case (t1, t2) => (t1.collaboratorName === t2.userName) && (t2.groupAccount === false.bind) }
      .filter { case (t1, t2) => t1.byRepository(userName, repositoryName) }
-      .map    { case (t1, t2) => (t1.collaboratorName, t1.role) }
+      .map { case (t1, t2) => (t1.collaboratorName, t1.role) }

    val q2 = Collaborators
      .join(Accounts).on { case (t1, t2) => (t1.collaboratorName === t2.userName) && (t2.groupAccount === true.bind) }
      .join(GroupMembers).on { case ((t1, t2), t3) => t2.userName === t3.groupName }
      .filter { case ((t1, t2), t3) => t1.byRepository(userName, repositoryName) }
-      .map    { case ((t1, t2), t3) => (t3.userName, t1.role) }
+      .map { case ((t1, t2), t3) => (t3.userName, t1.role) }

    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 {
@@ -473,31 +434,17 @@ 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[Repository] =
+  def getForkedRepositories(userName: String, repositoryName: String)(implicit s: Session): List[(String, String)] =
    Repositories.filter { t =>
      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
    }
-    .sortBy(_.userName asc).list//.map(t => t.userName -> t.repositoryName).list
+    .sortBy(_.userName asc).map(t => t.userName -> t.repositoryName).list

  private val templateExtensions = Seq("md", "markdown")

@@ -544,7 +491,7 @@ object RepositoryService {
      this(repo.owner, repo.name, model, issueCount, pullCount, forkedCount, repo.branchList, repo.tags, managers)

    /**
-     * Creates instance without issue and  pull request count.
+     * Creates instance without issue count 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)
@@ -569,4 +516,5 @@ 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/RequestCache.scala
+++ b/src/main/scala/gitbucket/core/service/RequestCache.scala
@@ -11,8 +11,7 @@ import Implicits.request2Session
 * It may be called many times in one request, so each method stores
 * its result into the cache which available during a request.
 */
-trait RequestCache extends SystemSettingsService with AccountService with IssuesService with RepositoryService
-  with LabelsService with MilestonesService with PrioritiesService {
+trait RequestCache extends SystemSettingsService with AccountService with IssuesService with RepositoryService {

  private implicit def context2Session(implicit context: Context): Session =
    request2Session(context.request)
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -1,14 +1,11 @@
 package gitbucket.core.service

-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.Implicits._
 import gitbucket.core.util.ConfigUtil._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.SyntaxSugars._
+import SystemSettingsService._
+import javax.servlet.http.HttpServletRequest

 trait SystemSettingsService {

@@ -57,16 +54,6 @@ 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)
      }
@@ -124,19 +111,7 @@ trait SystemSettingsService {
            getOptionValue(props, LdapKeystore, None)))
        } 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")
+        }
      )
    }
  }
@@ -161,20 +136,18 @@ object SystemSettingsService {
    useSMTP: Boolean,
    smtp: Option[Smtp],
    ldapAuthentication: Boolean,
-    ldap: Option[Ldap],
-    oidcAuthentication: Boolean,
-    oidc: Option[OIDC],
-    skinName: String){
+    ldap: Option[Ldap]){
+    def baseUrl(request: HttpServletRequest): String = baseUrl.fold(request.baseUrl)(_.stripSuffix("/"))

-    def baseUrl(request: HttpServletRequest): String = baseUrl.fold {
-      val url = request.getRequestURL.toString
-      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")
-    }
+    def sshAddress:Option[SshAddress] =
+      for {
+        host <- sshHost if ssh
+      }
+      yield SshAddress(
+        host,
+        sshPort.getOrElse(DefaultSshPort),
+        "git"
+      )
  }

  case class Ldap(
@@ -191,16 +164,6 @@ 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],
@@ -256,12 +219,6 @@ 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 = {
    getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse {
--- a/src/main/scala/gitbucket/core/service/WebHookService.scala
+++ b/src/main/scala/gitbucket/core/service/WebHookService.scala
@@ -228,18 +228,16 @@ trait WebHookPullRequestService extends WebHookService {
    callWebHookOf(repository.owner, repository.name, WebHook.PullRequest){
      for{
        (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
-        users     =  getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender))
+        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 {
        WebHookPullRequestPayload(
          action         = action,
          issue          = issue,
          issueUser      = issueUser,
-          assignee       = assignee,
          pullRequest    = pullRequest,
          headRepository = headRepo,
          headOwner      = headOwner,
@@ -275,14 +273,12 @@ 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,
@@ -300,17 +296,16 @@ 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,
-                                          issue: Issue, pullRequest: PullRequest, baseUrl: String, sender: Account)
+  def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo, issueId: Int, 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(
@@ -318,7 +313,6 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
          comment        = comment,
          issue          = issue,
          issueUser      = issueUser,
-          assignee       = assignee,
          pullRequest    = pullRequest,
          headRepository = headRepo,
          headOwner      = headOwner,
@@ -362,35 +356,6 @@ 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,
@@ -402,9 +367,9 @@ object WebHookService {
    repository: ApiRepository
  ) extends FieldSerializable with WebHookPayload {
    val compare = commits.size match {
-      case 0 => ApiPath(s"/${repository.full_name}") // maybe test hook on un-initialized repository
+      case 0 => ApiPath(s"/${repository.full_name}") // maybe test hook on un-initalied repository
      case 1 => ApiPath(s"/${repository.full_name}/commit/${after}")
-      case _ if before.forall(_=='0') => ApiPath(s"/${repository.full_name}/compare/${commits.head.id}^...${after}")
+      case _ if before.filterNot(_=='0').isEmpty => ApiPath(s"/${repository.full_name}/compare/${commits.head.id}^...${after}")
      case _ => ApiPath(s"/${repository.full_name}/compare/${before}...${after}")
    }
    val head_commit = commits.lastOption
@@ -420,8 +385,8 @@ object WebHookService {
        ref        = refName,
        before     = ObjectId.toString(oldId),
        after      = ObjectId.toString(newId),
-        commits    = commits.map{ commit => ApiCommit.forWebhookPayload(git, RepositoryName(repositoryInfo), commit) },
-        repository = ApiRepository.forWebhookPayload(
+        commits    = commits.map{ commit => ApiCommit.forPushPayload(git, RepositoryName(repositoryInfo), commit) },
+        repository = ApiRepository.forPushPayload(
          repositoryInfo,
          owner= ApiUser(repositoryOwner))
      )
@@ -459,7 +424,6 @@ object WebHookService {
    def apply(action: String,
        issue: Issue,
        issueUser: Account,
-        assignee: Option[Account],
        pullRequest: PullRequest,
        headRepository: RepositoryInfo,
        headOwner: Account,
@@ -477,7 +441,6 @@ object WebHookService {
        headRepo      = headRepoPayload,
        baseRepo      = baseRepoPayload,
        user          = ApiUser(issueUser),
-        assignee      = assignee.map(ApiUser.apply),
        mergedComment = mergedComment
      )

@@ -532,7 +495,6 @@ object WebHookService {
      comment: CommitComment,
      issue: Issue,
      issueUser: Account,
-      assignee: Option[Account],
      pullRequest: PullRequest,
      headRepository: RepositoryInfo,
      headOwner: Account,
@@ -540,7 +502,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)
@@ -559,7 +521,6 @@ 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,6 +75,22 @@ 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.
   */
@@ -221,7 +237,7 @@ trait WikiService {
          builder.finish()
          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
            Constants.HEAD, committer.fullName, committer.mailAddress,
-            if(message.trim.isEmpty) {
+            if(message.trim.length == 0) {
              if(removed){
                s"Rename ${currentPageName} to ${newPageName}"
              } else if(created){
--- a/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
@@ -1,73 +0,0 @@
-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/GHCompatRepositoryAccessFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/GHCompatRepositoryAccessFilter.scala
@@ -0,0 +1,37 @@
+package gitbucket.core.servlet
+
+import javax.servlet._
+import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
+
+import gitbucket.core.service.SystemSettingsService
+
+/**
+  * A controller to provide GitHub compatible URL for Git clients.
+  */
+class GHCompatRepositoryAccessFilter extends Filter with SystemSettingsService {
+
+  /**
+    * Pattern of GitHub compatible repository URL.
+    * <code>/:user/:repo.git/</code>
+    */
+  private val githubRepositoryPattern = """^/[^/]+/[^/]+\.git/.*""".r
+
+  override def init(filterConfig: FilterConfig) = {}
+
+  override def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain) = {
+    implicit val request = req.asInstanceOf[HttpServletRequest]
+    val agent = request.getHeader("USER-AGENT")
+    val response = res.asInstanceOf[HttpServletResponse]
+    val requestPath = request.getRequestURI.substring(request.getContextPath.length)
+
+    requestPath match {
+      case githubRepositoryPattern() if agent != null && agent.toLowerCase.indexOf("git") >= 0 =>
+        response.sendRedirect(baseUrl + "/git" + requestPath)
+      case _ =>
+        chain.doFilter(req, res)
+    }
+  }
+
+  override def destroy() = {}
+
+}
--- a/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala
@@ -74,7 +74,7 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
    val action = request.paths match {
      case Array(_, repositoryOwner, repositoryName, _*) =>
        Database() withSession { implicit session =>
-          getRepository(repositoryOwner, repositoryName.replaceFirst("(\\.wiki)?\\.git$", "")) match {
+          getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", "")) match {
            case Some(repository) => {
              val execute = if (!isUpdating && !repository.repository.isPrivate && settings.allowAnonymousAccess) {
                // Authentication is not required
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -156,13 +156,9 @@ 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, sshUrl)
+            val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
            receivePack.setPreReceiveHook(hook)
            receivePack.setPostReceiveHook(hook)
          }
@@ -170,7 +166,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]

        if(repository.endsWith(".wiki")){
          defining(request) { implicit r =>
-            receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl, sshUrl))
+            receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.replaceFirst("\\.wiki$", ""), pusher, baseUrl))
          }
        }
      }
@@ -182,11 +178,10 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]

 import scala.collection.JavaConverters._

-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)
  extends PostReceiveHook with PreReceiveHook
  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
-    with LabelsService with PrioritiesService with MilestonesService
-    with WebHookPullRequestService with CommitsService {
+  with WebHookPullRequestService with CommitsService {

  private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
  private var existIds: Seq[String] = Nil
@@ -224,7 +219,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, sshUrl)
+            implicit val apiContext = api.JsonFormat.Context(baseUrl)
            val refName = command.getRefName.split("/")
            val branchName = refName.drop(2).mkString("/")
            val commits = if (refName(1) == "tags") {
@@ -307,18 +302,6 @@ 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))
@@ -337,7 +320,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:

 }

-class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
+class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String)
  extends PostReceiveHook with WebHookService with AccountService with RepositoryService {

  private val logger = LoggerFactory.getLogger(classOf[WikiCommitHook])
@@ -346,7 +329,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, sshUrl)
+          implicit val apiContext = api.JsonFormat.Context(baseUrl)
          val refName = command.getRefName.split("/")
          val commitIds = if (refName(1) == "tags") {
            None
@@ -360,10 +343,11 @@ 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, None, commit.id, false, false)
-                diffs.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") =>
+                val diffs = JGitUtil.getDiffs(git, commit.id, false)
+                diffs._1.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/InitializeListener.scala
+++ b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala
@@ -1,30 +1,25 @@
 package gitbucket.core.servlet

-import java.io.{File, FileOutputStream}
+import java.io.File

 import akka.event.Logging
 import com.typesafe.config.ConfigFactory
 import gitbucket.core.GitBucketCoreModule
-import gitbucket.core.plugin.{PluginRegistry, PluginRepository}
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.{ActivityService, SystemSettingsService}
 import gitbucket.core.util.DatabaseConfig
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.JDBCUtil._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
-import javax.servlet.{ServletContextEvent, ServletContextListener}
-
-import org.apache.commons.io.{FileUtils, IOUtils}
+import javax.servlet.{ServletContextListener, ServletContextEvent}
+import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
-import akka.actor.{Actor, ActorSystem, Props}
+import akka.actor.{Actor, Props, ActorSystem}
 import com.typesafe.akka.extension.quartz.QuartzSchedulerExtension
-import com.github.zafarkhaja.semver.{Version => Semver}
-
 import scala.collection.JavaConverters._

-
 /**
 * Initialize GitBucket system.
 * Update database schema and load plug-ins automatically in the context initializing.
@@ -59,11 +54,44 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
      val manager = new JDBCVersionManager(conn)

      // Check version
-      checkVersion(manager, conn)
+      val versionFile = new File(GitBucketHome, "version")
+
+      if(versionFile.exists()){
+        val version = FileUtils.readFileToString(versionFile, "UTF-8")
+        if(version == "3.14"){
+          // Initialization for GitBucket 3.14
+          logger.info("Migration to GitBucket 4.x start")
+
+          // Backup current data
+          val dataMvFile = new File(GitBucketHome, "data.mv.db")
+          if(dataMvFile.exists) {
+            FileUtils.copyFile(dataMvFile, new File(GitBucketHome, "data.mv.db_3.14"))
+          }
+          val dataTraceFile = new File(GitBucketHome, "data.trace.db")
+          if(dataTraceFile.exists) {
+            FileUtils.copyFile(dataTraceFile, new File(GitBucketHome, "data.trace.db_3.14"))
+          }
+
+          // Change form
+          manager.initialize()
+          manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0.0")
+          conn.select("SELECT PLUGIN_ID, VERSION FROM PLUGIN"){ rs =>
+            manager.updateVersion(rs.getString("PLUGIN_ID"), rs.getString("VERSION"))
+          }
+          conn.update("DROP TABLE PLUGIN")
+          versionFile.delete()
+
+          logger.info("Migration to GitBucket 4.x completed")
+
+        } else {
+          throw new Exception("GitBucket can't migrate from this version. Please update to 3.14 at first.")
+        }
+      }

      // Run normal migration
      logger.info("Start schema update")
-      new Solidbase().migrate(conn, Thread.currentThread.getContextClassLoader, DatabaseConfig.liquiDriver, GitBucketCoreModule)
+      val solidbase = new Solidbase()
+      solidbase.migrate(conn, Thread.currentThread.getContextClassLoader, DatabaseConfig.liquiDriver, GitBucketCoreModule)

      // Rescue code for users who updated from 3.14 to 4.0.0
      // https://github.com/gitbucket/gitbucket/issues/1227
@@ -78,9 +106,6 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
        throw new IllegalStateException(s"Initialization failed. GitBucket version is ${gitbucketVersion}, but database version is ${databaseVersion}.")
      }

-      // Install bundled plugins
-      extractBundledPlugins(gitbucketVersion)
-
      // Load plugins
      logger.info("Initialize plugins")
      PluginRegistry.initialize(event.getServletContext, loadSystemSettings(), conn)
@@ -92,76 +117,7 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
    scheduler.schedule("Daily", system.actorOf(Props[DeleteOldActivityActor]), "DeleteOldActivity")
  }

-  private def checkVersion(manager: JDBCVersionManager, conn: java.sql.Connection): Unit = {
-    logger.info("Check version")
-    val versionFile = new File(GitBucketHome, "version")

-    if(versionFile.exists()){
-      val version = FileUtils.readFileToString(versionFile, "UTF-8")
-      if(version == "3.14"){
-        // Initialization for GitBucket 3.14
-        logger.info("Migration to GitBucket 4.x start")
-
-        // Backup current data
-        val dataMvFile = new File(GitBucketHome, "data.mv.db")
-        if(dataMvFile.exists) {
-          FileUtils.copyFile(dataMvFile, new File(GitBucketHome, "data.mv.db_3.14"))
-        }
-        val dataTraceFile = new File(GitBucketHome, "data.trace.db")
-        if(dataTraceFile.exists) {
-          FileUtils.copyFile(dataTraceFile, new File(GitBucketHome, "data.trace.db_3.14"))
-        }
-
-        // Change form
-        manager.initialize()
-        manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0.0")
-        conn.select("SELECT PLUGIN_ID, VERSION FROM PLUGIN"){ rs =>
-          manager.updateVersion(rs.getString("PLUGIN_ID"), rs.getString("VERSION"))
-        }
-        conn.update("DROP TABLE PLUGIN")
-        versionFile.delete()
-
-        logger.info("Migration to GitBucket 4.x completed")
-
-      } else {
-        throw new Exception("GitBucket can't migrate from this version. Please update to 3.14 at first.")
-      }
-    }
-  }
-
-  private def extractBundledPlugins(gitbucketVersion: String): Unit = {
-    logger.info("Extract bundled plugins")
-    val cl = Thread.currentThread.getContextClassLoader
-    try {
-      using(cl.getResourceAsStream("plugins/plugins.json")){ pluginsFile =>
-        if(pluginsFile != null){
-          val pluginsJson = IOUtils.toString(pluginsFile, "UTF-8")
-
-          FileUtils.forceMkdir(PluginRepository.LocalRepositoryDir)
-          FileUtils.write(PluginRepository.LocalRepositoryIndexFile, pluginsJson, "UTF-8")
-
-          val plugins = PluginRepository.parsePluginJson(pluginsJson)
-          plugins.foreach { plugin =>
-            plugin.versions.sortBy { x => Semver.valueOf(x.version) }.reverse.zipWithIndex.foreach { case (version, i) =>
-              val file = new File(PluginRepository.LocalRepositoryDir, version.file)
-              if(!file.exists) {
-                logger.info(s"Copy ${plugin} to ${file.getAbsolutePath}")
-                FileUtils.forceMkdirParent(file)
-                using(cl.getResourceAsStream("plugins/" + version.file), new FileOutputStream(file)){ case (in, out) => IOUtils.copy(in, out) }
-
-                if(plugin.default && i == 0){
-                  logger.info(s"Enable ${file.getName} in default")
-                  FileUtils.copyFile(file, new File(PluginHome, version.file))
-                }
-              }
-            }
-          }
-        }
-      }
-    } catch {
-      case e: Exception => logger.error("Error in extracting bundled plugin", e)
-    }
-  }

  override def contextDestroyed(event: ServletContextEvent): Unit = {
    // Shutdown Quartz scheduler
@@ -190,4 +146,4 @@ class DeleteOldActivityActor extends Actor with SystemSettingsService with Activ
      }
    }
  }
-}
+}
--- a/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala
@@ -19,7 +19,7 @@ class PluginAssetsServlet extends HttpServlet {
      .find    { case (prefix, _, _) => path.startsWith("/plugin-assets" + prefix) }
      .flatMap { case (prefix, resourcePath, classLoader) =>
        val resourceName = path.substring(("/plugin-assets" + prefix).length)
-        Option(classLoader.getResourceAsStream(resourcePath.stripPrefix("/") + resourceName))
+        Option(classLoader.getResourceAsStream(resourcePath.replaceFirst("^/", "") + resourceName))
      }
      .map { in =>
        try {
--- a/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
@@ -1,48 +0,0 @@
-package gitbucket.core.servlet
-
-import javax.servlet._
-import javax.servlet.http.HttpServletRequest
-
-import gitbucket.core.controller.ControllerBase
-import gitbucket.core.plugin.PluginRegistry
-
-class PluginControllerFilter extends Filter {
-
-  private var filterConfig: FilterConfig = null
-
-  override def init(filterConfig: FilterConfig): Unit = {
-    this.filterConfig = filterConfig
-  }
-
-  override def destroy(): Unit = {
-    PluginRegistry().getControllers().foreach { case (controller, _) =>
-      controller.destroy()
-    }
-  }
-
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
-    val contextPath = request.getServletContext.getContextPath
-    val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI.substring(contextPath.length)
-
-    PluginRegistry().getControllers()
-      .filter { case (_, path) =>
-        val start = path.replaceFirst("/\\*$", "/")
-        (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 ()
-        }
-      }
-
-    chain.doFilter(request, response)
-  }
-
-}
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -19,7 +19,7 @@ import org.apache.sshd.server.scp.UnknownCommand
 import org.eclipse.jgit.errors.RepositoryNotFoundException

 object GitCommand {
-  val DefaultCommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-\+_.]+).git'\Z""".r
+  val DefaultCommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
  val SimpleCommandRegex  = """\Agit-(upload|receive)-pack '/(.+\.git)'\Z""".r
 }

@@ -154,7 +154,7 @@ class DefaultGitUploadPack(owner: String, repoName: String) extends DefaultGitCo
  }
 }

-class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String, sshUrl: Option[String]) extends DefaultGitCommand(owner, repoName)
+class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: 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, ss
        val repository = git.getRepository
        val receive = new ReceivePack(repository)
        if (!repoName.endsWith(".wiki")) {
-          val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl, sshUrl)
+          val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl)
          receive.setPreReceiveHook(hook)
          receive.setPostReceiveHook(hook)
        }
@@ -216,26 +216,19 @@ class PluginGitReceivePack(repoName: String, routing: GitRepositoryRouting) exte
 }


-class GitCommandFactory(baseUrl: String, sshUrl: Option[String]) extends CommandFactory {
+class GitCommandFactory(baseUrl: String) extends CommandFactory {
  private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])

  override def createCommand(command: String): Command = {
    import GitCommand._
    logger.debug(s"command: $command")

-    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, sshUrl)
-        case _ => new UnknownCommand(command)
-      }
+    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 _ => new UnknownCommand(command)
    }
  }

--- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
@@ -6,7 +6,7 @@ import javax.servlet.{ServletContextEvent, ServletContextListener}

 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.service.SystemSettingsService.SshAddress
-import gitbucket.core.util.Directory
+import gitbucket.core.util.{Directory}
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
 import org.slf4j.LoggerFactory

@@ -22,7 +22,7 @@ object SshServer {
    provider.setOverwriteAllowed(false)
    server.setKeyPairProvider(provider)
    server.setPublickeyAuthenticator(new PublicKeyAuthenticator(sshAddress.genericUser))
-    server.setCommandFactory(new GitCommandFactory(baseUrl, Some(s"${sshAddress.genericUser}@${sshAddress.host}:${sshAddress.port}")))
+    server.setCommandFactory(new GitCommandFactory(baseUrl))
    server.setShellFactory(new NoShell(sshAddress))
  }

--- a/src/main/scala/gitbucket/core/util/Authenticator.scala
+++ b/src/main/scala/gitbucket/core/util/Authenticator.scala
@@ -97,10 +97,16 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService with A
    {
      defining(request.paths){ paths =>
        getRepository(paths(0), paths(1)).map { repository =>
-          if(isReadable(repository.repository, context.loginAccount)){
+          if(!repository.repository.isPrivate){
            action(repository)
          } else {
-            Unauthorized()
+            context.loginAccount match {
+              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/DatabaseConfig.scala
+++ b/src/main/scala/gitbucket/core/util/DatabaseConfig.scala
@@ -92,7 +92,7 @@ object DatabaseType {
  }

  object MySQL extends DatabaseType {
-    val jdbcDriver = "org.mariadb.jdbc.Driver"
+    val jdbcDriver = "com.mysql.jdbc.Driver"
    val slickDriver = BlockingMySQLDriver
    val liquiDriver = new MySQLDatabase()
  }
--- a/src/main/scala/gitbucket/core/util/Directory.scala
+++ b/src/main/scala/gitbucket/core/util/Directory.scala
@@ -54,12 +54,6 @@ 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.
   */
@@ -96,4 +90,4 @@ object Directory {
  def getWikiRepositoryDir(owner: String, repository: String): File =
    new File(s"${RepositoryHome}/${owner}/${repository}.wiki.git")

-}
+}
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -28,6 +28,8 @@ 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)
@@ -51,6 +53,16 @@ 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

@@ -76,9 +88,4 @@ 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,8 +22,7 @@ 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, context.settings.sshAddress.map { x => s"${x.genericUser}@${x.host}:${x.port}" })
+  implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context = JsonFormat.Context(context.baseUrl)

  implicit class RichSeq[A](private val seq: Seq[A]) extends AnyVal {

@@ -78,6 +77,11 @@ 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/JDBCUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JDBCUtil.scala
@@ -75,7 +75,7 @@ object JDBCUtil {
          var stringLiteral = false

          while({ length = in.read(bytes); length != -1 }){
-            for(i <- 0 until length){
+            for(i <- 0 to length - 1){
              val c = bytes(i)
              if(c == '\''){
                stringLiteral = !stringLiteral
@@ -146,11 +146,13 @@ object JDBCUtil {
                }
              }

-              val columnValues = values.map { 
-                case x: String    => "'" + x.replace("'", "''") + "'"
-                case x: Timestamp => "'" + dateFormat.format(x) + "'"
-                case null         => "NULL"
-                case x            => x
+              val columnValues = values.map { value =>
+                value match {
+                  case x: String    => "'" + x.replace("'", "''") + "'"
+                  case x: Timestamp => "'" + dateFormat.format(x) + "'"
+                  case null         => "NULL"
+                  case x            => x
+                }
              }
              sb.append(columnValues.mkString(", "))
              sb.append(");\n")
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -1,7 +1,5 @@
 package gitbucket.core.util

-import java.io.ByteArrayOutputStream
-
 import gitbucket.core.service.RepositoryService
 import org.eclipse.jgit.api.Git
 import Directory._
@@ -16,17 +14,15 @@ import org.eclipse.jgit.revwalk.filter._
 import org.eclipse.jgit.treewalk._
 import org.eclipse.jgit.treewalk.filter._
 import org.eclipse.jgit.diff.DiffEntry.ChangeType
-import org.eclipse.jgit.errors.{ConfigInvalidException, IncorrectObjectTypeException, MissingObjectException}
+import org.eclipse.jgit.errors.{ConfigInvalidException, MissingObjectException}
 import org.eclipse.jgit.transport.RefSpec
 import java.util.Date
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer

-import org.cache2k.Cache2kBuilder
+import org.cache2k.{Cache2kBuilder, CacheEntry}
 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

 /**
@@ -97,7 +93,7 @@ object JGitUtil {

    val summary = getSummaryMessage(fullMessage, shortMessage)

-    val description = defining(fullMessage.trim.indexOf('\n')){ i =>
+    val description = defining(fullMessage.trim.indexOf("\n")){ i =>
      if(i >= 0){
        Some(fullMessage.trim.substring(i).trim)
      } else None
@@ -118,8 +114,7 @@ object JGitUtil {
    newObjectId: Option[String],
    oldMode: String,
    newMode: String,
-    tooLarge: Boolean,
-    patch: Option[String]
+    tooLarge: Boolean
  )

  /**
@@ -151,10 +146,9 @@ object JGitUtil {
   *
   * @param name the module name
   * @param path the path in the repository
-   * @param repositoryUrl the repository url of this module
-   * @param viewerUrl the repository viewer url of this module
+   * @param url the repository url of this module
   */
-  case class SubmoduleInfo(name: String, path: String, repositoryUrl: String, viewerUrl: String)
+  case class SubmoduleInfo(name: String, path: String, url: String)

  case class BranchMergeInfo(ahead: Int, behind: Int, isMerged: Boolean)

@@ -190,9 +184,11 @@ object JGitUtil {
    val dir = git.getRepository.getDirectory
    val keyPrefix = dir.getAbsolutePath + "@"

-    cache.keys.forEach(key => {
-      if (key.startsWith(keyPrefix)) {
-        cache.remove(key)
+    cache.forEach(new Consumer[CacheEntry[String, Int]] {
+      override def accept(entry: CacheEntry[String, Int]): Unit = {
+        if(entry.getKey.startsWith(keyPrefix)){
+          cache.remove(entry.getKey)
+        }
      }
    })
  }
@@ -230,14 +226,9 @@ object JGitUtil {
            ref.getName.stripPrefix("refs/heads/")
          }.toList,
          // tags
-          git.tagList.call.asScala.flatMap { ref =>
-            try {
-              val revCommit = getRevCommitFromId(git, ref.getObjectId)
-              Some(TagInfo(ref.getName.stripPrefix("refs/tags/"), revCommit.getCommitterIdent.getWhen, revCommit.getName))
-            } catch {
-              case _: IncorrectObjectTypeException =>
-                None
-            }
+          git.tagList.call.asScala.map { ref =>
+            val revCommit = getRevCommitFromId(git, ref.getObjectId)
+            TagInfo(ref.getName.stripPrefix("refs/tags/"), revCommit.getCommitterIdent.getWhen, revCommit.getName)
          }.sortBy(_.time).toList
        )
      } catch {
@@ -253,10 +244,9 @@ 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 = ".", baseUrl: Option[String] = None): List[FileInfo] = {
+  def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = {
    using(new RevWalk(git.getRepository)){ revWalk =>
      val objectId = git.getRepository.resolve(revision)
      if(objectId == null) return Nil
@@ -298,7 +288,7 @@ object JGitUtil {
      @tailrec
      def findLastCommits(result:List[(ObjectId, FileMode, String, String, Option[String], RevCommit)],
                          restList:List[((ObjectId, FileMode, String, String, Option[String]), Map[RevCommit, RevCommit])],
-                          revIterator:java.util.Iterator[RevCommit]): List[(ObjectId, FileMode, String, String, Option[String], RevCommit)] = {
+                          revIterator:java.util.Iterator[RevCommit]): List[(ObjectId, FileMode, String, String, Option[String], RevCommit)] ={
        if(restList.isEmpty){
          result
        } else if(!revIterator.hasNext){ // maybe, revCommit has only 1 log. other case, restList be empty
@@ -342,7 +332,7 @@ object JGitUtil {
      useTreeWalk(revCommit){ treeWalk =>
        while (treeWalk.next()) {
          val linkUrl = if (treeWalk.getFileMode(0) == FileMode.GITLINK) {
-            getSubmodules(git, revCommit.getTree, baseUrl).find(_.path == treeWalk.getPathString).map(_.viewerUrl)
+            getSubmodules(git, revCommit.getTree).find(_.path == treeWalk.getPathString).map(_.url)
          } else None
          fileList +:= (treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getNameString, treeWalk.getPathString, linkUrl)
        }
@@ -369,9 +359,9 @@ object JGitUtil {
          (file1.isDirectory, file2.isDirectory) match {
            case (true , false) => true
            case (false, true ) => false
-            case _ => file1.name.compareTo(file2.name) < 0
+           case _ => file1.name.compareTo(file2.name) < 0
          }
-        }
+        }.toList
    }
  }

@@ -379,7 +369,7 @@ object JGitUtil {
   * Returns the first line of the commit message.
   */
  private def getSummaryMessage(fullMessage: String, shortMessage: String): String = {
-    defining(fullMessage.trim.indexOf('\n')){ i =>
+    defining(fullMessage.trim.indexOf("\n")){ i =>
      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
        if(firstLine.length > shortMessage.length) shortMessage else firstLine
      }
@@ -519,49 +509,90 @@ object JGitUtil {
    }.toMap
  }

-  def getPatch(git: Git, from: Option[String], to: String): String = {
-    val out = new ByteArrayOutputStream()
-    val df = new DiffFormatter(out)
-    df.setRepository(git.getRepository)
-    df.setDiffComparator(RawTextComparator.DEFAULT)
-    df.setDetectRenames(true)
-    df.format(getDiffEntries(git, from, to).head)
-    new String(out.toByteArray, "UTF-8")
-  }
+  /**
+   * Returns the tuple of diff of the given commit and the previous commit id.
+   */
+  def getDiffs(git: Git, id: String, fetchContent: Boolean = true): (List[DiffInfo], Option[String]) = {
+    @scala.annotation.tailrec
+    def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[RevCommit]): List[RevCommit] =
+      i.hasNext match {
+        case true if(logs.size < 2) => getCommitLog(i, logs :+ i.next)
+        case _ => logs
+      }

-  private def getDiffEntries(git: Git, from: Option[String], to: String): Seq[DiffEntry] = {
    using(new RevWalk(git.getRepository)){ revWalk =>
-      val df = new DiffFormatter(DisabledOutputStream.INSTANCE)
-      df.setRepository(git.getRepository)
+      revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(id)))
+      val commits   = getCommitLog(revWalk.iterator, Nil)
+      val revCommit = commits(0)

-      val toCommit = revWalk.parseCommit(git.getRepository.resolve(to))
-      from match {
-        case None => {
-          toCommit.getParentCount match {
-            case 0 => df.scan(new EmptyTreeIterator(), new CanonicalTreeParser(null, git.getRepository.newObjectReader(), toCommit.getTree)).asScala
-            case _ => df.scan(toCommit.getParent(0), toCommit.getTree).asScala
+      if(commits.length >= 2){
+        // not initial commit
+        val oldCommit = if(revCommit.getParentCount >= 2) {
+          // merge commit
+          revCommit.getParents.head
+        } else {
+          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
+              )
+            }))
          }
-        }
-        case Some(from) => {
-          val fromCommit = revWalk.parseCommit(git.getRepository.resolve(from))
-          df.scan(fromCommit.getTree, toCommit.getTree).asScala
+          (buffer.toList, None)
        }
      }
    }
  }

-  def getParentCommitId(git: Git, id: String): Option[String] = {
-    using(new RevWalk(git.getRepository)){ revWalk =>
-      val commit = revWalk.parseCommit(git.getRepository.resolve(id))
-      commit.getParentCount match {
-        case 0 => None
-        case _ => Some(commit.getParent(0).getName)
-      }
-    }
-  }
+  def getDiffs(git: Git, from: String, to: String, fetchContent: Boolean): List[DiffInfo] = {
+    val reader = git.getRepository.newObjectReader
+    val oldTreeIter = new CanonicalTreeParser
+    oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))

-  def getDiffs(git: Git, from: Option[String], to: String, fetchContent: Boolean, makePatch: Boolean): List[DiffInfo] = {
-    val diffs = getDiffEntries(git, from, to)
+    val newTreeIter = new CanonicalTreeParser
+    newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
+
+    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(
@@ -576,8 +607,7 @@ object JGitUtil {
          newObjectId = Option(diff.getNewId).map(_.name),
          oldMode     = diff.getOldMode.toString,
          newMode     = diff.getNewMode.toString,
-          tooLarge    = true,
-          patch       = None
+          tooLarge    = true
        )
      } else {
        val oldIsImage = FileUtil.isImage(diff.getOldPath)
@@ -595,8 +625,7 @@ object JGitUtil {
            newObjectId = Option(diff.getNewId).map(_.name),
            oldMode     = diff.getOldMode.toString,
            newMode     = diff.getNewMode.toString,
-            tooLarge    = false,
-            patch       = (if(makePatch) Some(makePatchFromDiffEntry(git, diff)) else None) // TODO use DiffFormatter
+            tooLarge    = false
          )
        } else {
          DiffInfo(
@@ -611,23 +640,13 @@ object JGitUtil {
            newObjectId = Option(diff.getNewId).map(_.name),
            oldMode     = diff.getOldMode.toString,
            newMode     = diff.getNewMode.toString,
-            tooLarge    = false,
-            patch       = (if(makePatch) Some(makePatchFromDiffEntry(git, diff)) else None) // TODO use DiffFormatter
+            tooLarge    = false
          )
        }
      }
    }.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.
@@ -732,7 +751,7 @@ object JGitUtil {
  /**
   * Read submodule information from .gitmodules
   */
-  def getSubmodules(git: Git, tree: RevTree, baseUrl: Option[String]): List[SubmoduleInfo] = {
+  def getSubmodules(git: Git, tree: RevTree): List[SubmoduleInfo] = {
    val repository = git.getRepository
    getContentFromPath(git, tree, ".gitmodules", true).map { bytes =>
      (try {
@@ -740,7 +759,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, StringUtil.getRepositoryViewerUrl(url, baseUrl))
+          SubmoduleInfo(module, path, url)
        }
      } catch {
        case e: ConfigInvalidException => {
@@ -804,22 +823,17 @@ 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(!isLfs && bytes.isDefined && FileUtil.isText(bytes.get)){
+        if(bytes.isDefined && FileUtil.isText(bytes.get)){
          // text
          ContentInfo("text", size, Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
        } else {
@@ -980,13 +994,13 @@ object JGitUtil {

  def getBlame(git: Git, id: String, path: String): Iterable[BlameInfo] = {
    Option(git.getRepository.resolve(id)).map{ commitId =>
-      val blamer = new org.eclipse.jgit.api.BlameCommand(git.getRepository)
+      val blamer = new org.eclipse.jgit.api.BlameCommand(git.getRepository);
      blamer.setStartCommit(commitId)
      blamer.setFilePath(path)
      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(
@@ -996,7 +1010,7 @@ object JGitUtil {
            c.getAuthorIdent.getWhen,
            Option(git.log.add(c).addPath(blame.getSourcePath(i)).setSkip(1).setMaxCount(2).call.iterator.next)
              .map(_.name),
-            if(blame.getSourcePath(i)==path){ None } else { Some(blame.getSourcePath(i)) },
+            if(blame.getSourcePath(i)==path){ None }else{ Some(blame.getSourcePath(i)) },
            c.getCommitterIdent.getWhen,
            c.getShortMessage,
            Set.empty)
--- a/src/main/scala/gitbucket/core/util/Keys.scala
+++ b/src/main/scala/gitbucket/core/util/Keys.scala
@@ -25,11 +25,6 @@ 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
@@ -1,68 +0,0 @@
-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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Naoki Takezoe	47ec2d4712	Copy only LFS dir and insert default priorities in forking repository	2017-07-05 00:21:15 +09:00
Naoki Takezoe	31160f42cb	Release 4.14.1	2017-07-05 00:01:33 +09:00
Naoki Takezoe	4f11cbaa77	(refs #1631 )Copy repository files directory only if it exists	2017-07-04 23:57:18 +09:00
				`@@ -1 +0,0 @@`
				`libraryDependencies += "com.eclipsesource.minimal-json" % "minimal-json" % "0.9.4"`