Moving to Quill

2026-05-08 00:57:10 +02:00 · 2016-03-10 18:30:48 +09:00 · 2016-03-10 16:40:25 +09:00 · 2016-03-10 13:27:02 +09:00 · 2016-03-10 01:51:35 +09:00 · 2016-03-07 10:05:51 +09:00
412 changed files with 32740 additions and 30511 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,13 +0,0 @@
-root = true
-
-[*]
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.java]
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,3 +4,4 @@
 - 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 Japaneses 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.
+- First priority of GitBucket is easy installation and reproduce GitHub behavior, so we might reject if your request is against it.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,4 +5,4 @@
 - [] verified that project is compiling
 - [] verified that tests are passing
 - [] squashed my commits as appropriate *(keep several commits if it is relevant to understand the PR)*
- [] [marked as closed using commit message](https://help.github.com/articles/closing-issues-via-commit-messages/) all issue ID that this PR should correct
+- [] [marked as closed](https://help.github.com/articles/closing-issues-via-commit-messages/) all issue ID that this PR should correct
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,3 @@ project/plugins/project/
 # IntelliJ specific
 .idea/
 .idea_modules/
-*.iml
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,6 @@
 language: scala
-sudo: true
+sudo: false
 script:
  - sbt test
 jdk:
  - oraclejdk8
-before_script:
-  - sudo apt-get install libaio1
-  - sudo /etc/init.d/mysql stop
-  - sudo /etc/init.d/postgresql stop
-cache:
-  directories:
-    - $HOME/.ivy2/cache
-    - $HOME/.sbt/boot
-    - $HOME/.sbt/launchers
-    - $HOME/.coursier
-    - $HOME/.embedmysql
-    - $HOME/.embedpostgresql
-matrix:
-  include:
-  - dist: trusty
-    group: edge
-    sudo: required
-    jdk: oraclejdk9
-    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
-    - 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 ..
-    - echo "sbt.version=0.13.14-RC1" > project/build.properties
-    - 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/5
+++ b/5
@@ -1,3 +1,4 @@
+
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
@@ -178,7 +179,7 @@
   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
@@ -186,7 +187,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@@ -1,180 +1,65 @@
 GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket)
 =========

-GitBucket is a Git platform powered by Scala offering:
- Easy installation
- High extensibility by plugins
- API compatibility with GitHub
+GitBucket is a GitHub clone powered by Scala which has easy installation and high extensibility.

 Features
 --------
 The current version of GitBucket provides a basic features below:

 - Public / Private Git repository (http and ssh access)
- GitLFS support
- Repository viewer includes online file editor
- Issues, Pull request and Wiki for repositories
- Activity timeline and email notification
- Account and group management with LDAP integration
+- Repository viewer and online file editing
+- Wiki
+- Issues / Pull request
+- Email notification
+- Simple user and group management with LDAP integration
 - Plug-in system

-If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
+If you want to try the development version of GitBucket, see [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).

 Installation
 --------
-GitBucket requires **Java8**. You have to install it if it is not already installed.
+GitBucket requires **Java8**. You have to install beforehand when it's not installed.

-1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
-2. Go to `http://[hostname]:8080/` and log in with **root** / **root**.
+1. Download latest **gitbucket.war** from [the release page](https://github.com/gitbucket/gitbucket/releases).
+2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
+3. Access **http://[hostname]:[port]/gitbucket/** using your web browser and logged-in with **root** / **root**.

-You can specify following options:
+or you can start GitBucket by `java -jar gitbucket.war` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.

- `--port=[NUMBER]`
- `--prefix=[CONTEXTPATH]`
- `--host=[HOSTNAME]`
- `--gitbucket.home=[DATA_DIR]`
- `--temp_dir=[TEMP_DIR]`
+- --port=[NUMBER]
+- --prefix=[CONTEXTPATH]
+- --host=[HOSTNAME]
+- --gitbucket.home=[DATA_DIR]

-`TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home.
+To upgrade GitBucket, only replace gitbucket.war after stop GitBucket. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.

-You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
+About installation on Mac or Windows Server (with IIS), configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).

-For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
-
-To upgrade GitBucket, replace `gitbucket.war` with the new version, after stopping GitBucket. All GitBucket data is stored in `HOME/.gitbucket` by default. So if you want to back up GitBucket's data, copy this directory to the backup location.
-
-Plugins
+Plug-ins
 --------
-GitBucket has a plug-in system to allow extensions to GitBucket. We provide some official plug-ins:
+GitBucket has the plug-in system to extend GitBucket from outside of GitBucket. Some plug-ins are available now:

 - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
- [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
+- [gitbucket-announce-plugin](https://github.com/gitbucket-plugins/gitbucket-announce-plugin)
+- [gitbucket-h2-backup-plugin](https://github.com/gitbucket-plugins/gitbucket-h2-backup-plugin)
+- [gitbucket-desktopnotify-plugin](https://github.com/yoshiyoshifujii/gitbucket-desktopnotify-plugin)
+- [gitbucket-commitgraphs-plugin](https://github.com/yoshiyoshifujii/gitbucket-commitgraphs-plugin)
+- [gitbucket-asciidoctor-plugin](https://github.com/lefou/gitbucket-asciidoctor-plugin)

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

 Support
 --------

- If you have any questions about GitBucket, send it to the [gitter room](https://gitter.im/gitbucket/gitbucket) before opening an issue.
- Make sure check whether there is the same question or request in the past.
- When raise a new issue, write at least the subject in **English**.
- We can also provide support in Japanese at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
- The first priority of GitBucket is easy installation and API compatibility with GitHub, so we might reject if your request is against it.
+- If you have any question about GitBucket, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raise an issue.
+- Make sure check whether there is a same question or request in the past.
+- When raise a new issue, write subject in **English** at least.
+- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
+- First priority of GitBucket is easy installation and reproduce GitHub behavior, so we might reject if your request is against it.

 Release Notes
-------------
-### 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
--- a/build.sbt
+++ b/build.sbt
@@ -1,8 +1,8 @@
-val Organization = "io.github.gitbucket"
+val Organization = "gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.11.0"
-val ScalatraVersion = "2.5.0"
-val JettyVersion = "9.3.9.v20160517"
+val GitBucketVersion = "3.12.0"
+val ScalatraVersion = "2.4.0"
+val JettyVersion = "9.3.6.v20151106"

 lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)

@@ -10,67 +10,55 @@ sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.12.1"
+scalaVersion := "2.11.7"

 // dependency settings
 resolvers ++= Seq(
  Classpaths.typesafeReleases,
-  Resolver.jcenterRepo,
-  "amateras" at "http://amateras.sourceforge.jp/mvn/",
-  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/",
-  "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
+  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
 )
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.http.server" % "4.6.1.201703071140-r",
-  "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.6.1.201703071140-r",
-  "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"               % "3.5.0",
-  "io.github.gitbucket"             %% "scalatra-forms"               % "1.1.0",
-  "commons-io"                      %  "commons-io"                   % "2.4",
-  "io.github.gitbucket"             %  "solidbase"                    % "1.0.0",
-  "io.github.gitbucket"             %  "markedj"                      % "1.0.10",
-  "org.apache.commons"              %  "commons-compress"             % "1.11",
-  "org.apache.commons"              %  "commons-email"                % "1.4",
-  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.1",
-  "org.apache.sshd"                 %  "apache-sshd"                  % "1.2.0",
-  "org.apache.tika"                 %  "tika-core"                    % "1.13",
-  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.8",
-  "joda-time"                       %  "joda-time"                    % "2.9.6",
-  "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
-  "com.h2database"                  %  "h2"                           % "1.4.192",
-  "mysql"                           %  "mysql-connector-java"         % "5.1.39",
-  "org.postgresql"                  %  "postgresql"                   % "9.4.1208",
-  "ch.qos.logback"                  %  "logback-classic"              % "1.1.7",
-  "com.zaxxer"                      %  "HikariCP"                     % "2.4.6",
-  "com.typesafe"                    %  "config"                       % "1.3.0",
-  "com.typesafe.akka"               %% "akka-actor"                   % "2.4.12",
-  "fr.brouillard.oss.security.xhub" %  "xhub4j-core"                  % "1.0.0",
-  "com.github.bkromhout"            %  "java-diff-utils"              % "2.1.1",
-  "org.cache2k"                     %  "cache2k-all"                  % "1.0.0.CR1",
-  "com.enragedginger"               %% "akka-quartz-scheduler"        % "1.6.0-akka-2.4.x" exclude("c3p0","c3p0"),
-  "net.coobird"                     %  "thumbnailator"                % "0.4.8",
-  "org.eclipse.jetty"               %  "jetty-webapp"                 % JettyVersion     % "provided",
-  "javax.servlet"                   %  "javax.servlet-api"            % "3.1.0"          % "provided",
-  "junit"                           %  "junit"                        % "4.12"           % "test",
-  "org.scalatra"                    %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.mockito"                     %  "mockito-core"                 % "2.7.16"         % "test",
-  "com.wix"                         %  "wix-embedded-mysql"           % "2.1.4"          % "test",
-  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "1.14"           % "test"
+  "org.eclipse.jgit"          % "org.eclipse.jgit.http.server" % "4.1.1.201511131810-r",
+  "org.eclipse.jgit"          % "org.eclipse.jgit.archive"     % "4.1.1.201511131810-r",
+  "org.scalatra"             %% "scalatra"                     % ScalatraVersion,
+  "org.scalatra"             %% "scalatra-json"                % ScalatraVersion,
+  "org.json4s"               %% "json4s-jackson"               % "3.3.0",
+  "io.github.gitbucket"      %% "scalatra-forms"               % "1.0.0",
+  "commons-io"                % "commons-io"                   % "2.4",
+  "io.github.gitbucket"       % "markedj"                      % "1.0.7",
+  "org.apache.commons"        % "commons-compress"             % "1.10",
+  "org.apache.commons"        % "commons-email"                % "1.4",
+  "org.apache.httpcomponents" % "httpclient"                   % "4.5.1",
+  "org.apache.sshd"           % "apache-sshd"                  % "1.0.0",
+  "org.apache.tika"           % "tika-core"                    % "1.11",
+  "com.typesafe.slick"       %% "slick"                        % "2.1.0",
+  "com.novell.ldap"           % "jldap"                        % "2009-10-07",
+  "com.h2database"            % "h2"                           % "1.4.190",
+  "ch.qos.logback"            % "logback-classic"              % "1.1.1",
+  "com.mchange"               % "c3p0"                         % "0.9.5.2",
+  "com.typesafe"              % "config"                       % "1.3.0",
+  "com.typesafe.akka"        %% "akka-actor"                   % "2.3.14",
+  "io.getquill"              %% "quill-jdbc"                   % "0.4.1",
+  "fr.brouillard.oss.security.xhub" % "xhub4j-core"            % "1.0.0",
+  "com.enragedginger"        %% "akka-quartz-scheduler"        % "1.4.0-akka-2.3.x" exclude("c3p0","c3p0"),
+  "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.scalaz"               %% "scalaz-core"                  % "7.2.0"          % "test"
 )

+// Twirl settings
+play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._"
+
 // Compiler settings
 scalacOptions := Seq("-deprecation", "-language:postfixOps")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
-
-// Test settings
-//testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
+testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console")
 javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
 testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
 fork in Test := true
-
-// Packaging options
 packageOptions += Package.MainClass("JettyLauncher")

 // Assembly settings
@@ -85,13 +73,12 @@ assemblyMergeStrategy in assembly := {
 }

 // JRebel
-Seq(jrebelSettings: _*)
-
 jrebel.webLinks += (target in webappPrepare).value
 jrebel.enabled := System.getenv().get("JREBEL") != null
 javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
  Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
 }
+jrebelSettings

 // Create executable war file
 val executableConfig = config("executable").hide
@@ -110,6 +97,7 @@ libraryDependencies ++= Seq(

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

@@ -167,55 +155,9 @@ executableKey := {
  log info s"built executable webapp ${outputFile}"
  outputFile
 }
-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")
+/*
+Keys.artifact in (Compile, executableKey) ~= {
+    _ copy (`type` = "war", extension = "war"))
 }
-publishMavenStyle := true
-pomIncludeRepository := { _ => false }
-pomExtra := (
-  <url>https://github.com/gitbucket/gitbucket</url>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://github.com/gitbucket/gitbucket</url>
-    <connection>scm:git:https://github.com/gitbucket/gitbucket.git</connection>
-  </scm>
-  <developers>
-    <developer>
-      <id>takezoe</id>
-      <name>Naoki Takezoe</name>
-      <url>https://github.com/takezoe</url>
-    </developer>
-    <developer>
-      <id>shimamoto</id>
-      <name>Takako Shimamoto</name>
-      <url>https://github.com/shimamoto</url>
-    </developer>
-    <developer>
-      <id>tanacasino</id>
-      <name>Tomofumi Tanaka</name>
-      <url>https://github.com/tanacasino</url>
-    </developer>
-    <developer>
-      <id>mrkm4ntr</id>
-      <name>Shintaro Murakami</name>
-      <url>https://github.com/mrkm4ntr</url>
-    </developer>
-    <developer>
-      <id>nazoking</id>
-      <name>nazoking</name>
-      <url>https://github.com/nazoking</url>
-    </developer>
-    <developer>
-      <id>McFoggy</id>
-      <name>Matthieu Brouillard</name>
-      <url>https://github.com/McFoggy</url>
-    </developer>
-  </developers>
-)
+addArtifact(Keys.artifact in (Compile, executableKey), executableKey)
+*/
--- a/command.bat
+++ b/command.bat
@@ -0,0 +1,2 @@
+%~d0
+cmd /k cd %~p0
--- a/contrib/linux/redhat/README.md
+++ b/contrib/linux/redhat/README.md
@@ -3,7 +3,6 @@
 RPM spec file and init script for Red Hat Enterprise Linux 6.x. 

 To create RPM:
-
 1. Edit `../../gitbucket.conf` to suit.
 2. Edit `gitbucket.init` to suit.
 3. Edit `gitbucket.spec` to suit.
--- a/doc/auto_update.md
+++ b/doc/auto_update.md
@@ -1,54 +1,37 @@
 Automatic Schema Updating
 ========
-GitBucket updates database schema automatically using [Solidbase](https://github.com/gitbucket/solidbase) in the first run after the upgrading.
+GitBucket uses H2 database to manage project and account data. GitBucket updates database schema automatically in the first run after the upgrading.

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

 ```scala
-object GitBucketCoreModule extends Module("gitbucket-core",
-  new Version("4.0.0",
-    new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
-    new SqlMigration("update/gitbucket-core_4.0.sql")
-  ),
-  new Version("4.1.0"),
-  new Version("4.2.0",
-    new LiquibaseMigration("update/gitbucket-core_4.2.xml")
+object AutoUpdate {
+  ...
+  /**
+   * The history of versions. A head of this sequence is the current GitBucket version.
+   */
+  val versions = Seq(
+      Version(1, 0)
  )
-)
+  ...
 ```

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

-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-    <addColumn tableName="REPOSITORY">
-        <column name="ENABLE_WIKI" type="boolean" nullable="false" defaultValueBoolean="true"/>
-        <column name="ENABLE_ISSUES" type="boolean" nullable="false" defaultValueBoolean="true"/>
-        <column name="EXTERNAL_WIKI_URL" type="varchar(200)" nullable="true"/>
-        <column name="EXTERNAL_ISSUES_URL" type="varchar(200)" nullable="true"/>
-    </addColumn>
-</changeSet>
-```
+GitBucket stores the current version to ```GITBUCKET_HOME/version``` and checks it at start-up. If the stored version differs from the actual version, it executes differences of SQL files between the stored version and the actual version. And ```GITBUCKET_HOME/version``` is updated by the actual version.

-Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version differs from the actual version, it executes differences between the stored version and the actual version.
-
-We can add the SQL file instead of the XML file using `SqlMigration`. It try to load a SQL file from classpath as following order:
-
-1. Specified path (if specified)
-2. `${moduleId}_${version}_${database}.sql`
-3. `${moduleId}_${version}.sql`
-
-Also we can add any code by extending `Migration`:
+We can also add any Scala code for upgrade GitBucket which modifies resources other than database. Override ```Version.update``` like below:

 ```scala
-object GitBucketCoreModule extends Module("gitbucket-core",
-  new Version("4.0.0", new Migration(){
-    override def migrate(moduleId: String, version: String, context: java.util.Map[String, String]): Unit = {
-      ...
+val versions = Seq(
+  new Version(1, 3){
+    override def update(conn: Connection): Unit = {
+      super.update(conn)
+      // Add any code here!
    }
-  })
+  },
+  Version(1, 2),
+  Version(1, 1),
+  Version(1, 0)
 )
 ```
-
-See more details [README of Solidbase](https://github.com/gitbucket/solidbase).
--- a/doc/release.md
+++ b/doc/release.md
@@ -11,24 +11,22 @@ Note to update version number in files below:
 ```scala
 val Organization = "gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.0.0" // <---- update version!!
+val GitBucketVersion = "3.12.0" // <---- update version!!
 val ScalatraVersion = "2.4.0"
 val JettyVersion = "9.3.6.v20151106"
 ```

-### src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+### src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

 ```scala
-object GitBucketCoreModule extends Module("gitbucket-core",
-  new Version("4.0.0",
-    new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
-    new SqlMigration("update/gitbucket-core_4.0.sql")
-  ),
-  // add new version definition
-  new Version("4.1.0",
-    new LiquibaseMigration("update/gitbucket-core_4.1.xml")
-  )
-)
+object AutoUpdate {
+
+  /**
+   * The history of versions. A head of this sequence is the current GitBucket version.
+   */
+  val versions = Seq(
+    new Version(3, 12), // <---- add this line!!
+    new Version(3, 11),
 ```

 Generate release files
@@ -41,15 +39,14 @@ Note: Release operation requires [Ant](http://ant.apache.org/) and [Maven](https
 Run `sbt executable`. The release war file and fingerprint are generated into `target/executable/gitbucket.war`.

 ```bash
-$ sbt executable
+$sbt executable
 ```

 ### Deploy assembly jar file

-For plug-in development, we have to publish the GitBucket jar file to the Maven central repository as well. At first, hit following command to publish artifacts to the sonatype OSS repository:
+For plug-in development, we have to publish the assembly jar file to the public Maven repository by `release/deploy-assembly-jar.sh`.

 ```bash
-$ sbt publish-signed
+$ cd release/
+$ ./deploy-assembly-jar.sh
 ```
-
-Then operate release sequence at https://oss.sonatype.org/.
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.9
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,8 +1,6 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

-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("com.typesafe.sbt" % "sbt-twirl"       % "1.0.4")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly"    % "0.12.0")
+addSbtPlugin("com.earldouglas"  % "xsbt-web-plugin" % "2.1.0")
 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 +0,0 @@
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
--- a/release/deploy-assembly-jar.sh
+++ b/release/deploy-assembly-jar.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+. ./env.sh
+
+cd ../
+./sbt.sh clean assembly
+
+cd release
+
+if [[ "$GITBUCKET_VERSION" =~ -SNAPSHOT$ ]]; then
+  MVN_DEPLOY_PATH=mvn-snapshot
+else
+  MVN_DEPLOY_PATH=mvn
+fi
+
+echo $MVN_DEPLOY_PATH
+
+mvn deploy:deploy-file \
+  -DgroupId=gitbucket\
+  -DartifactId=gitbucket-assembly\
+  -Dversion=$GITBUCKET_VERSION\
+  -Dpackaging=jar\
+  -Dfile=../target/scala-2.11/gitbucket-assembly-$GITBUCKET_VERSION.jar\
+  -DrepositoryId=sourceforge.jp\
+  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/$MVN_DEPLOY_PATH/
--- a/release/env.sh
+++ b/release/env.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export GITBUCKET_VERSION=`cat ../build.sbt | grep 'val GitBucketVersion' | cut -d \" -f 2`
+echo "GITBUCKET_VERSION: $GITBUCKET_VERSION"
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>jp.sf.amateras</groupId>
+    <artifactId>gitbucket-assembly</artifactId>
+    <version>0.0.1</version>
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>1.0-beta-6</version>
+            </extension>
+        </extensions>
+    </build>
+</project>
--- a/sbt-launch-0.13.12.jar
+++ b/sbt-launch-0.13.12.jar
--- a/sbt.bat
+++ b/sbt.bat
@@ -1,2 +1,2 @@
 set SCRIPT_DIR=%~dp0
-java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.12.jar" %*
+java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.9.jar" %*
--- a/sbt.sh
+++ b/sbt.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.12.jar "$@"
+java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.9.jar "$@"
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -3,16 +3,13 @@ import org.eclipse.jetty.webapp.WebAppContext;

 import java.io.File;
 import java.net.URL;
-import java.net.InetSocketAddress;
 import java.security.ProtectionDomain;

 public class JettyLauncher {
    public static void main(String[] args) throws Exception {
        String host = null;
        int port = 8080;
-        InetSocketAddress address = null;
        String contextPath = "/";
-        String tmpDirPath="";
        boolean forceHttps = false;

        for(String arg: args) {
@@ -25,25 +22,14 @@ public class JettyLauncher {
                        port = Integer.parseInt(dim[1]);
                    } else if(dim[0].equals("--prefix")) {
                        contextPath = dim[1];
-                        if(!contextPath.startsWith("/")){
-                            contextPath = "/" + contextPath;
-                        }
                    } else if(dim[0].equals("--gitbucket.home")){
                        System.setProperty("gitbucket.home", dim[1]);
-                    } else if(dim[0].equals("--temp_dir")){
-                        tmpDirPath = dim[1];
                    }
                }
            }
        }

-        if(host != null) {
-            address = new InetSocketAddress(host, port);
-        } else {
-            address = new InetSocketAddress(port);
-        }
-
-        Server server = new Server(address);
+        Server server = new Server(port);

 //        SelectChannelConnector connector = new SelectChannelConnector();
 //        if(host != null) {
@@ -56,22 +42,11 @@ public class JettyLauncher {

        WebAppContext context = new WebAppContext();

-        File tmpDir;
-        if(tmpDirPath.equals("")){
-            tmpDir = new File(getGitBucketHome(), "tmp");
-            if(!tmpDir.exists()){
-                tmpDir.mkdirs();
-            }
-        } else {
-            tmpDir = new File(tmpDirPath);
-            if(!tmpDir.exists()){
-                throw new java.io.FileNotFoundException(
-                    String.format("temp_dir \"%s\" not found", tmpDirPath));
-            } else if(!tmpDir.isDirectory()) {
-                throw new IllegalArgumentException(
-                    String.format("temp_dir \"%s\" is not a directory", tmpDirPath));
-            }
+        File tmpDir = new File(getGitBucketHome(), "tmp");
+        if(tmpDir.exists()){
+            deleteDirectory(tmpDir);
        }
+        tmpDir.mkdirs();
        context.setTempDirectory(tmpDir);

        ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
@@ -86,8 +61,6 @@ public class JettyLauncher {
        }

        server.setHandler(context);
-        server.setStopAtShutdown(true);
-        server.setStopTimeout(7_000);
        server.start();
        server.join();
    }
--- a/src/main/java/org/postgresql/Driver2.java
+++ b/src/main/java/org/postgresql/Driver2.java
@@ -1,52 +0,0 @@
-package org.postgresql;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
-/**
- * Wraps the PostgreSQL JDBC driver to convert the returning column names to lower case.
- */
-public class Driver2 extends Driver {
-
-    @Override
-    public java.sql.Connection connect(String url, Properties info) throws SQLException {
-        Connection conn =  super.connect(url, info);
-
-        Object proxy = Proxy.newProxyInstance(
-                conn.getClass().getClassLoader(),
-                new Class[]{ Connection.class },
-                new ConnectionProxyHandler(conn)
-        );
-
-        return Connection.class.cast(proxy);
-    }
-
-
-    private static class ConnectionProxyHandler implements InvocationHandler {
-
-        private Connection conn;
-
-        public ConnectionProxyHandler(Connection conn){
-            this.conn = conn;
-        }
-
-        @Override
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            if(method.getName().equals("prepareStatement")){
-                if(args != null && args.length == 2 && args[1].getClass().isArray()){
-                    String[] keys = (String[]) args[1];
-                    for(int i = 0; i < keys.length; i++){
-                        keys[i] = keys[i].toLowerCase();
-                    }
-                }
-            }
-            return method.invoke(conn, args);
-        }
-    }
-
-}
-
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -0,0 +1,8 @@
+db.dataSourceClassName="org.h2.jdbcx.JdbcDataSource"
+db.dataSource.url="jdbc:h2:~/.gitbucket/data;MVCC=true"
+db.dataSource.user="sa"
+db.dataSource.password="sa"
+#db.dataSource.cachePrepStmts=true
+#db.dataSource.prepStmtCacheSize=250
+#db.dataSource.prepStmtCacheSqlLimit=2048
+#db.connectionTimeout=30000
--- a/src/main/resources/database.conf
+++ b/src/main/resources/database.conf
@@ -0,0 +1,6 @@
+db {
+  driver = "org.h2.Driver"
+  url = "jdbc:h2:${DatabaseHome};MVCC=true"
+  user = "sa"
+  password = "sa"
+}
--- a/src/main/resources/logback-dev.xml
+++ b/src/main/resources/logback-dev.xml
@@ -20,7 +20,7 @@
  <!--
  <logger name="service.WebHookService" level="DEBUG" />
  <logger name="servlet" level="DEBUG" />
-  <logger name="scala.slick.jdbc.JdbcBackend.statement" level="DEBUG" />
  -->
+  <logger name="scala.slick.jdbc.JdbcBackend.statement" level="DEBUG" />

 </configuration>
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -0,0 +1,5 @@
+c3p0 {
+  privilegeSpawnedThreads=true
+  contextClassLoaderSource=library
+}
+
--- a/src/main/resources/update/1_0.sql
+++ b/src/main/resources/update/1_0.sql
@@ -0,0 +1,135 @@
+CREATE TABLE ACCOUNT(
+		USER_NAME VARCHAR(100) NOT NULL,
+		MAIL_ADDRESS VARCHAR(100) NOT NULL,
+		PASSWORD VARCHAR(40) NOT NULL,
+		ADMINISTRATOR BOOLEAN NOT NULL,
+		URL VARCHAR(200),
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL,
+		LAST_LOGIN_DATE TIMESTAMP
+);
+
+CREATE TABLE REPOSITORY(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		PRIVATE BOOLEAN NOT NULL,
+		DESCRIPTION TEXT,
+		DEFAULT_BRANCH VARCHAR(100),
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL,
+		LAST_ACTIVITY_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE COLLABORATOR(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		COLLABORATOR_NAME VARCHAR(100) NOT NULL
+);
+
+CREATE TABLE ISSUE(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		OPENED_USER_NAME VARCHAR(100) NOT NULL,
+		MILESTONE_ID INT,
+		ASSIGNED_USER_NAME VARCHAR(100),
+		TITLE TEXT NOT NULL,
+		CONTENT TEXT,
+		CLOSED BOOLEAN NOT NULL,
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE ISSUE_ID(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL
+);
+
+CREATE TABLE ISSUE_COMMENT(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		COMMENT_ID INT AUTO_INCREMENT,
+		ACTION VARCHAR(10),
+		COMMENTED_USER_NAME VARCHAR(100) NOT NULL,
+		CONTENT TEXT NOT NULL,
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE LABEL(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		LABEL_ID INT AUTO_INCREMENT,
+		LABEL_NAME VARCHAR(100) NOT NULL,
+		COLOR CHAR(6) NOT NULL
+);
+
+CREATE TABLE ISSUE_LABEL(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		LABEL_ID INT NOT NULL
+);
+
+CREATE TABLE MILESTONE(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		MILESTONE_ID INT AUTO_INCREMENT,
+		TITLE VARCHAR(100) NOT NULL,
+		DESCRIPTION TEXT,
+		DUE_DATE TIMESTAMP,
+		CLOSED_DATE TIMESTAMP
+);
+
+ALTER TABLE ACCOUNT ADD CONSTRAINT IDX_ACCOUNT_PK PRIMARY KEY (USER_NAME);
+ALTER TABLE ACCOUNT ADD CONSTRAINT IDX_ACCOUNT_1 UNIQUE (MAIL_ADDRESS);
+
+ALTER TABLE REPOSITORY ADD CONSTRAINT IDX_REPOSITORY_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE REPOSITORY ADD CONSTRAINT IDX_REPOSITORY_FK0 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME);
+
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK1 FOREIGN KEY (COLLABORATOR_NAME) REFERENCES ACCOUNT (USER_NAME);
+
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_PK PRIMARY KEY (ISSUE_ID, USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK1 FOREIGN KEY (OPENED_USER_NAME) REFERENCES ACCOUNT (USER_NAME);
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK2 FOREIGN KEY (MILESTONE_ID) REFERENCES MILESTONE (MILESTONE_ID);
+
+ALTER TABLE ISSUE_ID ADD CONSTRAINT IDX_ISSUE_ID_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ISSUE_ID ADD CONSTRAINT IDX_ISSUE_ID_FK1 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+
+ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_PK PRIMARY KEY (COMMENT_ID);
+ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_1 UNIQUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID, COMMENT_ID);
+ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+
+ALTER TABLE LABEL ADD CONSTRAINT IDX_LABEL_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, LABEL_ID);
+ALTER TABLE LABEL ADD CONSTRAINT IDX_LABEL_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+
+ALTER TABLE ISSUE_LABEL ADD CONSTRAINT IDX_ISSUE_LABEL_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID, LABEL_ID);
+ALTER TABLE ISSUE_LABEL ADD CONSTRAINT IDX_ISSUE_LABEL_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+
+ALTER TABLE MILESTONE ADD CONSTRAINT IDX_MILESTONE_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, MILESTONE_ID);
+ALTER TABLE MILESTONE ADD CONSTRAINT IDX_MILESTONE_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+
+INSERT INTO ACCOUNT (
+  USER_NAME,
+  MAIL_ADDRESS,
+  PASSWORD,
+  ADMINISTRATOR,
+  URL,
+  REGISTERED_DATE,
+  UPDATED_DATE,
+  LAST_LOGIN_DATE
+) VALUES (
+  'root',
+  'root@localhost',
+  'dc76e9f0c0006e8f919e0c515c66dbba3982f785',
+  true,
+  'https://github.com/gitbucket/gitbucket',
+  SYSDATE,
+  SYSDATE,
+  NULL
+);
--- a/src/main/resources/update/1_1.sql
+++ b/src/main/resources/update/1_1.sql
@@ -0,0 +1,8 @@
+-- Fix COLLABORATOR constraints
+ALTER TABLE COLLABORATOR DROP CONSTRAINT IDX_COLLABORATOR_FK1 IF EXISTS;
+ALTER TABLE COLLABORATOR DROP CONSTRAINT IDX_COLLABORATOR_FK0 IF EXISTS;
+ALTER TABLE COLLABORATOR DROP CONSTRAINT IDX_COLLABORATOR_PK IF EXISTS;
+
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, COLLABORATOR_NAME);
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK1 FOREIGN KEY (COLLABORATOR_NAME) REFERENCES ACCOUNT (USER_NAME);
--- a/src/main/resources/update/1_12.sql
+++ b/src/main/resources/update/1_12.sql
@@ -0,0 +1,11 @@
+ALTER TABLE GROUP_MEMBER ADD COLUMN MANAGER BOOLEAN DEFAULT FALSE;
+
+CREATE TABLE SSH_KEY (
+  USER_NAME VARCHAR(100) NOT NULL,
+  SSH_KEY_ID INT AUTO_INCREMENT,
+  TITLE VARCHAR(100) NOT NULL,
+  PUBLIC_KEY TEXT NOT NULL
+);
+
+ALTER TABLE SSH_KEY ADD CONSTRAINT IDX_SSH_KEY_PK PRIMARY KEY (USER_NAME, SSH_KEY_ID);
+ALTER TABLE SSH_KEY ADD CONSTRAINT IDX_SSH_KEY_FK0 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME);
--- a/src/main/resources/update/1_13.sql
+++ b/src/main/resources/update/1_13.sql
@@ -0,0 +1 @@
+DROP TABLE COMMIT_LOG;
--- a/src/main/resources/update/1_2.sql
+++ b/src/main/resources/update/1_2.sql
@@ -0,0 +1,24 @@
+CREATE TABLE ACTIVITY(
+		ACTIVITY_ID INT AUTO_INCREMENT,
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ACTIVITY_USER_NAME VARCHAR(100) NOT NULL,
+		ACTIVITY_TYPE VARCHAR(100) NOT NULL,
+		MESSAGE TEXT NOT NULL,
+		ADDITIONAL_INFO TEXT,
+		ACTIVITY_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE COMMIT_LOG (
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		COMMIT_ID VARCHAR(40) NOT NULL
+);
+
+ALTER TABLE ACTIVITY ADD CONSTRAINT IDX_ACTIVITY_PK PRIMARY KEY (ACTIVITY_ID);
+ALTER TABLE ACTIVITY ADD CONSTRAINT IDX_ACTIVITY_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ACTIVITY ADD CONSTRAINT IDX_ACTIVITY_FK1 FOREIGN KEY (ACTIVITY_USER_NAME) REFERENCES ACCOUNT (USER_NAME);
+
+ALTER TABLE COMMIT_LOG ADD CONSTRAINT IDX_COMMIT_LOG_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, COMMIT_ID);
+ALTER TABLE COMMIT_LOG ADD CONSTRAINT IDX_COMMIT_LOG_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+
--- a/src/main/resources/update/1_3.sql
+++ b/src/main/resources/update/1_3.sql
@@ -0,0 +1,8 @@
+ALTER TABLE ACCOUNT ADD COLUMN IMAGE VARCHAR(100);
+
+UPDATE ISSUE_COMMENT SET ACTION = 'comment' WHERE ACTION IS NULL;
+
+ALTER TABLE ISSUE_COMMENT ALTER COLUMN ACTION VARCHAR(20) NOT NULL;
+
+UPDATE ISSUE_COMMENT SET ACTION = 'close_comment'  WHERE ACTION = 'close';
+UPDATE ISSUE_COMMENT SET ACTION = 'reopen_comment' WHERE ACTION = 'reopen';
--- a/src/main/resources/update/1_4.sql
+++ b/src/main/resources/update/1_4.sql
@@ -0,0 +1,24 @@
+CREATE TABLE GROUP_MEMBER(
+  GROUP_NAME VARCHAR(100) NOT NULL,
+  USER_NAME  VARCHAR(100) NOT NULL
+);
+
+ALTER TABLE GROUP_MEMBER ADD CONSTRAINT IDX_GROUP_MEMBER_PK PRIMARY KEY (GROUP_NAME, USER_NAME);
+ALTER TABLE GROUP_MEMBER ADD CONSTRAINT IDX_GROUP_MEMBER_FK0 FOREIGN KEY (GROUP_NAME) REFERENCES ACCOUNT (USER_NAME);
+ALTER TABLE GROUP_MEMBER ADD CONSTRAINT IDX_GROUP_MEMBER_FK1 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME);
+
+ALTER TABLE ACCOUNT ADD COLUMN GROUP_ACCOUNT BOOLEAN NOT NULL DEFAULT FALSE;
+
+CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+ SELECT
+   A.USER_NAME,
+   A.REPOSITORY_NAME,
+   A.ISSUE_ID,
+   NVL(B.COMMENT_COUNT, 0) AS COMMENT_COUNT
+ FROM ISSUE A
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+   WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) B
+ ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID);
--- a/src/main/resources/update/1_5.sql
+++ b/src/main/resources/update/1_5.sql
@@ -0,0 +1,21 @@
+ALTER TABLE REPOSITORY ADD COLUMN ORIGIN_USER_NAME VARCHAR(100);
+ALTER TABLE REPOSITORY ADD COLUMN ORIGIN_REPOSITORY_NAME VARCHAR(100);
+ALTER TABLE REPOSITORY ADD COLUMN PARENT_USER_NAME VARCHAR(100);
+ALTER TABLE REPOSITORY ADD COLUMN PARENT_REPOSITORY_NAME VARCHAR(100);
+
+CREATE TABLE PULL_REQUEST(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		BRANCH VARCHAR(100) NOT NULL,
+		REQUEST_USER_NAME VARCHAR(100) NOT NULL,
+		REQUEST_REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		REQUEST_BRANCH VARCHAR(100) NOT NULL,
+		COMMIT_ID_FROM VARCHAR(40) NOT NULL,
+		COMMIT_ID_TO VARCHAR(40) NOT NULL
+);
+
+ALTER TABLE PULL_REQUEST ADD CONSTRAINT IDX_PULL_REQUEST_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+ALTER TABLE PULL_REQUEST ADD CONSTRAINT IDX_PULL_REQUEST_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+
+ALTER TABLE ISSUE ADD COLUMN PULL_REQUEST BOOLEAN NOT NULL DEFAULT FALSE;
--- a/src/main/resources/update/1_6.sql
+++ b/src/main/resources/update/1_6.sql
@@ -0,0 +1,8 @@
+CREATE TABLE WEB_HOOK (
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		URL VARCHAR(200) NOT NULL
+);
+
+ALTER TABLE WEB_HOOK ADD CONSTRAINT IDX_WEB_HOOK_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, URL);
+ALTER TABLE WEB_HOOK ADD CONSTRAINT IDX_WEB_HOOK_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
--- a/src/main/resources/update/1_7.sql
+++ b/src/main/resources/update/1_7.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACCOUNT ADD COLUMN FULL_NAME VARCHAR(100);
+
+UPDATE ACCOUNT SET FULL_NAME = USER_NAME WHERE FULL_NAME IS NULL;
+
+ALTER TABLE ACCOUNT ALTER COLUMN FULL_NAME SET NOT NULL;
--- a/src/main/resources/update/1_8.sql
+++ b/src/main/resources/update/1_8.sql
@@ -0,0 +1 @@
+ALTER TABLE ACCOUNT ADD COLUMN REMOVED BOOLEAN DEFAULT FALSE;
--- a/src/main/resources/update/2_3.sql
+++ b/src/main/resources/update/2_3.sql
@@ -0,0 +1,6 @@
+CREATE TABLE PLUGIN (
+  PLUGIN_ID VARCHAR(100) NOT NULL,
+  VERSION   VARCHAR(100) NOT NULL
+);
+
+ALTER TABLE PLUGIN ADD CONSTRAINT IDX_PLUGIN_PK PRIMARY KEY (PLUGIN_ID);
--- a/src/main/resources/update/2_7.sql
+++ b/src/main/resources/update/2_7.sql
@@ -0,0 +1,18 @@
+CREATE TABLE COMMIT_COMMENT (
+    USER_NAME VARCHAR(100) NOT NULL,
+    REPOSITORY_NAME VARCHAR(100) NOT NULL,
+    COMMIT_ID VARCHAR(100) NOT NULL,
+    COMMENT_ID INT AUTO_INCREMENT,
+    COMMENTED_USER_NAME VARCHAR(100) NOT NULL,
+    CONTENT TEXT NOT NULL,
+    FILE_NAME NVARCHAR(100),
+    OLD_LINE_NUMBER INT,
+    NEW_LINE_NUMBER INT,
+    REGISTERED_DATE TIMESTAMP NOT NULL,
+    UPDATED_DATE TIMESTAMP NOT NULL,
+    PULL_REQUEST BOOLEAN NOT NULL
+);
+
+ALTER TABLE COMMIT_COMMENT ADD CONSTRAINT IDX_COMMIT_COMMENT_PK PRIMARY KEY (COMMENT_ID);
+ALTER TABLE COMMIT_COMMENT ADD CONSTRAINT IDX_COMMIT_COMMENT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE COMMIT_COMMENT ADD CONSTRAINT IDX_COMMIT_COMMENT_1 UNIQUE (USER_NAME, REPOSITORY_NAME, COMMIT_ID, COMMENT_ID);
--- a/src/main/resources/update/2_8.sql
+++ b/src/main/resources/update/2_8.sql
@@ -0,0 +1 @@
+ALTER TABLE COMMIT_COMMENT ALTER COLUMN FILE_NAME NVARCHAR(260);
--- a/src/main/resources/update/3_1.sql
+++ b/src/main/resources/update/3_1.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS ACCESS_TOKEN;
+
+CREATE TABLE ACCESS_TOKEN (
+   ACCESS_TOKEN_ID INT NOT NULL AUTO_INCREMENT,
+   TOKEN_HASH VARCHAR(40) NOT NULL,
+   USER_NAME VARCHAR(100) NOT NULL,
+   NOTE TEXT NOT NULL
+);
+
+ALTER TABLE ACCESS_TOKEN ADD CONSTRAINT IDX_ACCESS_TOKEN_PK PRIMARY KEY (ACCESS_TOKEN_ID);
+ALTER TABLE ACCESS_TOKEN ADD CONSTRAINT IDX_ACCESS_TOKEN_FK0 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME)
+  ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE ACCESS_TOKEN ADD CONSTRAINT IDX_ACCESS_TOKEN_TOKEN_HASH UNIQUE(TOKEN_HASH);
+
+
+DROP TABLE IF EXISTS COMMIT_STATUS;
+CREATE TABLE COMMIT_STATUS(
+  COMMIT_STATUS_ID INT AUTO_INCREMENT,
+  USER_NAME VARCHAR(100) NOT NULL,
+  REPOSITORY_NAME VARCHAR(100) NOT NULL,
+  COMMIT_ID VARCHAR(40) NOT NULL,
+  CONTEXT VARCHAR(255) NOT NULL, -- context is too long (maximum is 255 characters)
+  STATE VARCHAR(10) NOT NULL, -- pending, success, error, or failure
+  TARGET_URL VARCHAR(200),
+  DESCRIPTION TEXT,
+  CREATOR VARCHAR(100) NOT NULL,
+  REGISTERED_DATE TIMESTAMP NOT NULL, -- CREATED_AT
+  UPDATED_DATE TIMESTAMP NOT NULL -- UPDATED_AT
+);
+ALTER TABLE COMMIT_STATUS ADD CONSTRAINT IDX_COMMIT_STATUS_PK PRIMARY KEY (COMMIT_STATUS_ID);
+ALTER TABLE COMMIT_STATUS ADD CONSTRAINT IDX_COMMIT_STATUS_1
+  UNIQUE (USER_NAME, REPOSITORY_NAME, COMMIT_ID, CONTEXT);
+ALTER TABLE COMMIT_STATUS ADD CONSTRAINT IDX_COMMIT_STATUS_FK1
+  FOREIGN KEY (USER_NAME, REPOSITORY_NAME)
+  REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME)
+  ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE COMMIT_STATUS ADD CONSTRAINT IDX_COMMIT_STATUS_FK2
+  FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME)
+  ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE COMMIT_STATUS ADD CONSTRAINT IDX_COMMIT_STATUS_FK3
+  FOREIGN KEY (CREATOR) REFERENCES ACCOUNT (USER_NAME)
+  ON DELETE CASCADE ON UPDATE CASCADE;
--- a/src/main/resources/update/3_11.sql
+++ b/src/main/resources/update/3_11.sql
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS PROTECTED_BRANCH;
+
+CREATE TABLE PROTECTED_BRANCH(
+    USER_NAME VARCHAR(100) NOT NULL,
+    REPOSITORY_NAME VARCHAR(100) NOT NULL,
+    BRANCH VARCHAR(100) NOT NULL,
+    STATUS_CHECK_ADMIN BOOLEAN NOT NULL DEFAULT false
+);
+
+ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH);
+ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME)
+  ON DELETE CASCADE ON UPDATE CASCADE;
+
+
+DROP TABLE IF EXISTS PROTECTED_BRANCH_REQUIRE_CONTEXT;
+CREATE TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT(
+    USER_NAME VARCHAR(100) NOT NULL,
+    REPOSITORY_NAME VARCHAR(100) NOT NULL,
+    BRANCH VARCHAR(100) NOT NULL,
+    CONTEXT VARCHAR(255) NOT NULL
+);
+
+ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT);
+ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, BRANCH) REFERENCES PROTECTED_BRANCH (USER_NAME, REPOSITORY_NAME, BRANCH)
+  ON DELETE CASCADE ON UPDATE CASCADE;
--- a/src/main/resources/update/3_13.sql
+++ b/src/main/resources/update/3_13.sql
@@ -0,0 +1 @@
+ALTER TABLE WEB_HOOK ADD COLUMN TOKEN VARCHAR(100);
--- a/src/main/resources/update/3_9.sql
+++ b/src/main/resources/update/3_9.sql
@@ -0,0 +1,55 @@
+DROP TABLE IF EXISTS WEB_HOOK_EVENT;
+
+CREATE TABLE WEB_HOOK_EVENT(
+    USER_NAME VARCHAR(100) NOT NULL,
+    REPOSITORY_NAME VARCHAR(100) NOT NULL,
+    URL VARCHAR(200) NOT NULL,
+    EVENT VARCHAR(30) NOT NULL
+);
+
+ALTER TABLE WEB_HOOK_EVENT ADD CONSTRAINT IDX_WEB_HOOK_EVENT_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, URL, EVENT);
+ALTER TABLE WEB_HOOK_EVENT ADD CONSTRAINT IDX_WEB_HOOK_EVENT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, URL) REFERENCES WEB_HOOK (USER_NAME, REPOSITORY_NAME, URL)
+  ON DELETE CASCADE ON UPDATE CASCADE;
+
+CREATE TEMPORARY TABLE TMP_EVENTS (EVENT VARCHAR(30));
+
+INSERT INTO TMP_EVENTS VALUES ('push'),('issue_comment'),('issues'),('pull_request');
+
+INSERT INTO WEB_HOOK_EVENT (USER_NAME, REPOSITORY_NAME, URL, EVENT)
+  SELECT USER_NAME, REPOSITORY_NAME, URL, EVENT
+    FROM WEB_HOOK, TMP_EVENTS;
+
+DROP TABLE TMP_EVENTS;
+
+ALTER TABLE COMMIT_COMMENT ADD COLUMN ISSUE_ID INT;
+
+CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+ SELECT
+   A.USER_NAME,
+   A.REPOSITORY_NAME,
+   A.ISSUE_ID,
+   NVL(B.COMMENT_COUNT, 0) + NVL(C.COMMENT_COUNT, 0) AS COMMENT_COUNT
+ FROM ISSUE A
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+   WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) B
+ ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) C
+ ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID);
+
+
+UPDATE COMMIT_COMMENT C SET (ISSUE_ID) = (
+  SELECT MAX(P.ISSUE_ID)
+  FROM PULL_REQUEST P
+  WHERE
+    C.USER_NAME       = P.USER_NAME AND
+    C.REPOSITORY_NAME = P.REPOSITORY_NAME AND
+    C.COMMIT_ID       = P.COMMIT_ID_TO
+);
+
+ALTER TABLE COMMIT_COMMENT DROP COLUMN PULL_REQUEST;
--- a/src/main/resources/update/gitbucket-core_4.0.sql
+++ b/src/main/resources/update/gitbucket-core_4.0.sql
@@ -1,18 +0,0 @@
-CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
- SELECT
-   A.USER_NAME,
-   A.REPOSITORY_NAME,
-   A.ISSUE_ID,
-   COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT
- FROM ISSUE A
- LEFT OUTER JOIN (
-   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
-   WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
-   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
- ) B
- ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
- LEFT OUTER JOIN (
-   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
-   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
- ) C
- ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID);
--- a/src/main/resources/update/gitbucket-core_4.0.xml
+++ b/src/main/resources/update/gitbucket-core_4.0.xml
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-
-  <!--================================================================================================-->
-  <!-- ACCOUNT -->
-  <!--================================================================================================-->
-  <createTable tableName="ACCOUNT">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="MAIL_ADDRESS" type="varchar(100)" nullable="false"/>
-    <column name="PASSWORD" type="varchar(40)" nullable="false"/>
-    <column name="ADMINISTRATOR" type="boolean" nullable="false"/>
-    <column name="URL" type="varchar(200)" nullable="true"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-    <column name="LAST_LOGIN_DATE" type="datetime" nullable="true"/>
-    <column name="IMAGE" type="varchar(100)" nullable="true"/>
-    <column name="GROUP_ACCOUNT" type="boolean" nullable="false"/>
-    <column name="FULL_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REMOVED" type="boolean" nullable="true"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ACCOUNT_PK" tableName="ACCOUNT" columnNames="USER_NAME"/>
-  <addUniqueConstraint constraintName="IDX_ACCOUNT_1" tableName="ACCOUNT" columnNames="MAIL_ADDRESS"/>
-
-  <insert tableName="ACCOUNT">
-    <column name="USER_NAME" value="root"/>
-    <column name="FULL_NAME" value="root"/>
-    <column name="MAIL_ADDRESS" value="root@localhost"/>
-    <column name="PASSWORD" value="dc76e9f0c0006e8f919e0c515c66dbba3982f785"/>
-    <column name="ADMINISTRATOR" valueBoolean="true"/>
-    <column name="URL" value="https://github.com/gitbucket/gitbucket"/>
-    <column name="GROUP_ACCOUNT" valueBoolean="false"/>
-    <column name="REMOVED" valueBoolean="false"/>
-    <column name="REGISTERED_DATE" valueDate="${currentDateTime}"/>
-    <column name="UPDATED_DATE" valueDate="${currentDateTime}"/>
-  </insert>
-
-  <!--================================================================================================-->
-  <!-- REPOSITORY -->
-  <!--================================================================================================-->
-  <createTable tableName="REPOSITORY">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="PRIVATE" type="boolean" nullable="false"/>
-    <column name="DESCRIPTION" type="text" nullable="true"/>
-    <column name="DEFAULT_BRANCH" type="varchar(100)" nullable="true"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-    <column name="LAST_ACTIVITY_DATE" type="datetime" nullable="false"/>
-    <column name="ORIGIN_USER_NAME" type="varchar(100)" nullable="true"/>
-    <column name="ORIGIN_REPOSITORY_NAME" type="varchar(100)" nullable="true"/>
-    <column name="PARENT_USER_NAME" type="varchar(100)" nullable="true"/>
-    <column name="PARENT_REPOSITORY_NAME" type="varchar(100)" nullable="true"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_REPOSITORY_PK" tableName="REPOSITORY" columnNames="USER_NAME, REPOSITORY_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_REPOSITORY_FK0" baseTableName="REPOSITORY" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- ACCESS_TOKEN -->
-  <!--================================================================================================-->
-  <createTable tableName="ACCESS_TOKEN">
-    <column name="ACCESS_TOKEN_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="TOKEN_HASH" type="varchar(40)" nullable="false"/>
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="NOTE" type="text" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ACCESS_TOKEN_PK" tableName="ACCESS_TOKEN" columnNames="ACCESS_TOKEN_ID"/>
-  <addUniqueConstraint constraintName="IDX_ACCESS_TOKEN_TOKEN_HASH" tableName="ACCESS_TOKEN" columnNames="TOKEN_HASH"/>
-  <addForeignKeyConstraint constraintName="IDX_ACCESS_TOKEN_FK0" baseTableName="ACCESS_TOKEN" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
-
-  <!--================================================================================================-->
-  <!-- ACTIVITY -->
-  <!--================================================================================================-->
-  <createTable tableName="ACTIVITY">
-    <column name="ACTIVITY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ACTIVITY_USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ACTIVITY_TYPE" type="varchar(100)" nullable="false"/>
-    <column name="MESSAGE" type="text" nullable="false"/>
-    <column name="ADDITIONAL_INFO" type="text" nullable="true"/>
-    <column name="ACTIVITY_DATE" type="datetime" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ACTIVITY_PK" tableName="ACTIVITY" columnNames="ACTIVITY_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_ACTIVITY_FK1" baseTableName="ACTIVITY" baseColumnNames="ACTIVITY_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_ACTIVITY_FK0" baseTableName="ACTIVITY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- COLLABORATOR -->
-  <!--================================================================================================-->
-  <createTable tableName="COLLABORATOR">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="COLLABORATOR_NAME" type="varchar(100)" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_COLLABORATOR_PK" tableName="COLLABORATOR" columnNames="USER_NAME, REPOSITORY_NAME, COLLABORATOR_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_COLLABORATOR_FK1" baseTableName="COLLABORATOR" baseColumnNames="COLLABORATOR_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_COLLABORATOR_FK0" baseTableName="COLLABORATOR" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- COMMIT_COMMENT -->
-  <!--================================================================================================-->
-  <createTable tableName="COMMIT_COMMENT">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="COMMIT_ID" type="varchar(100)" nullable="false"/>
-    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="COMMENTED_USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="CONTENT" type="text" nullable="false"/>
-    <column name="FILE_NAME" type="varchar(260)" nullable="true"/>
-    <column name="OLD_LINE_NUMBER" type="int" nullable="true"/>
-    <column name="NEW_LINE_NUMBER" type="int" nullable="true"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="true"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_COMMIT_COMMENT_PK" tableName="COMMIT_COMMENT" columnNames="COMMENT_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_COMMIT_COMMENT_FK0" baseTableName="COMMIT_COMMENT" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- COMMIT_STATUS -->
-  <!--================================================================================================-->
-  <createTable tableName="COMMIT_STATUS">
-    <column name="COMMIT_STATUS_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="COMMIT_ID" type="varchar(40)" nullable="false"/>
-    <column name="CONTEXT" type="varchar(255)" nullable="false"/>
-    <column name="STATE" type="varchar(10)" nullable="false"/>
-    <column name="TARGET_URL" type="varchar(200)" nullable="true"/>
-    <column name="DESCRIPTION" type="text" nullable="true"/>
-    <column name="CREATOR" 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_COMMIT_STATUS_PK" tableName="COMMIT_STATUS" columnNames="COMMIT_STATUS_ID"/>
-  <addUniqueConstraint constraintName="IDX_COMMIT_STATUS_1" tableName="COMMIT_STATUS" columnNames="USER_NAME, REPOSITORY_NAME, COMMIT_ID, CONTEXT"/>
-  <addForeignKeyConstraint constraintName="IDX_COMMIT_STATUS_FK3" baseTableName="COMMIT_STATUS" baseColumnNames="CREATOR" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
-  <addForeignKeyConstraint constraintName="IDX_COMMIT_STATUS_FK2" baseTableName="COMMIT_STATUS" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
-  <addForeignKeyConstraint constraintName="IDX_COMMIT_STATUS_FK1" baseTableName="COMMIT_STATUS" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
-
-  <!--================================================================================================-->
-  <!-- GROUP_MEMBER -->
-  <!--================================================================================================-->
-  <createTable tableName="GROUP_MEMBER">
-    <column name="GROUP_NAME" type="varchar(100)" nullable="false"/>
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="MANAGER" type="boolean" nullable="true"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_GROUP_MEMBER_PK" tableName="GROUP_MEMBER" columnNames="GROUP_NAME, USER_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_GROUP_MEMBER_FK1" baseTableName="GROUP_MEMBER" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_GROUP_MEMBER_FK0" baseTableName="GROUP_MEMBER" baseColumnNames="GROUP_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- LABEL -->
-  <!--================================================================================================-->
-  <createTable tableName="LABEL">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="LABEL_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="LABEL_NAME" type="varchar(100)" nullable="false"/>
-    <column name="COLOR" type="char(6)" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_LABEL_PK" tableName="LABEL" columnNames="USER_NAME, REPOSITORY_NAME, LABEL_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_LABEL_FK0" baseTableName="LABEL" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- MILESTONE -->
-  <!--================================================================================================-->
-  <createTable tableName="MILESTONE">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="MILESTONE_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="TITLE" type="varchar(100)" nullable="false"/>
-    <column name="DESCRIPTION" type="text" nullable="true"/>
-    <column name="DUE_DATE" type="datetime" nullable="true"/>
-    <column name="CLOSED_DATE" type="datetime" nullable="true"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_MILESTONE_PK" tableName="MILESTONE" columnNames="USER_NAME, REPOSITORY_NAME, MILESTONE_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_MILESTONE_FK0" baseTableName="MILESTONE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- ISSUE -->
-  <!--================================================================================================-->
-  <createTable tableName="ISSUE">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="OPENED_USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="MILESTONE_ID" type="int" nullable="true"/>
-    <column name="ASSIGNED_USER_NAME" type="varchar(100)" nullable="true"/>
-    <column name="TITLE" type="text" nullable="false"/>
-    <column name="CONTENT" type="text" nullable="true"/>
-    <column name="CLOSED" type="boolean" nullable="false"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-    <column name="PULL_REQUEST" type="boolean" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="ISSUE_ID, USER_NAME, REPOSITORY_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_FK0" baseTableName="ISSUE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_FK2" baseTableName="ISSUE" baseColumnNames="MILESTONE_ID" referencedTableName="MILESTONE" referencedColumnNames="MILESTONE_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_FK1" baseTableName="ISSUE" baseColumnNames="OPENED_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- ISSUE_COMMENT -->
-  <!--================================================================================================-->
-  <createTable tableName="ISSUE_COMMENT">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="ACTION" type="varchar(20)" nullable="false"/>
-    <column name="COMMENTED_USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="CONTENT" type="text" nullable="false"/>
-    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
-    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ISSUE_COMMENT_PK" tableName="ISSUE_COMMENT" columnNames="COMMENT_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_COMMENT_FK0" baseTableName="ISSUE_COMMENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
-
-  <!--================================================================================================-->
-  <!-- ISSUE_ID -->
-  <!--================================================================================================-->
-  <createTable tableName="ISSUE_ID">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ISSUE_ID_PK" tableName="ISSUE_ID" columnNames="USER_NAME, REPOSITORY_NAME"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_ID_FK1" baseTableName="ISSUE_ID" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- ISSUE_ID -->
-  <!--================================================================================================-->
-  <createTable tableName="ISSUE_LABEL">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="LABEL_ID" type="int" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ISSUE_LABEL_PK" tableName="ISSUE_LABEL" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID, LABEL_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_ISSUE_LABEL_FK0" baseTableName="ISSUE_LABEL" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
-
-  <!--================================================================================================-->
-  <!-- PLUGIN -->
-  <!--================================================================================================-->
-  <createTable tableName="PLUGIN">
-    <column name="PLUGIN_ID" type="varchar(100)" nullable="false"/>
-    <column name="VERSION" type="varchar(100)" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_PLUGIN_PK" tableName="PLUGIN" columnNames="PLUGIN_ID"/>
-
-  <!--================================================================================================-->
-  <!-- PULL_REQUEST -->
-  <!--================================================================================================-->
-  <createTable tableName="PULL_REQUEST">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="BRANCH" type="varchar(100)" nullable="false"/>
-    <column name="REQUEST_USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REQUEST_REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REQUEST_BRANCH" type="varchar(100)" nullable="false"/>
-    <column name="COMMIT_ID_FROM" type="varchar(40)" nullable="false"/>
-    <column name="COMMIT_ID_TO" type="varchar(40)" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_PULL_REQUEST_PK" tableName="PULL_REQUEST" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_PULL_REQUEST_FK0" baseTableName="PULL_REQUEST" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
-
-  <!--================================================================================================-->
-  <!-- SSH_KEY -->
-  <!--================================================================================================-->
-  <createTable tableName="SSH_KEY">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="SSH_KEY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="TITLE" type="varchar(100)" nullable="false"/>
-    <column name="PUBLIC_KEY" type="text" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_SSH_KEY_PK" tableName="SSH_KEY" columnNames="USER_NAME, SSH_KEY_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_SSH_KEY_FK0" baseTableName="SSH_KEY" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- WEB_HOOK -->
-  <!--================================================================================================-->
-  <createTable tableName="WEB_HOOK">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="URL" type="varchar(200)" nullable="false"/>
-    <column name="TOKEN" type="varchar(100)" nullable="true"/>
-    <column name="CTYPE" type="varchar(10)" nullable="true"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_WEB_HOOK_PK" tableName="WEB_HOOK" columnNames="USER_NAME, REPOSITORY_NAME, URL"/>
-  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <!--================================================================================================-->
-  <!-- WEB_HOOK_EVENT -->
-  <!--================================================================================================-->
-  <createTable tableName="WEB_HOOK_EVENT">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="URL" type="varchar(200)" nullable="false"/>
-    <column name="EVENT" type="varchar(30)" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_WEB_HOOK_EVENT_PK" tableName="WEB_HOOK_EVENT" columnNames="USER_NAME, REPOSITORY_NAME, URL, EVENT"/>
-  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, URL" referencedTableName="WEB_HOOK" referencedColumnNames="USER_NAME, REPOSITORY_NAME, URL" onDelete="CASCADE" onUpdate="CASCADE"/>
-
-  <!--================================================================================================-->
-  <!-- PROTECTED_BRANCH -->
-  <!--================================================================================================-->
-  <createTable tableName="PROTECTED_BRANCH">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="BRANCH" type="varchar(100)" nullable="false"/>
-    <column name="STATUS_CHECK_ADMIN" type="boolean" nullable="false" defaultValueBoolean="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_PK" tableName="PROTECTED_BRANCH" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH"/>
-  <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_FK0" baseTableName="PROTECTED_BRANCH" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
-
-  <!--================================================================================================-->
-  <!-- PROTECTED_BRANCH_REQUIRE_CONTEXT -->
-  <!--================================================================================================-->
-  <createTable tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="BRANCH" type="varchar(100)" nullable="false"/>
-    <column name="CONTEXT" type="varchar(255)" nullable="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK" tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT"/>
-  <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0" baseTableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" baseColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" referencedTableName="PROTECTED_BRANCH" referencedColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" onDelete="CASCADE" onUpdate="CASCADE"/>
-
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.11.xml
+++ b/src/main/resources/update/gitbucket-core_4.11.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <createTable tableName="DEPLOY_KEY">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
-    <column name="DEPLOY_KEY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
-    <column name="TITLE" type="varchar(100)" nullable="false"/>
-    <column name="PUBLIC_KEY" type="text" nullable="false"/>
-    <column name="ALLOW_WRITE" type="boolean" nullable="false" defaultValueBoolean="false"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_DEPLOY_KEY_PK" tableName="DEPLOY_KEY" columnNames="USER_NAME, REPOSITORY_NAME, DEPLOY_KEY_ID"/>
-  <addForeignKeyConstraint constraintName="IDX_DEPLOY_KEY_FK0" baseTableName="DEPLOY_KEY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.2.xml
+++ b/src/main/resources/update/gitbucket-core_4.2.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-    <addColumn tableName="REPOSITORY">
-        <column name="ENABLE_ISSUES" type="boolean" nullable="false" defaultValueBoolean="true"/>
-        <column name="EXTERNAL_ISSUES_URL" type="varchar(200)" nullable="true"/>
-        <column name="ENABLE_WIKI" type="boolean" nullable="false" defaultValueBoolean="true"/>
-        <column name="ALLOW_WIKI_EDITING" type="boolean" nullable="false" defaultValueBoolean="false"/>
-        <column name="EXTERNAL_WIKI_URL" type="varchar(200)" nullable="true"/>
-    </addColumn>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.6.xml
+++ b/src/main/resources/update/gitbucket-core_4.6.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-    <addColumn tableName="REPOSITORY">
-        <column name="ALLOW_FORK" type="boolean" nullable="false" defaultValueBoolean="true"/>
-    </addColumn>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.7.sql
+++ b/src/main/resources/update/gitbucket-core_4.7.sql
@@ -1,2 +0,0 @@
-- DELETE COLLABORATORS IN GROUP REPOSITORIES
-DELETE FROM COLLABORATOR WHERE USER_NAME IN (SELECT USER_NAME FROM ACCOUNT WHERE GROUP_ACCOUNT = TRUE)
--- a/src/main/resources/update/gitbucket-core_4.7.xml
+++ b/src/main/resources/update/gitbucket-core_4.7.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-    <addColumn tableName="COLLABORATOR">
-        <column name="ROLE" type="varchar(10)" nullable="false" defaultValue="ADMIN"/>
-    </addColumn>
-    <addColumn tableName="REPOSITORY">
-        <column name="WIKI_OPTION" type="varchar(10)" nullable="false" defaultValue="DISABLE"/>
-        <column name="ISSUES_OPTION" type="varchar(10)" nullable="false" defaultValue="DISABLE"/>
-    </addColumn>
-    <update tableName="REPOSITORY">
-        <column name="WIKI_OPTION" value="DISABLE"/>
-        <where>ENABLE_WIKI = FALSE</where>
-    </update>
-    <update tableName="REPOSITORY">
-        <column name="WIKI_OPTION" value="PRIVATE"/>
-        <where>ENABLE_WIKI = TRUE AND ALLOW_WIKI_EDITING = FALSE</where>
-    </update>
-    <update tableName="REPOSITORY">
-        <column name="WIKI_OPTION" value="PUBLIC"/>
-        <where>ENABLE_WIKI = TRUE AND ALLOW_WIKI_EDITING = TRUE</where>
-    </update>
-    <update tableName="REPOSITORY">
-        <column name="ISSUES_OPTION" value="DISABLE"/>
-        <where>ENABLE_ISSUES = FALSE</where>
-    </update>
-    <update tableName="REPOSITORY">
-        <column name="ISSUES_OPTION" value="PUBLIC"/>
-        <where>ENABLE_ISSUES = TRUE</where>
-    </update>
-    <dropColumn tableName="REPOSITORY" columnName="ENABLE_WIKI"/>
-    <dropColumn tableName="REPOSITORY" columnName="ALLOW_WIKI_EDITING"/>
-    <dropColumn tableName="REPOSITORY" columnName="ENABLE_ISSUES"/>
-</changeSet>
--- a/src/main/resources/update/gitbucket-core_4.9.xml
+++ b/src/main/resources/update/gitbucket-core_4.9.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changeSet>
-  <addColumn tableName="ACCOUNT">
-    <column name="DESCRIPTION" type="text" nullable="true" />
-  </addColumn>
-</changeSet>
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -1,33 +1,24 @@

+import gitbucket.core.controller._
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.servlet.{AccessTokenAuthenticationFilter, BasicAuthenticationFilter, Database, TransactionFilter}
+import gitbucket.core.util.Directory
+
 import java.util.EnumSet
 import javax.servlet._

-import gitbucket.core.controller._
-import gitbucket.core.plugin.PluginRegistry
-import gitbucket.core.service.SystemSettingsService
-import gitbucket.core.servlet._
-import gitbucket.core.util.Directory
 import org.scalatra._


-class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
+class ScalatraBootstrap extends LifeCycle {
  override def init(context: ServletContext) {
-
-    val settings = loadSystemSettings()
-    if(settings.baseUrl.exists(_.startsWith("https://"))) {
-      context.getSessionCookieConfig.setSecure(true)
-    }
-
    // Register TransactionFilter and BasicAuthenticationFilter at first
    context.addFilter("transactionFilter", new TransactionFilter)
    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
-    context.addFilter("gitAuthenticationFilter", new GitAuthenticationFilter)
-    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, "/*")
-
+    context.addFilter("basicAuthenticationFilter", new BasicAuthenticationFilter)
+    context.getFilterRegistration("basicAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
+    context.addFilter("accessTokenAuthenticationFilter", new AccessTokenAuthenticationFilter)
+    context.getFilterRegistration("accessTokenAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
    // Register controllers
    context.mount(new AnonymousAccessController, "/*")

--- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
@@ -1,35 +0,0 @@
-package gitbucket.core
-
-import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
-import io.github.gitbucket.solidbase.model.{Version, Module}
-
-object GitBucketCoreModule extends Module("gitbucket-core",
-  new Version("4.0.0",
-    new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
-    new SqlMigration("update/gitbucket-core_4.0.sql")
-  ),
-  new Version("4.1.0"),
-  new Version("4.2.0",
-    new LiquibaseMigration("update/gitbucket-core_4.2.xml")
-  ),
-  new Version("4.2.1"),
-  new Version("4.3.0"),
-  new Version("4.4.0"),
-  new Version("4.5.0"),
-  new Version("4.6.0",
-    new LiquibaseMigration("update/gitbucket-core_4.6.xml")
-  ),
-  new Version("4.7.0",
-    new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
-    new SqlMigration("update/gitbucket-core_4.7.sql")
-  ),
-  new Version("4.7.1"),
-  new Version("4.8"),
-  new Version("4.9.0",
-    new LiquibaseMigration("update/gitbucket-core_4.9.xml")
-  ),
-  new Version("4.10.0"),
-  new Version("4.11.0",
-    new LiquibaseMigration("update/gitbucket-core_4.11.xml")
-  )
-)
--- a/src/main/scala/gitbucket/core/api/ApiBranch.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranch.scala
@@ -8,16 +8,9 @@ import gitbucket.core.util.RepositoryName
 */
 case class ApiBranch(
  name: String,
-  commit: ApiBranchCommit,
+  // commit: ApiBranchCommit,
  protection: ApiBranchProtection)(repositoryName:RepositoryName) extends FieldSerializable {
  def _links = Map(
   "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
   "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}"))
 }
-
-case class ApiBranchCommit(sha: String)
-
-case class ApiBranchForList(
-  name: String,
-  commit: ApiBranchCommit
-)
--- a/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
@@ -14,7 +14,7 @@ object ApiBranchProtection{

  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection = ApiBranchProtection(
    enabled = info.enabled,
-    required_status_checks = Some(Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)))
+    required_status_checks = Some(Status(EnforcementLevel(info.enabled, info.includeAdministrators), info.contexts)))
  val statusNone = Status(Off, Seq.empty)
  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
  sealed class EnforcementLevel(val name: String)
@@ -44,3 +44,4 @@ object ApiBranchProtection{
   }
 ))
 }
+
--- a/src/main/scala/gitbucket/core/api/ApiContents.scala
+++ b/src/main/scala/gitbucket/core/api/ApiContents.scala
@@ -1,28 +0,0 @@
-package gitbucket.core.api
-
-import java.util.Base64
-
-import gitbucket.core.util.JGitUtil.FileInfo
-import gitbucket.core.util.RepositoryName
-
-case class ApiContents(
-  `type`: String,
-  name: String,
-  path: String,
-  sha: String,
-  content: Option[String],
-  encoding: Option[String])(repositoryName: RepositoryName){
-  val download_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/raw/${sha}/${path}")
-}
-
-object ApiContents{
-  def apply(fileInfo: FileInfo, repositoryName: RepositoryName, content: Option[Array[Byte]]): ApiContents = {
-    if(fileInfo.isDirectory) {
-      ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)
-    } else {
-      content.map(arr =>
-        ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.getEncoder.encodeToString(arr)), Some("base64"))(repositoryName)
-      ).getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
-    }
-  }
-}
--- a/src/main/scala/gitbucket/core/api/ApiEndPoint.scala
+++ b/src/main/scala/gitbucket/core/api/ApiEndPoint.scala
@@ -1,3 +0,0 @@
-package gitbucket.core.api
-
-case class ApiEndPoint(rate_limit_url: ApiPath = ApiPath("/api/v3/rate_limit"))
--- a/src/main/scala/gitbucket/core/api/ApiIssue.scala
+++ b/src/main/scala/gitbucket/core/api/ApiIssue.scala
@@ -20,16 +20,6 @@ case class ApiIssue(
  body: String)(repositoryName: RepositoryName, isPullRequest: Boolean){
  val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${number}")
-  val pull_request = if (isPullRequest) {
-    Some(Map(
-      "url" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/${number}"),
-      "html_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}")
-      // "diff_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.diff"),
-      // "patch_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.patch")
-    ))
-  } else {
-    None
-  }
 }

 object ApiIssue{
--- a/src/main/scala/gitbucket/core/api/ApiPullRequest.scala
+++ b/src/main/scala/gitbucket/core/api/ApiPullRequest.scala
@@ -1,6 +1,7 @@
 package gitbucket.core.api

-import gitbucket.core.model.{Account, Issue, IssueComment, PullRequest}
+import gitbucket.core.model.{Issue, PullRequest}
+
 import java.util.Date


@@ -14,9 +15,6 @@ case class ApiPullRequest(
  head: ApiPullRequest.Commit,
  base: ApiPullRequest.Commit,
  mergeable: Option[Boolean],
-  merged: Boolean,
-  merged_at: Option[Date],
-  merged_by: Option[ApiUser],
  title: String,
  body: String,
  user: ApiUser) {
@@ -33,15 +31,7 @@ case class ApiPullRequest(
 }

 object ApiPullRequest{
-  def apply(
-    issue: Issue,
-    pullRequest: PullRequest,
-    headRepo: ApiRepository,
-    baseRepo: ApiRepository,
-    user: ApiUser,
-    mergedComment: Option[(IssueComment, Account)]
-  ): ApiPullRequest =
-    ApiPullRequest(
+  def apply(issue: Issue, pullRequest: PullRequest, headRepo: ApiRepository, baseRepo: ApiRepository, user: ApiUser): ApiPullRequest = ApiPullRequest(
      number     = issue.issueId,
      updated_at = issue.updatedDate,
      created_at = issue.registeredDate,
@@ -54,9 +44,6 @@ object ApiPullRequest{
                     ref  = pullRequest.branch,
                     repo = baseRepo)(issue.userName),
      mergeable  = None, // TODO: need check mergeable.
-      merged     = mergedComment.isDefined,
-      merged_at  = mergedComment.map { case (comment, _) => comment.registeredDate },
-      merged_by  = mergedComment.map { case (_, account) => ApiUser(account) },
      title      = issue.title,
      body       = issue.content.getOrElse(""),
      user       = user
--- a/src/main/scala/gitbucket/core/api/ApiRef.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRef.scala
@@ -1,5 +0,0 @@
-package gitbucket.core.api
-
-case class ApiObject(sha: String)
-
-case class ApiRef(ref: String, `object`: ApiObject)
--- a/src/main/scala/gitbucket/core/api/ApiRepository.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRepository.scala
@@ -14,11 +14,11 @@ case class ApiRepository(
  `private`: Boolean,
  default_branch: String,
  owner: ApiUser)(urlIsHtmlUrl: Boolean) {
-  val forks_count = forks
+  val forks_count   = forks
  val watchers_count = watchers
-  val url = if(urlIsHtmlUrl){
+  val url       = if(urlIsHtmlUrl){
    ApiPath(s"/${full_name}")
-  } else {
+  }else{
    ApiPath(s"/api/v3/repos/${full_name}")
  }
  val http_url  = ApiPath(s"/git/${full_name}.git")
@@ -34,14 +34,14 @@ object ApiRepository{
      watchers: Int = 0,
      urlIsHtmlUrl: Boolean = false): ApiRepository =
    ApiRepository(
-      name           = repository.repositoryName,
-      full_name      = s"${repository.userName}/${repository.repositoryName}",
-      description    = repository.description.getOrElse(""),
-      watchers       = 0,
-      forks          = forkedCount,
-      `private`      = repository.isPrivate,
+      name        = repository.repositoryName,
+      full_name   = s"${repository.userName}/${repository.repositoryName}",
+      description = repository.description.getOrElse(""),
+      watchers    = 0,
+      forks       = forkedCount,
+      `private`   = repository.`private`,
      default_branch = repository.defaultBranch,
-      owner          = owner
+      owner       = owner
    )(urlIsHtmlUrl)

  def apply(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
--- a/src/main/scala/gitbucket/core/api/ApiUser.scala
+++ b/src/main/scala/gitbucket/core/api/ApiUser.scala
@@ -13,7 +13,6 @@ case class ApiUser(
  created_at: Date) {
  val url                 = ApiPath(s"/api/v3/users/${login}")
  val html_url            = ApiPath(s"/${login}")
-  val avatar_url          = ApiPath(s"/${login}/_avatar")
  // val followers_url       = ApiPath(s"/api/v3/users/${login}/followers")
  // val following_url       = ApiPath(s"/api/v3/users/${login}/following{/other_user}")
  // val gists_url           = ApiPath(s"/api/v3/users/${login}/gists{/gist_id}")
@@ -30,8 +29,8 @@ object ApiUser{
  def apply(user: Account): ApiUser = ApiUser(
    login      = user.userName,
    email      = user.mailAddress,
-    `type`     = if(user.isGroupAccount){ "Organization" } else { "User" },
-    site_admin = user.isAdmin,
+    `type`     = if(user.groupAccount){ "Organization" }else{ "User" },
+    site_admin = user.administrator,
    created_at = user.registeredDate
  )
 }
--- a/src/main/scala/gitbucket/core/api/CreateARepository.scala
+++ b/src/main/scala/gitbucket/core/api/CreateARepository.scala
@@ -11,7 +11,7 @@ case class CreateARepository(
    auto_init: Boolean = false
 ) {
  def isValid: Boolean = {
-    name.length <= 100 &&
+    name.length<=40 &&
        name.matches("[a-zA-Z0-9\\-\\+_.]+") &&
        !name.startsWith("_") &&
        !name.startsWith("-")
--- a/src/main/scala/gitbucket/core/api/CreateAnIssue.scala
+++ b/src/main/scala/gitbucket/core/api/CreateAnIssue.scala
@@ -1,11 +0,0 @@
-package gitbucket.core.api
-
-/**
-  * https://developer.github.com/v3/issues/#create-an-issue
-  */
-case class CreateAnIssue(
-    title: String,
-    body: Option[String],
-    assignees: List[String],
-    milestone: Option[Int],
-    labels: List[String])
--- a/src/main/scala/gitbucket/core/api/JsonFormat.scala
+++ b/src/main/scala/gitbucket/core/api/JsonFormat.scala
@@ -31,7 +31,6 @@ object JsonFormat {
    FieldSerializer[ApiPullRequest.Commit]() +
    FieldSerializer[ApiIssue]() +
    FieldSerializer[ApiComment]() +
-    FieldSerializer[ApiContents]() +
    FieldSerializer[ApiLabel]() +
    ApiBranchProtection.enforcementLevelSerializer

--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -2,20 +2,18 @@ package gitbucket.core.controller

 import gitbucket.core.account.html
 import gitbucket.core.helper
-import gitbucket.core.model.{GroupMember, Role}
-import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.model.GroupMember
 import gitbucket.core.service._
 import gitbucket.core.ssh.SshUtil
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.ControlUtil._
 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 java.util.Date


 class AccountController extends AccountControllerBase
@@ -30,21 +28,20 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    with AccessTokenService with WebHookService with RepositoryCreationService =>

  case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
-                            description: Option[String], url: Option[String], fileId: Option[String])
+                            url: Option[String], fileId: Option[String])

  case class AccountEditForm(password: Option[String], fullName: String, mailAddress: String,
-                             description: Option[String], url: Option[String], fileId: Option[String], clearImage: Boolean)
+                             url: Option[String], fileId: Option[String], clearImage: Boolean)

  case class SshKeyForm(title: String, publicKey: String)

  case class PersonalTokenForm(note: String)

  val newForm = mapping(
-    "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName))),
    "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
-    "description" -> trim(label("bio"          , optional(text()))),
    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
    "fileId"      -> trim(label("File ID"      , optional(text())))
  )(AccountNewForm.apply)
@@ -53,7 +50,6 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "description" -> trim(label("bio"          , optional(text()))),
    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
    "fileId"      -> trim(label("File ID"      , optional(text()))),
    "clearImage"  -> trim(label("Clear image"  , boolean()))
@@ -68,12 +64,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    "note"     -> trim(label("Token", text(required, maxlength(100))))
  )(PersonalTokenForm.apply)

-  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String)
-  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
+  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
+  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)

  val newGroupForm = mapping(
-    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "description" -> trim(label("Group description", optional(text()))),
+    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
    "fileId"    -> trim(label("File ID"    ,optional(text()))),
    "members"   -> trim(label("Members"    ,text(required, members)))
@@ -81,7 +76,6 @@ trait AccountControllerBase extends AccountManagementControllerBase {

  val editGroupForm = mapping(
    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
-    "description" -> trim(label("Group description", optional(text()))),
    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
    "fileId"     -> trim(label("File ID"     ,optional(text()))),
    "members"    -> trim(label("Members"     ,text(required, members))),
@@ -120,26 +114,26 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        // Public Activity
        case "activity" =>
          gitbucket.core.account.html.activity(account,
-            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            if(account.groupAccount) Nil else getGroupsByUserName(userName),
            getActivitiesByUser(userName, true))

        // Members
-        case "members" if(account.isGroupAccount) => {
+        case "members" if(account.groupAccount) => {
          val members = getGroupMembers(account.userName)
-          gitbucket.core.account.html.members(account, members,
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+          gitbucket.core.account.html.members(account, members.map(_.userName),
+            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.manager }))
        }

        // Repositories
        case _ => {
          val members = getGroupMembers(account.userName)
          gitbucket.core.account.html.repositories(account,
-            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+            if(account.groupAccount) Nil else getGroupsByUserName(userName),
            getVisibleRepositories(context.loginAccount, Some(userName)),
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.manager }))
        }
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  }

  get("/:userName.atom") {
@@ -150,28 +144,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {

  get("/:userName/_avatar"){
    val userName = params("userName")
-    getAccountByUserName(userName).map{ account =>
-      response.setDateHeader("Last-Modified", account.updatedDate.getTime)
-      account.image.map{ image =>
-        RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
-      }.getOrElse{
-        contentType = "image/png"
-        (if (account.isGroupAccount) {
-          TextAvatarUtil.textGroupAvatar(account.fullName)
-        } else {
-          TextAvatarUtil.textAvatar(account.fullName)
-        }).getOrElse(Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png"))
-      }
-    }.getOrElse{
-      NotFound()
+    getAccountByUserName(userName).flatMap(_.image).map { image =>
+      RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
+    } getOrElse {
+      contentType = "image/png"
+      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
    }
  }

  get("/:userName/_edit")(oneselfOnly {
    val userName = params("userName")
    getAccountByUserName(userName).map { x =>
-      html.edit(x, flash.get("info"), flash.get("error"))
-    } getOrElse NotFound()
+      html.edit(x, flash.get("info"))
+    } getOrElse NotFound
  })

  post("/:userName/_edit", editForm)(oneselfOnly { form =>
@@ -181,24 +166,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        password    = form.password.map(sha1).getOrElse(account.password),
        fullName    = form.fullName,
        mailAddress = form.mailAddress,
-        description = form.description,
        url         = form.url))

      updateImage(userName, form.fileId, form.clearImage)
      flash += "info" -> "Account information has been updated."
      redirect(s"/${userName}/_edit")

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

  get("/:userName/_delete")(oneselfOnly {
    val userName = params("userName")

-    getAccountByUserName(userName, true).map { account =>
-      if(isLastAdministrator(account)){
-        flash += "error" -> "Account can't be removed because this is last one administrator."
-        redirect(s"/${userName}/_edit")
-      } else {
+    getAccountByUserName(userName, true).foreach { account =>
 //      // Remove repositories
 //      getRepositoryNamesOfUser(userName).foreach { repositoryName =>
 //        deleteRepository(userName, repositoryName)
@@ -207,19 +187,21 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
 //      }
 //      // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
-        removeUserRelatedData(userName)
-        updateAccount(account.copy(isRemoved = true))
-        session.invalidate
-        redirect("/")
-      }
-    } getOrElse NotFound()
+//      removeUserRelatedData(userName)
+
+      removeUserRelatedData(userName)
+      updateAccount(account.copy(removed = true))
+    }
+
+    session.invalidate
+    redirect("/")
  })

  get("/:userName/_ssh")(oneselfOnly {
    val userName = params("userName")
    getAccountByUserName(userName).map { x =>
      html.ssh(x, getPublicKeys(x.userName))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  post("/:userName/_ssh", sshKeyForm)(oneselfOnly { form =>
@@ -250,7 +232,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        case _ => None
      }
      html.application(x, tokens, generatedToken)
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  post("/:userName/_personalToken", personalTokenForm)(oneselfOnly { form =>
@@ -276,15 +258,15 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      } else {
        html.register()
      }
-    } else NotFound()
+    } else NotFound
  }

  post("/register", newForm){ form =>
    if(context.settings.allowAccountRegistration){
-      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.description, form.url)
+      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
      updateImage(form.userName, form.fileId, false)
      redirect("/signin")
-    } else NotFound()
+    } else NotFound
  }

  get("/groups/new")(usersOnly {
@@ -292,7 +274,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  })

  post("/groups/new", newGroupForm)(usersOnly { form =>
-    createGroup(form.groupName, form.description, form.url)
+    createGroup(form.groupName, form.url)
    updateGroupMembers(form.groupName, form.members.split(",").map {
      _.split(":") match {
        case Array(userName, isManager) => (userName, isManager.toBoolean)
@@ -330,22 +312,22 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      }
    }.toList){ case (groupName, members) =>
      getAccountByUserName(groupName, true).map { account =>
-        updateGroup(groupName, form.description, form.url, false)
+        updateGroup(groupName, form.url, false)

        // Update GROUP_MEMBER
        updateGroupMembers(form.groupName, members)
-//        // Update COLLABORATOR for group repositories
-//        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-//          removeCollaborators(form.groupName, repositoryName)
-//          members.foreach { case (userName, isManager) =>
-//            addCollaborator(form.groupName, repositoryName, userName)
-//          }
-//        }
+        // Update COLLABORATOR for group repositories
+        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+          removeCollaborators(form.groupName, repositoryName)
+          members.foreach { case (userName, isManager) =>
+            addCollaborator(form.groupName, repositoryName, userName)
+          }
+        }

        updateImage(form.groupName, form.fileId, form.clearImage)
        redirect(s"/${form.groupName}")

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

@@ -362,99 +344,85 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  post("/new", newRepositoryForm)(usersOnly { form =>
    LockUtil.lock(s"${form.owner}/${form.name}"){
      if(getRepository(form.owner, form.name).isEmpty){
-        // Create the repository
        createRepository(context.loginAccount.get, form.owner, form.name, form.description, form.isPrivate, form.createReadme)
-
-        // Call hooks
-        PluginRegistry().getRepositoryHooks.foreach(_.created(form.owner, form.name))
      }
-    }

-    // redirect to the repository
-    redirect(s"/${form.owner}/${form.name}")
+      // redirect to the repository
+      redirect(s"/${form.owner}/${form.name}")
+    }
  })

  get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    if(repository.repository.options.allowFork){
-      val loginAccount   = context.loginAccount.get
-      val loginUserName  = loginAccount.userName
-      val groups         = getGroupsByUserName(loginUserName)
-      groups match {
-        case _: List[String] =>
-          val managerPermissions = groups.map { group =>
-            val members = getGroupMembers(group)
-            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager })
-          }
-          helper.html.forkrepository(
-            repository,
-            (groups zip managerPermissions).toMap
-          )
-        case _ => redirect(s"/${loginUserName}")
-      }
-    } else BadRequest()
+    val loginAccount   = context.loginAccount.get
+    val loginUserName  = loginAccount.userName
+    val groups         = getGroupsByUserName(loginUserName)
+    groups match {
+      case _: List[String] =>
+        val managerPermissions = groups.map { group =>
+          val members = getGroupMembers(group)
+          context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.manager })
+        }
+        helper.html.forkrepository(
+          repository,
+          (groups zip managerPermissions).toMap
+        )
+      case _ => redirect(s"/${loginUserName}")
+    }
  })

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

-      LockUtil.lock(s"${accountName}/${repository.name}"){
-        if(getRepository(accountName, repository.name).isDefined ||
-            (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)
+    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)
-          )
+        insertRepository(
+          repositoryName       = repository.name,
+          userName             = accountName,
+          description          = repository.repository.description,
+          isPrivate            = repository.repository.`private`,
+          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)
+        // Add collaborators for group repository
+        val ownerAccount = getAccountByUserName(accountName).get
+        if(ownerAccount.groupAccount){
+          getGroupMembers(accountName).foreach { member =>
+            addCollaborator(accountName, repository.name, member.userName)
          }
-
-          // Insert default labels
-          insertDefaultLabels(accountName, repository.name)
-
-          // clone repository actually
-          JGitUtil.cloneRepository(
-            getRepositoryDir(repository.owner, repository.name),
-            getRepositoryDir(accountName, repository.name))
-
-          // Create Wiki repository
-          JGitUtil.cloneRepository(
-            getWikiRepositoryDir(repository.owner, repository.name),
-            getWikiRepositoryDir(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}")
        }
+
+        // Insert default labels
+        insertDefaultLabels(accountName, repository.name)
+
+        // clone repository actually
+        JGitUtil.cloneRepository(
+          getRepositoryDir(repository.owner, repository.name),
+          getRepositoryDir(accountName, repository.name))
+
+        // Create Wiki repository
+        JGitUtil.cloneRepository(
+          getWikiRepositoryDir(repository.owner, repository.name),
+          getWikiRepositoryDir(accountName, repository.name))
+
+        // Record activity
+        recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
+        // redirect to the repository
+        redirect(s"/${accountName}/${repository.name}")
      }
-    } else BadRequest()
+    }
  })

  private def existsAccount: Constraint = new Constraint(){
@@ -479,8 +447,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {

  private def validPublicKey: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] = SshUtil.str2PublicKey(value) match {
-     case Some(_) if !getAllKeys().exists(_.publicKey == value) => None
-     case _ => Some("Key is invalid.")
+     case Some(_) => None
+     case None => Some("Key is invalid.")
    }
  }

--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -5,12 +5,11 @@ import gitbucket.core.model._
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.JGitUtil._
+import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.view.helpers.{renderMarkup, isRenderable}
 import org.eclipse.jgit.api.Git
 import org.scalatra.{NoContent, UnprocessableEntity, Created}
 import scala.collection.JavaConverters._
@@ -21,12 +20,9 @@ class ApiController extends ApiControllerBase
  with ProtectedBranchService
  with IssuesService
  with LabelsService
-  with MilestonesService
  with PullRequestService
-  with CommitsService
  with CommitStatusService
  with RepositoryCreationService
-  with IssueCreationService
  with HandleCommentService
  with WebHookService
  with WebHookPullRequestService
@@ -38,7 +34,7 @@ class ApiController extends ApiControllerBase
  with GroupManagerAuthenticator
  with ReferrerAuthenticator
  with ReadableUsersAuthenticator
-  with WritableUsersAuthenticator
+  with CollaboratorsAuthenticator

 trait ApiControllerBase extends ControllerBase {
  self: RepositoryService
@@ -46,193 +42,35 @@ trait ApiControllerBase extends ControllerBase {
    with ProtectedBranchService
    with IssuesService
    with LabelsService
-    with MilestonesService
    with PullRequestService
    with CommitStatusService
    with RepositoryCreationService
-    with IssueCreationService
    with HandleCommentService
    with OwnerAuthenticator
    with UsersAuthenticator
    with GroupManagerAuthenticator
    with ReferrerAuthenticator
    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
-
-  /**
-    * 404 for non-implemented api
-    */
-  get("/api/v3/*") {
-    NotFound()
-  }
-
-  /**
-    * https://developer.github.com/v3/#root-endpoint
-    */
-  get("/api/v3/") {
-    JsonFormat(ApiEndPoint())
-  }
-
-  /**
-    * https://developer.github.com/v3/orgs/#get-an-organization
-    */
-  get("/api/v3/orgs/:groupName") {
-    getAccountByUserName(params("groupName")).filter(account => account.isGroupAccount).map { account =>
-      JsonFormat(ApiUser(account))
-    } getOrElse NotFound()
-  }
+    with CollaboratorsAuthenticator =>

  /**
   * https://developer.github.com/v3/users/#get-a-single-user
-   * This API also returns group information (as GitHub).
   */
  get("/api/v3/users/:userName") {
    getAccountByUserName(params("userName")).map { account =>
      JsonFormat(ApiUser(account))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  }

-  /**
-    * https://developer.github.com/v3/repos/#list-organization-repositories
-    */
-  get("/api/v3/orgs/:orgName/repos") {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("orgName"))).map{ r => ApiRepository(r, getAccountByUserName(r.owner).get)})
-  }
-  /**
-   * https://developer.github.com/v3/repos/#list-user-repositories
-   */
-  get("/api/v3/users/:userName/repos") {
-    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("userName"))).map{ r => ApiRepository(r, getAccountByUserName(r.owner).get)})
-  }
-
-  /*
-   * https://developer.github.com/v3/repos/branches/#list-branches
-   */
-  get ("/api/v3/repos/:owner/:repo/branches")(referrersOnly { repository =>
-    JsonFormat(JGitUtil.getBranches(
-      owner         = repository.owner,
-      name          = repository.name,
-      defaultBranch = repository.repository.defaultBranch,
-      origin        = repository.repository.originUserName.isEmpty
-    ).map { br =>
-      ApiBranchForList(br.name, ApiBranchCommit(br.commitId))
-    })
-  })
-
-  /**
-    * https://developer.github.com/v3/repos/branches/#get-branch
-    */
-  get ("/api/v3/repos/:owner/:repo/branches/:branch")(referrersOnly { repository =>
-    //import gitbucket.core.api._
-    (for{
-      branch     <- params.get("branch") if repository.branchList.find(_ == branch).isDefined
-      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
-    } yield {
-      val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
-      JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), ApiBranchProtection(protection))(RepositoryName(repository)))
-    }) getOrElse NotFound()
-  })
-
-  /*
-   * https://developer.github.com/v3/repos/contents/#get-contents
-   */
-  get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
-    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
-      val path = new java.io.File(pathStr)
-      val dirName = path.getParent match {
-        case null => "."
-        case s => s
-      }
-      getFileList(git, revision, dirName).find(f => f.name.equals(path.getName))
-    }
-
-    val path = multiParams("splat").head match {
-      case s if s.isEmpty => "."
-      case s => s
-    }
-    val refStr = params.getOrElse("ref", repository.repository.defaultBranch)
-
-    using(Git.open(getRepositoryDir(params("owner"), params("repo")))){ git =>
-      val fileList = getFileList(git, refStr, path)
-      if (fileList.isEmpty) { // file or NotFound
-        getFileInfo(git, refStr, path).flatMap(f => {
-          val largeFile = params.get("large_file").exists(s => s.equals("true"))
-          val content = getContentFromId(git, f.id, largeFile)
-          request.getHeader("Accept") match {
-            case "application/vnd.github.v3.raw" => {
-              contentType = "application/vnd.github.v3.raw"
-              content
-            }
-            case "application/vnd.github.v3.html" if isRenderable(f.name) => {
-              contentType = "application/vnd.github.v3.html"
-              content.map(c =>
-                List(
-                  "<div data-path=\"", path, "\" id=\"file\">", "<article>",
-                  renderMarkup(path.split("/").toList, new String(c), refStr, repository, false, false, true).body,
-                  "</article>", "</div>"
-                ).mkString
-              )
-            }
-            case "application/vnd.github.v3.html" => {
-              contentType = "application/vnd.github.v3.html"
-              content.map(c =>
-                List(
-                  "<div data-path=\"", path, "\" id=\"file\">", "<div class=\"plain\">", "<pre>",
-                  play.twirl.api.HtmlFormat.escape(new String(c)).body,
-                  "</pre>", "</div>", "</div>"
-                ).mkString
-              )
-            }
-            case _ =>
-              Some(JsonFormat(ApiContents(f, RepositoryName(repository), content)))
-          }
-        }).getOrElse(NotFound())
-      } else { // directory
-        JsonFormat(fileList.map{f => ApiContents(f, RepositoryName(repository), None)})
-      }
-    }
-  })
-
-  /*
-   * https://developer.github.com/v3/git/refs/#get-a-reference
-   */
-  get("/api/v3/repos/:owner/:repo/git/*") (referrersOnly { repository =>
-    val revstr = multiParams("splat").head
-    using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git =>
-      //JsonFormat( (revstr, git.getRepository().resolve(revstr)) )
-      // getRef is deprecated by jgit-4.2. use exactRef() or findRef()
-      val sha = git.getRepository().exactRef(revstr).getObjectId().name()
-      JsonFormat(ApiRef(revstr, ApiObject(sha)))
-    }
-  })
-
-  /**
-   * https://developer.github.com/v3/repos/collaborators/#list-collaborators
-   */
-  get("/api/v3/repos/:owner/:repo/collaborators") (referrersOnly { repository =>
-    // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members.
-    JsonFormat(getCollaboratorUserNames(params("owner"), params("repo")).map(u => ApiUser(getAccountByUserName(u).get)))
-  })
-
  /**
   * https://developer.github.com/v3/users/#get-the-authenticated-user
   */
  get("/api/v3/user") {
    context.loginAccount.map { account =>
      JsonFormat(ApiUser(account))
-    } getOrElse Unauthorized()
+    } getOrElse Unauthorized
  }

-  /**
-   * List user's own repository
-   * https://developer.github.com/v3/repos/#list-your-repositories
-   */
-  get("/api/v3/user/repos")(usersOnly{
-    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map{
-      r => ApiRepository(r, getAccountByUserName(r.owner).get)
-    })
-  })
-
  /**
   * Create user repository
   * https://developer.github.com/v3/repos/#create
@@ -254,7 +92,7 @@ trait ApiControllerBase extends ControllerBase {
          )
        }
      }
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  /**
@@ -278,26 +116,23 @@ trait ApiControllerBase extends ControllerBase {
          )
        }
      }
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

-  /**
-   * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
-   */
+  /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
  patch("/api/v3/repos/:owner/:repo/branches/:branch")(ownerOnly { repository =>
    import gitbucket.core.api._
    (for{
-      branch     <- params.get("branch") if repository.branchList.find(_ == branch).isDefined
+      branch <- params.get("branch") if repository.branchList.find(_ == branch).isDefined
      protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
-      br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
    } yield {
      if(protection.enabled){
        enableBranchProtection(repository.owner, repository.name, branch, protection.status.enforcement_level == ApiBranchProtection.Everyone, protection.status.contexts)
      } else {
        disableBranchProtection(repository.owner, repository.name, branch)
      }
-      JsonFormat(ApiBranch(branch, ApiBranchCommit(br.commitId), protection)(RepositoryName(repository)))
-    }) getOrElse NotFound()
+      JsonFormat(ApiBranch(branch, protection)(RepositoryName(repository)))
+    }) getOrElse NotFound
  })

  /**
@@ -310,78 +145,16 @@ trait ApiControllerBase extends ControllerBase {
    org.scalatra.NotFound(ApiError("Rate limiting is not enabled."))
  }

-  /**
-    * https://developer.github.com/v3/issues/#list-issues-for-a-repository
-    */
-  get("/api/v3/repos/:owner/:repository/issues")(referrersOnly { repository =>
-    val page = IssueSearchCondition.page(request)
-    // TODO: more api spec condition
-    val condition = IssueSearchCondition(request)
-    val baseOwner = getAccountByUserName(repository.owner).get
-
-    val issues: List[(Issue, Account)] =
-      searchIssueByApi(
-        condition = condition,
-        offset    = (page - 1) * PullRequestLimit,
-        limit     = PullRequestLimit,
-        repos     = repository.owner -> repository.name
-      )
-
-    JsonFormat(issues.map { case (issue, issueUser) =>
-      ApiIssue(
-        issue          = issue,
-        repositoryName = RepositoryName(repository),
-        user           = ApiUser(issueUser)
-      )
-    })
-  })
-
-  /**
-   * https://developer.github.com/v3/issues/#get-a-single-issue
-   */
-  get("/api/v3/repos/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    (for{
-      issueId  <- params("id").toIntOpt
-      issue <- getIssue(repository.owner, repository.name, issueId.toString)
-      openedUser <- getAccountByUserName(issue.openedUserName)
-    } yield {
-      JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(openedUser)))
-    }) getOrElse NotFound()
-  })
-
-  /**
-    * https://developer.github.com/v3/issues/#create-an-issue
-    */
-  post("/api/v3/repos/:owner/:repository/issues")(readableUsersOnly { repository =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
-      (for{
-        data <- extractFromJsonBody[CreateAnIssue]
-        loginAccount <- context.loginAccount
-      } yield {
-        val milestone = data.milestone.flatMap(getMilestone(repository.owner, repository.name, _))
-        val issue = createIssue(
-          repository,
-          data.title,
-          data.body,
-          data.assignees.headOption,
-          milestone.map(_.milestoneId),
-          data.labels,
-          loginAccount)
-        JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(loginAccount)))
-      }) getOrElse NotFound()
-    } else Unauthorized()
-  })
-
  /**
   * https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
   */
  get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
    (for{
-      issueId  <- params("id").toIntOpt
-      comments =  getCommentsForApi(repository.owner, repository.name, issueId.toInt)
+      issueId <- params("id").toIntOpt
+      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()
+    }).getOrElse(NotFound)
  })

  /**
@@ -397,7 +170,7 @@ trait ApiControllerBase extends ControllerBase {
      issueComment <- getComment(repository.owner, repository.name, id.toString())
    } yield {
      JsonFormat(ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(context.loginAccount.get), issue.isPullRequest))
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  /**
@@ -424,7 +197,7 @@ trait ApiControllerBase extends ControllerBase {
   * Create a label
   * https://developer.github.com/v3/issues/labels/#create-a-label
   */
-  post("/api/v3/repos/:owner/:repository/labels")(writableUsersOnly { repository =>
+  post("/api/v3/repos/:owner/:repository/labels")(collaboratorsOnly { repository =>
    (for{
      data <- extractFromJsonBody[CreateALabel] if data.isValid
    } yield {
@@ -449,7 +222,7 @@ trait ApiControllerBase extends ControllerBase {
   * Update a label
   * https://developer.github.com/v3/issues/labels/#update-a-label
   */
-  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
+  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(collaboratorsOnly { repository =>
    (for{
      data <- extractFromJsonBody[CreateALabel] if data.isValid
    } yield {
@@ -459,14 +232,12 @@ trait ApiControllerBase extends ControllerBase {
            updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
            JsonFormat(ApiLabel(
              getLabel(repository.owner, repository.name, label.labelId).get,
-              RepositoryName(repository)
-            ))
+              RepositoryName(repository)))
          } else {
            // TODO ApiError should support errors field to enhance compatibility of GitHub API
            UnprocessableEntity(ApiError(
              "Validation Failed",
-              Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-            ))
+              Some("https://developer.github.com/v3/issues/labels/#create-a-label")))
          }
        } getOrElse NotFound()
      }
@@ -477,7 +248,7 @@ trait ApiControllerBase extends ControllerBase {
   * Delete a label
   * https://developer.github.com/v3/issues/labels/#delete-a-label
   */
-  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(writableUsersOnly { repository =>
+  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(collaboratorsOnly { repository =>
    LockUtil.lock(RepositoryName(repository).fullName) {
      getLabel(repository.owner, repository.name, params("labelName")).map { label =>
        deleteLabel(repository.owner, repository.name, label.labelId)
@@ -490,29 +261,18 @@ trait ApiControllerBase extends ControllerBase {
   * https://developer.github.com/v3/pulls/#list-pull-requests
   */
  get("/api/v3/repos/:owner/:repository/pulls")(referrersOnly { repository =>
-    val page = IssueSearchCondition.page(request)
+    val page       = IssueSearchCondition.page(request)
    // TODO: more api spec condition
    val condition = IssueSearchCondition(request)
    val baseOwner = getAccountByUserName(repository.owner).get
-
-    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account)] =
-      searchPullRequestByApi(
-        condition = condition,
-        offset    = (page - 1) * PullRequestLimit,
-        limit     = PullRequestLimit,
-        repos     = repository.owner -> repository.name
-      )
-
-    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) =>
+    val issues:List[(Issue, Account, Int, PullRequest, Repository, Account)] = searchPullRequestByApi(condition, (page - 1) * PullRequestLimit, PullRequestLimit, repository.owner -> repository.name)
+    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),
-        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-      )
-    })
+        issue,
+        pullRequest,
+        ApiRepository(headRepo, ApiUser(headOwner)),
+        ApiRepository(repository, ApiUser(baseOwner)),
+        ApiUser(issueUser)) })
  })

  /**
@@ -520,23 +280,21 @@ trait ApiControllerBase extends ControllerBase {
   */
  get("/api/v3/repos/:owner/:repository/pulls/:id")(referrersOnly { repository =>
    (for{
-      issueId   <- params("id").toIntOpt
+      issueId <- params("id").toIntOpt
      (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
-      users     =  getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set.empty)
+      users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set())
      baseOwner <- users.get(repository.owner)
      headOwner <- users.get(pullRequest.requestUserName)
      issueUser <- users.get(issue.openedUserName)
      headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
    } yield {
      JsonFormat(ApiPullRequest(
-        issue         = issue,
-        pullRequest   = pullRequest,
-        headRepo      = ApiRepository(headRepo, ApiUser(headOwner)),
-        baseRepo      = ApiRepository(repository, ApiUser(baseOwner)),
-        user          = ApiUser(issueUser),
-        mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
-      ))
-    }) getOrElse NotFound()
+        issue,
+        pullRequest,
+        ApiRepository(headRepo, ApiUser(headOwner)),
+        ApiRepository(repository, ApiUser(baseOwner)),
+        ApiUser(issueUser)))
+    }).getOrElse(NotFound)
  })

  /**
@@ -551,11 +309,11 @@ trait ApiControllerBase extends ControllerBase {
          val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
          val newId = git.getRepository.resolve(pullreq.commitIdTo)
          val repoFullName = RepositoryName(repository)
-          val commits = git.log.addRange(oldId, newId).call.iterator.asScala.map { c => ApiCommitListItem(new CommitInfo(c), repoFullName) }.toList
+          val commits = git.log.addRange(oldId, newId).call.iterator.asScala.map(c => ApiCommitListItem(new CommitInfo(c), repoFullName)).toList
          JsonFormat(commits)
        }
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  /**
@@ -568,19 +326,19 @@ trait ApiControllerBase extends ControllerBase {
  /**
   * https://developer.github.com/v3/repos/statuses/#create-a-status
   */
-  post("/api/v3/repos/:owner/:repo/statuses/:sha")(writableUsersOnly { repository =>
+  post("/api/v3/repos/:owner/:repo/statuses/:sha")(collaboratorsOnly { repository =>
    (for{
-      ref      <- params.get("sha")
-      sha      <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
-      data     <- extractFromJsonBody[CreateAStatus] if data.isValid
-      creator  <- context.loginAccount
-      state    <- CommitState.valueOf(data.state)
-      statusId =  createCommitStatus(repository.owner, repository.name, sha, data.context.getOrElse("default"),
-                                     state, data.target_url, data.description, new java.util.Date(), creator)
-      status   <- getCommitStatus(repository.owner, repository.name, statusId)
+      ref <- params.get("sha")
+      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+      data <- extractFromJsonBody[CreateAStatus] if data.isValid
+      creator <- context.loginAccount
+      state <- CommitState.valueOf(data.state)
+      statusId = createCommitStatus(repository.owner, repository.name, sha, data.context.getOrElse("default"),
+        state, data.target_url, data.description, new java.util.Date(), creator)
+      status <- getCommitStatus(repository.owner, repository.name, statusId)
    } yield {
      JsonFormat(ApiCommitStatus(status, ApiUser(creator)))
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  /**
@@ -596,7 +354,7 @@ trait ApiControllerBase extends ControllerBase {
      JsonFormat(getCommitStatuesWithCreator(repository.owner, repository.name, sha).map{ case(status, creator) =>
        ApiCommitStatus(status, ApiUser(creator))
      })
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  /**
@@ -615,31 +373,17 @@ trait ApiControllerBase extends ControllerBase {
   */
  get("/api/v3/repos/:owner/:repo/commits/:ref/status")(referrersOnly { repository =>
    (for{
-      ref   <- params.get("ref")
+      ref <- params.get("ref")
      owner <- getAccountByUserName(repository.owner)
-      sha   <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
+      sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref)
    } yield {
      val statuses = getCommitStatuesWithCreator(repository.owner, repository.name, sha)
      JsonFormat(ApiCombinedCommitStatus(sha, statuses, ApiRepository(repository, owner)))
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
-
-  /**
-    * non-GitHub compatible API for Jenkins-Plugin
-    */
-  get("/api/v3/repos/:owner/:repo/raw/*")(referrersOnly { repository =>
-    val (id, path) = repository.splitPath(multiParams("splat").head)
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      getPathObjectId(git, path, revCommit).map { objectId =>
-        responseRawFile(git, objectId, path, repository)
-      } getOrElse NotFound()
-    }
-  })
+    hasWritePermission(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
@@ -1,31 +1,25 @@
 package gitbucket.core.controller

-import java.io.FileInputStream
-
 import gitbucket.core.api.ApiError
 import gitbucket.core.model.Account
-import gitbucket.core.service.{AccountService, SystemSettingsService,RepositoryService}
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.service.{AccountService, SystemSettingsService}
+import gitbucket.core.util.ControlUtil._
 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.apache.commons.io.FileUtils
 import org.json4s._
 import org.scalatra._
 import org.scalatra.i18n._
 import org.scalatra.json._
-import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
-import javax.servlet.{FilterChain, ServletRequest, ServletResponse}
+
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import javax.servlet.{FilterChain, ServletResponse, ServletRequest}

 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

 /**
 * Provides generic features for controller implementations.
@@ -56,14 +50,14 @@ abstract class ControllerBase extends ScalatraFilter
      if(account == null){
        // Redirect to login form
        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
-      } else if(account.isAdmin){
+      } else if(account.administrator){
        // H2 Console (administrators only)
        chain.doFilter(request, response)
      } else {
        // Redirect to dashboard
        httpResponse.sendRedirect(baseUrl + "/")
      }
-    } else if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
+    } else if(path.startsWith("/git/")){
      // Git repository
      chain.doFilter(request, response)
    } else {
@@ -180,49 +174,6 @@ abstract class ControllerBase extends ScalatraFilter
      case _ => Some(parse(request.body))
    }).filterNot(_ == JNothing).flatMap(j => Try(j.extract[A]).toOption)
  }
-
-  protected def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
-    @scala.annotation.tailrec
-    def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
-      case true  => _getPathObjectId(path, walk)
-      case false => None
-    }
-
-    using(new TreeWalk(git.getRepository)){ treeWalk =>
-      treeWalk.addTree(revCommit.getTree)
-      treeWalk.setRecursive(true)
-      _getPathObjectId(path, treeWalk)
-    }
-  }
-
-  protected def responseRawFile(git: Git, objectId: ObjectId, path: String,
-                              repository: RepositoryService.RepositoryInfo): Unit = {
-    JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
-      contentType = FileUtil.getMimeType(path)
-
-      if(loader.isLarge){
-        response.setContentLength(loader.getSize.toInt)
-        loader.copyTo(response.outputStream)
-      } else {
-        val bytes = loader.getCachedBytes
-        val text = new String(bytes, "UTF-8")
-
-        val attrs = JGitUtil.getLfsObjects(text)
-        if(attrs.nonEmpty) {
-          response.setContentLength(attrs("size").toInt)
-          val oid = attrs("oid").split(":")(1)
-
-          using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))){ in =>
-            IOUtils.copy(in, response.getOutputStream)
-          }
-        } else {
-          response.setContentLength(loader.getSize.toInt)
-          response.getOutputStream.write(bytes)
-        }
-      }
-    }
-  }
 }

 /**
@@ -240,7 +191,6 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
    case agent if agent.contains("Win") => "windows"
    case _ => null
  }
-  val sidebarCollapse = request.getSession.getAttribute("sidebar-collapse") != null

  /**
   * Get object from cache.
@@ -274,13 +224,10 @@ trait AccountManagementControllerBase extends ControllerBase {
    } else {
      fileId.map { fileId =>
        val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
-        val uploadDir = getUserUploadDir(userName)
-        if(!uploadDir.exists){
-          uploadDir.mkdirs()
-        }
-        Thumbnails.of(new java.io.File(getTemporaryDir(session.getId), fileId))
-          .size(324, 324)
-          .toFile(new java.io.File(uploadDir, filename))
+        FileUtils.moveFile(
+          new java.io.File(getTemporaryDir(session.getId), fileId),
+          new java.io.File(getUserUploadDir(userName), filename)
+        )
        updateAvatarImage(userName, Some(filename))
      }
    }
@@ -297,13 +244,4 @@ trait AccountManagementControllerBase extends ControllerBase {
        .map    { _ => "Mail address is already registered." }
  }

-  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")
-    } else {
-      None
-    }
-  }
-
 }
--- a/src/main/scala/gitbucket/core/controller/DashboardController.scala
+++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala
@@ -1,13 +1,13 @@
 package gitbucket.core.controller

 import gitbucket.core.dashboard.html
-import gitbucket.core.service._
-import gitbucket.core.util.{Keys, UsersAuthenticator}
+import gitbucket.core.service.{RepositoryService, PullRequestService, AccountService, IssuesService}
+import gitbucket.core.util.{StringUtil, Keys, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
 import gitbucket.core.service.IssuesService._

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

 trait DashboardControllerBase extends ControllerBase {
@@ -15,7 +15,20 @@ trait DashboardControllerBase extends ControllerBase {
    with UsersAuthenticator =>

  get("/dashboard/issues")(usersOnly {
-    searchIssues("created_by")
+    val q = request.getParameter("q")
+    val account = context.loginAccount.get
+    Option(q).map { q =>
+      val condition = IssueSearchCondition(q, Map[String, Int]())
+      q match {
+        case q if(q.contains("is:pr")) => redirect(s"/dashboard/pulls?q=${StringUtil.urlEncode(q)}")
+        case q if(q.contains(s"author:${account.userName}")) => redirect(s"/dashboard/issues/created_by${condition.toURL}")
+        case q if(q.contains(s"assignee:${account.userName}")) => redirect(s"/dashboard/issues/assigned${condition.toURL}")
+        case q if(q.contains(s"mentions:${account.userName}")) => redirect(s"/dashboard/issues/mentioned${condition.toURL}")
+        case _ => searchIssues("created_by")
+      }
+    } getOrElse {
+      searchIssues("created_by")
+    }
  })

  get("/dashboard/issues/assigned")(usersOnly {
@@ -31,7 +44,20 @@ trait DashboardControllerBase extends ControllerBase {
  })

  get("/dashboard/pulls")(usersOnly {
-    searchPullRequests("created_by")
+    val q = request.getParameter("q")
+    val account = context.loginAccount.get
+    Option(q).map { q =>
+      val condition = IssueSearchCondition(q, Map[String, Int]())
+      q match {
+        case q if(q.contains("is:issue")) => redirect(s"/dashboard/issues?q=${StringUtil.urlEncode(q)}")
+        case q if(q.contains(s"author:${account.userName}")) => redirect(s"/dashboard/pulls/created_by${condition.toURL}")
+        case q if(q.contains(s"assignee:${account.userName}")) => redirect(s"/dashboard/pulls/assigned${condition.toURL}")
+        case q if(q.contains(s"mentions:${account.userName}")) => redirect(s"/dashboard/pulls/mentioned${condition.toURL}")
+        case _ => searchPullRequests("created_by")
+      }
+    } getOrElse {
+      searchPullRequests("created_by")
+    }
  })

  get("/dashboard/pulls/created_by")(usersOnly {
@@ -47,12 +73,19 @@ trait DashboardControllerBase extends ControllerBase {
  })

  private def getOrCreateCondition(key: String, filter: String, userName: String) = {
-    val condition = IssueSearchCondition(request)
+    val condition = session.putAndGet(key, if(request.hasQueryString){
+      val q = request.getParameter("q")
+      if(q == null){
+        IssueSearchCondition(request)
+      } else {
+        IssueSearchCondition(q, Map[String, Int]())
+      }
+    } else session.getAs[IssueSearchCondition](key).getOrElse(IssueSearchCondition()))

    filter match {
-      case "assigned"  => condition.copy(assigned = Some(Some(userName)), author = None, mentioned = None)
-      case "mentioned" => condition.copy(assigned = None, author = None, mentioned = Some(userName))
-      case _           => condition.copy(assigned = None, author = Some(userName), mentioned = None)
+      case "assigned"  => condition.copy(assigned = Some(userName), author = None          , mentioned = None)
+      case "mentioned" => condition.copy(assigned = None          , author = None          , mentioned = Some(userName))
+      case _           => condition.copy(assigned = None          , author = Some(userName), mentioned = None)
    }
  }

@@ -70,14 +103,12 @@ trait DashboardControllerBase extends ControllerBase {
      countIssue(condition.copy(state = "open"  ), false, userRepos: _*),
      countIssue(condition.copy(state = "closed"), false, userRepos: _*),
      filter match {
-        case "assigned"  => condition.copy(assigned  = Some(Some(userName)))
+        case "assigned"  => condition.copy(assigned  = Some(userName))
        case "mentioned" => condition.copy(mentioned = Some(userName))
        case _           => condition.copy(author    = Some(userName))
      },
      filter,
-      getGroupNames(userName),
-      Nil,
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+      getGroupNames(userName))
  }

  private def searchPullRequests(filter: String) = {
@@ -95,14 +126,12 @@ trait DashboardControllerBase extends ControllerBase {
      countIssue(condition.copy(state = "open"  ), true, allRepos: _*),
      countIssue(condition.copy(state = "closed"), true, allRepos: _*),
      filter match {
-        case "assigned"  => condition.copy(assigned  = Some(Some(userName)))
+        case "assigned"  => condition.copy(assigned  = Some(userName))
        case "mentioned" => condition.copy(mentioned = Some(userName))
        case _           => condition.copy(author    = Some(userName))
      },
      filter,
-      getGroupNames(userName),
-      Nil,
-      getUserRepositories(userName, withoutPhysicalInfo = true))
+      getGroupNames(userName))
  }


--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -1,26 +1,18 @@
 package gitbucket.core.controller

-import gitbucket.core.model.Account
-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._
+import gitbucket.core.util.{Keys, FileUtil}
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.Implicits._
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.dircache.DirCache
-import org.eclipse.jgit.lib.{Constants, FileMode}
 import org.scalatra._
-import org.scalatra.servlet.{FileItem, FileUploadSupport, MultipartConfig}
-import org.apache.commons.io.{FileUtils, IOUtils}
+import org.scalatra.servlet.{MultipartConfig, FileUploadSupport, FileItem}
+import org.apache.commons.io.FileUtils

 /**
 * Provides Ajax based file upload functionality.
 *
 * This servlet saves uploaded file.
 */
-class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
+class FileUploadController extends ScalatraServlet with FileUploadSupport {

  configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))

@@ -39,75 +31,14 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
    }, FileUtil.isUploadableType)
  }

-  post("/wiki/:owner/:repository"){
-    // Don't accept not logged-in users
-    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account =>
-      val owner      = params("owner")
-      val repository = params("repository")
-
-      // Check whether logged-in user is collaborator
-      onlyWikiEditable(owner, repository, loginAccount){
-        execute({ (file, fileId) =>
-          val fileName = file.getName
-          LockUtil.lock(s"${owner}/${repository}/wiki") {
-            using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
-              val builder  = DirCache.newInCore.builder()
-              val inserter = git.getRepository.newObjectInserter()
-              val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-
-              if(headId != null){
-                JGitUtil.processTree(git, headId){ (path, tree) =>
-                  if(path != fileName){
-                    builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                  }
-                }
-              }
-
-              val bytes = IOUtils.toByteArray(file.getInputStream)
-              builder.add(JGitUtil.createDirCacheEntry(fileName, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
-              builder.finish()
-
-              val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-                Constants.HEAD, loginAccount.userName, loginAccount.mailAddress, s"Uploaded ${fileName}")
-
-              fileName
-            }
-          }
-        }, FileUtil.isUploadableType)
-      }
-    } getOrElse BadRequest()
-  }
-
-  post("/import") {
-    import JDBCUtil._
-    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account if loginAccount.isAdmin =>
-      execute({ (file, fileId) =>
-        request2Session(request).conn.importAsSQL(file.getInputStream)
-      }, _ => true)
-    }
-    redirect("/admin/data")
-  }
-
-  private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
-    implicit val session = Database.getSession(request)
-    getRepository(owner, repository) match {
-      case Some(x) => x.repository.options.wikiOption match {
-        case "ALL"     if !x.repository.isPrivate => action
-        case "PUBLIC"  if hasGuestRole(owner, repository, Some(loginAccount)) => action
-        case "PRIVATE" if hasDeveloperRole(owner, repository, Some(loginAccount)) => action
-        case _  => BadRequest()
-      }
-      case None => BadRequest()
-    }
-  }
-
  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)
+
        Ok(fileId)
      }
-    case _ => BadRequest()
+    case _ => BadRequest
  }

 }
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -1,16 +1,17 @@
 package gitbucket.core.controller

+import gitbucket.core.api._
 import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
-import gitbucket.core.service._
+import gitbucket.core.service.{RepositoryService, ActivityService, AccountService, RepositorySearchService, IssuesService}
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
+import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.{LDAPUtil, Keys, UsersAuthenticator, ReferrerAuthenticator, StringUtil}
+
 import io.github.gitbucket.scalatra.forms._
-import org.scalatra.Ok


-class IndexController extends IndexControllerBase
+class IndexController extends IndexControllerBase 
  with RepositoryService with ActivityService with AccountService with RepositorySearchService with IssuesService
  with UsersAuthenticator with ReferrerAuthenticator

@@ -36,11 +37,23 @@ trait IndexControllerBase extends ControllerBase {


  get("/"){
-    context.loginAccount.map { account =>
-      val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
-      gitbucket.core.html.index(getRecentActivitiesByOwners(visibleOwnerSet), Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
-    }.getOrElse {
-      gitbucket.core.html.index(getRecentActivities(), getVisibleRepositories(None, withoutPhysicalInfo = true), Nil)
+    val loginAccount = context.loginAccount
+    if(loginAccount.isEmpty) {
+        gitbucket.core.html.index(getRecentActivities(),
+            getVisibleRepositories(loginAccount, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, withoutPhysicalInfo = true) }.getOrElse(Nil)
+        )
+    } else {
+        val loginUserName = loginAccount.get.userName
+        val loginUserGroups = getGroupsByUserName(loginUserName)
+        var visibleOwnerSet : Set[String] = Set(loginUserName)
+        
+        visibleOwnerSet ++= loginUserGroups
+
+        gitbucket.core.html.index(getRecentActivitiesByOwners(visibleOwnerSet),
+            getVisibleRepositories(loginAccount, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, withoutPhysicalInfo = true) }.getOrElse(Nil) 
+        )
    }
  }

@@ -49,18 +62,13 @@ trait IndexControllerBase extends ControllerBase {
    if(redirect.isDefined && redirect.get.startsWith("/")){
      flash += Keys.Flash.Redirect -> redirect.get
    }
-    gitbucket.core.html.signin(flash.get("userName"), flash.get("password"), flash.get("error"))
+    gitbucket.core.html.signin()
  }

  post("/signin", signinForm){ form =>
    authenticate(context.settings, form.userName, form.password) match {
      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")
-      }
+      case None          => redirect("/signin")
    }
  }

@@ -74,15 +82,6 @@ trait IndexControllerBase extends ControllerBase {
    xml.feed(getRecentActivities())
  }

-  get("/sidebar-collapse"){
-    if(params("collapse") == "true"){
-      session.setAttribute("sidebar-collapse", "true")
-    }  else {
-      session.setAttribute("sidebar-collapse", null)
-    }
-    Ok()
-  }
-
  /**
   * Set account information into HttpSession and redirect.
   */
@@ -110,35 +109,27 @@ trait IndexControllerBase extends ControllerBase {
   */
  get("/_user/proposals")(usersOnly {
    contentType = formats("json")
-    val user  = params("user").toBoolean
-    val group = params("group").toBoolean
    org.json4s.jackson.Serialization.write(
-      Map("options" -> (
-        getAllUsers(false)
-          .withFilter { t => (user, group) match {
-            case (true, true) => true
-            case (true, false) => !t.isGroupAccount
-            case (false, true) => t.isGroupAccount
-            case (false, false) => false
-          }}.map { t => t.userName }
-      ))
+      Map("options" -> getAllUsers(false).filter(!_.groupAccount).map(_.userName).toArray)
    )
  })

  /**
-   * JSON API for checking user or group existence.
-   * Returns a single string which is any of "group", "user" or "".
+   * JSON API for checking user existence.
   */
  post("/_user/existence")(usersOnly {
-    getAccountByUserName(params("userName")).map { account =>
-      if(account.isGroupAccount) "group" else "user"
-    } getOrElse ""
+    getAccountByUserName(params("userName")).isDefined
  })

+  // TODO Move to RepositoryViwerController?
+  post("/search", searchForm){ form =>
+    redirect(s"/${form.owner}/${form.repository}/search?q=${StringUtil.urlEncode(form.query)}")
+  }
+
  // TODO Move to RepositoryViwerController?
  get("/:owner/:repository/search")(referrersOnly { repository =>
-    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")){ case (query, target) =>
-      val page = try {
+    defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
+      val page   = try {
        val i = params.getOrElse("page", "1").toInt
        if(i <= 0) 1 else i
      } catch {
@@ -147,31 +138,15 @@ trait IndexControllerBase extends ControllerBase {

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

        case _ => gitbucket.core.search.html.code(
-          if(query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
+          searchFiles(repository.owner, repository.name, query),
+          countIssues(repository.owner, repository.name, query),
          query, page, repository)
      }
    }
  })
-
-  get("/search"){
-    val query = params.getOrElse("query", "").trim.toLowerCase
-    val visibleRepositories = getVisibleRepositories(context.loginAccount, None)
-    val repositories = visibleRepositories.filter { repository =>
-      repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
-    }
-    context.loginAccount.map { account =>
-      gitbucket.core.search.html.repositories(query, repositories, Nil, getUserRepositories(account.userName, withoutPhysicalInfo = true))
-    }.getOrElse {
-      gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil)
-    }
-  }
-
 }
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -3,45 +3,23 @@ package gitbucket.core.controller
 import gitbucket.core.issues.html
 import gitbucket.core.service.IssuesService._
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import gitbucket.core.view
 import gitbucket.core.view.Markdown
+
 import io.github.gitbucket.scalatra.forms._
-import org.scalatra.{BadRequest, Ok}
+import org.scalatra.Ok


 class IssuesController extends IssuesControllerBase
-  with IssuesService
-  with RepositoryService
-  with AccountService
-  with LabelsService
-  with MilestonesService
-  with ActivityService
-  with HandleCommentService
-  with IssueCreationService
-  with ReadableUsersAuthenticator
-  with ReferrerAuthenticator
-  with WritableUsersAuthenticator
-  with PullRequestService
-  with WebHookIssueCommentService
-  with CommitsService
+  with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService with HandleCommentService
+  with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator with PullRequestService with WebHookIssueCommentService

 trait IssuesControllerBase extends ControllerBase {
-  self: IssuesService
-    with RepositoryService
-    with AccountService
-    with LabelsService
-    with MilestonesService
-    with ActivityService
-    with HandleCommentService
-    with IssueCreationService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator
-    with PullRequestService
-    with WebHookIssueCommentService =>
+  self: IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService with HandleCommentService
+    with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator with PullRequestService with WebHookIssueCommentService =>

  case class IssueCreateForm(title: String, content: Option[String],
    assignedUserName: Option[String], milestoneId: Option[Int], labelNames: Option[String])
@@ -89,121 +67,145 @@ trait IssuesControllerBase extends ControllerBase {
          _,
          getComments(owner, name, issueId.toInt),
          getIssueLabels(owner, name, issueId.toInt),
-          getAssignableUserNames(owner, name),
+          (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.groupAccount) Nil else List(owner))).sorted,
          getMilestonesWithIssueCount(owner, name),
          getLabels(owner, name),
-          isIssueEditable(repository),
-          isIssueManageable(repository),
+          hasWritePermission(owner, name, context.loginAccount),
          repository)
-      } getOrElse NotFound()
+      } getOrElse NotFound
    }
  })

  get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    if(isIssueEditable(repository)){ // TODO Should this check is provided by authenticator?
-      defining(repository.owner, repository.name){ case (owner, name) =>
-        html.create(
-          getAssignableUserNames(owner, name),
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      html.create(
+        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.groupAccount) Nil else List(owner))).sorted,
          getMilestones(owner, name),
          getLabels(owner, name),
-          isIssueManageable(repository),
-          getContentTemplate(repository, "ISSUE_TEMPLATE"),
+          hasWritePermission(owner, name, context.loginAccount),
          repository)
-      }
-    } else Unauthorized()
+    }
  })

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

-      redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
-    } else Unauthorized()
+      // insert issue
+      val issueId = createIssue(owner, name, userName, form.title, form.content,
+        if(writable) form.assignedUserName else None,
+        if(writable) form.milestoneId else None)
+
+      // insert labels
+      if(writable){
+        form.labelNames.map { value =>
+          val labels = getLabels(owner, name)
+          value.split(",").foreach { labelName =>
+            labels.find(_.labelName == labelName).map { label =>
+              registerIssueLabel(owner, name, issueId, label.labelId)
+            }
+          }
+        }
+      }
+
+      // record activity
+      recordCreateIssueActivity(owner, name, userName, issueId, form.title)
+
+      getIssue(owner, name, issueId.toString).foreach { issue =>
+        // extract references and create refer comment
+        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)
+
+        // call web hooks
+        callIssuesWebHook("opened", repository, issue, context.baseUrl, context.loginAccount.get)
+
+        // notifications
+        Notifier().toNotify(repository, issue, form.content.getOrElse("")){
+          Notifier.msgIssue(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
+        }
+      }
+
+      redirect(s"/${owner}/${name}/issues/${issueId}")
+    }
  })

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

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

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

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

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

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

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

  ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
    defining(repository.owner, repository.name){ case (owner, name) =>
      getComment(owner, name, params("id")).map { comment =>
-        if(isEditableContent(owner, name, comment.commentedUserName)){
+        if(isEditable(owner, name, comment.commentedUserName)){
          Ok(deleteComment(comment.commentId))
-        } else Unauthorized()
-      } getOrElse NotFound()
+        } else Unauthorized
+      } getOrElse NotFound
    }
  })

  ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
    getIssue(repository.owner, repository.name, params("id")) map { x =>
-      if(isEditableContent(x.userName, x.repositoryName, x.openedUserName)){
+      if(isEditable(x.userName, x.repositoryName, x.openedUserName)){
        params.get("dataType") collect {
-          case t if t == "html" => html.editissue(x.content, x.issueId, repository)
+          case t if t == "html" => html.editissue(
+              x.content, x.issueId, x.userName, x.repositoryName)
        } getOrElse {
          contentType = formats("json")
          org.json4s.jackson.Serialization.write(
@@ -217,20 +219,21 @@ trait IssuesControllerBase extends ControllerBase {
                enableAnchor = true,
                enableLineBreaks = true,
                enableTaskList = true,
-                hasWritePermission = true
+                hasWritePermission = isEditable(x.userName, x.repositoryName, x.openedUserName)
              )
            )
          )
        }
-      } else Unauthorized()
-    } getOrElse NotFound()
+      } else Unauthorized
+    } getOrElse NotFound
  })

  ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
    getComment(repository.owner, repository.name, params("id")) map { x =>
-      if(isEditableContent(x.userName, x.repositoryName, x.commentedUserName)){
+      if(isEditable(x.userName, x.repositoryName, x.commentedUserName)){
        params.get("dataType") collect {
-          case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+          case t if t == "html" => html.editcomment(
+              x.content, x.commentId, x.userName, x.repositoryName)
        } getOrElse {
          contentType = formats("json")
          org.json4s.jackson.Serialization.write(
@@ -243,51 +246,51 @@ trait IssuesControllerBase extends ControllerBase {
                enableAnchor = true,
                enableLineBreaks = true,
                enableTaskList = true,
-                hasWritePermission = true
+                hasWritePermission = isEditable(x.userName, x.repositoryName, x.commentedUserName)
              )
            )
          )
        }
-      } else Unauthorized()
-    } getOrElse NotFound()
+      } else Unauthorized
+    } getOrElse NotFound
  })

-  ajaxPost("/:owner/:repository/issues/new/label")(writableUsersOnly { repository =>
+  ajaxPost("/:owner/:repository/issues/new/label")(collaboratorsOnly { repository =>
    val labelNames = params("labelNames").split(",")
    val labels = getLabels(repository.owner, repository.name).filter(x => labelNames.contains(x.labelName))
    html.labellist(labels)
  })

-  ajaxPost("/:owner/:repository/issues/:id/label/new")(writableUsersOnly { repository =>
+  ajaxPost("/:owner/:repository/issues/:id/label/new")(collaboratorsOnly { repository =>
    defining(params("id").toInt){ issueId =>
      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 =>
+  ajaxPost("/:owner/:repository/issues/:id/label/delete")(collaboratorsOnly { repository =>
    defining(params("id").toInt){ issueId =>
      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 =>
+  ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
    Ok("updated")
  })

-  ajaxPost("/:owner/:repository/issues/:id/milestone")(writableUsersOnly { repository =>
+  ajaxPost("/:owner/:repository/issues/:id/milestone")(collaboratorsOnly { repository =>
    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) =>
        gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
-      } getOrElse NotFound()
+      } getOrElse NotFound
    } getOrElse Ok()
  })

-  post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
+  post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
    defining(params.get("value")){ action =>
      action match {
        case Some("open")  => executeBatch(repository) { issueId =>
@@ -300,22 +303,22 @@ trait IssuesControllerBase extends ControllerBase {
            handleComment(issue, None, repository, Some("close"))
          }
        }
-        case _ => BadRequest()
+        case _ => // TODO BadRequest
      }
    }
  })

-  post("/:owner/:repository/issues/batchedit/label")(writableUsersOnly { repository =>
+  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
    params("value").toIntOpt.map{ labelId =>
      executeBatch(repository) { issueId =>
        getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
          registerIssueLabel(repository.owner, repository.name, issueId, labelId)
        }
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

-  post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
+  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
    defining(assignedUserName("value")){ value =>
      executeBatch(repository) {
        updateAssignedUserName(repository.owner, repository.name, _, value)
@@ -323,7 +326,7 @@ trait IssuesControllerBase extends ControllerBase {
    }
  })

-  post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
+  post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
    defining(milestoneId("value")){ value =>
      executeBatch(repository) {
        updateMilestoneId(repository.owner, repository.name, _, value)
@@ -339,12 +342,15 @@ trait IssuesControllerBase extends ControllerBase {
          RawData(FileUtil.getMimeType(file.getName), file)
        }
      case _ => None
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
  val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)

+  private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
+    hasWritePermission(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+
  private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
    params("checked").split(',') map(_.toInt) foreach execute
    params("from") match {
@@ -355,31 +361,37 @@ trait IssuesControllerBase extends ControllerBase {

  private def searchIssues(repository: RepositoryService.RepositoryInfo) = {
    defining(repository.owner, repository.name){ case (owner, repoName) =>
-      val page = IssueSearchCondition.page(request)
+      val page       = IssueSearchCondition.page(request)
+      val sessionKey = Keys.Session.Issues(owner, repoName)

      // retrieve search condition
-      val condition = IssueSearchCondition(request)
+      val condition = session.putAndGet(sessionKey,
+        if(request.hasQueryString){
+          val q = request.getParameter("q")
+          if(q == null || q.trim.isEmpty){
+            IssueSearchCondition(request)
+          } else {
+            IssueSearchCondition(q, getMilestones(owner, repoName).map(x => (x.title, x.milestoneId)).toMap)
+          }
+        } else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
+      )

      html.list(
          "issues",
          searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
          page,
-          getAssignableUserNames(owner, repoName),
+          if(!getAccountByUserName(owner).exists(_.groupAccount)){
+            (getCollaborators(owner, repoName) :+ owner).sorted
+          } else {
+            getCollaborators(owner, repoName)
+          },
          getMilestones(owner, repoName),
          getLabels(owner, repoName),
          countIssue(condition.copy(state = "open"  ), false, owner -> repoName),
          countIssue(condition.copy(state = "closed"), false, owner -> repoName),
          condition,
          repository,
-          isIssueEditable(repository),
-          isIssueManageable(repository))
+          hasWritePermission(owner, repoName, context.loginAccount))
    }
  }
-
-  /**
-   * Tests whether an issue or a comment is editable by a logged-in user.
-   */
-  private def isEditableContent(owner: String, repository: String, author: String)(implicit context: Context): Boolean = {
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
-  }
 }
--- a/src/main/scala/gitbucket/core/controller/LabelsController.scala
+++ b/src/main/scala/gitbucket/core/controller/LabelsController.scala
@@ -2,7 +2,7 @@ package gitbucket.core.controller

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

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

 trait LabelsControllerBase extends ControllerBase {
  self: LabelsService with IssuesService with RepositoryService
-    with ReferrerAuthenticator with WritableUsersAuthenticator =>
+    with ReferrerAuthenticator with CollaboratorsAuthenticator =>

  case class LabelForm(labelName: String, color: String)

@@ -23,46 +23,45 @@ trait LabelsControllerBase extends ControllerBase {
    "labelColor" -> trim(label("Color",      text(required, color)))
  )(LabelForm.apply)

-
  get("/:owner/:repository/issues/labels")(referrersOnly { repository =>
    html.list(
      getLabels(repository.owner, repository.name),
      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
      repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })

-  ajaxGet("/:owner/:repository/issues/labels/new")(writableUsersOnly { repository =>
+  ajaxGet("/:owner/:repository/issues/labels/new")(collaboratorsOnly { repository =>
    html.edit(None, repository)
  })

-  ajaxPost("/:owner/:repository/issues/labels/new", labelForm)(writableUsersOnly { (form, repository) =>
+  ajaxPost("/:owner/:repository/issues/labels/new", labelForm)(collaboratorsOnly { (form, repository) =>
    val labelId = createLabel(repository.owner, repository.name, form.labelName, form.color.substring(1))
    html.label(
      getLabel(repository.owner, repository.name, labelId).get,
      // TODO futility
      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
      repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })

-  ajaxGet("/:owner/:repository/issues/labels/:labelId/edit")(writableUsersOnly { repository =>
+  ajaxGet("/:owner/:repository/issues/labels/:labelId/edit")(collaboratorsOnly { repository =>
    getLabel(repository.owner, repository.name, params("labelId").toInt).map { label =>
      html.edit(Some(label), repository)
    } getOrElse NotFound()
  })

-  ajaxPost("/:owner/:repository/issues/labels/:labelId/edit", labelForm)(writableUsersOnly { (form, repository) =>
+  ajaxPost("/:owner/:repository/issues/labels/:labelId/edit", labelForm)(collaboratorsOnly { (form, repository) =>
    updateLabel(repository.owner, repository.name, params("labelId").toInt, form.labelName, form.color.substring(1))
    html.label(
      getLabel(repository.owner, repository.name, params("labelId").toInt).get,
      // TODO futility
      countIssueGroupByLabels(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
      repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })

-  ajaxPost("/:owner/:repository/issues/labels/:labelId/delete")(writableUsersOnly { repository =>
+  ajaxPost("/:owner/:repository/issues/labels/:labelId/delete")(collaboratorsOnly { repository =>
    deleteLabel(repository.owner, repository.name, params("labelId").toInt)
    Ok()
  })
@@ -85,11 +84,7 @@ trait LabelsControllerBase extends ControllerBase {
    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.")
-      }
+      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
@@ -2,17 +2,17 @@ package gitbucket.core.controller

 import gitbucket.core.issues.milestones.html
 import gitbucket.core.service.{RepositoryService, MilestonesService, AccountService}
-import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.util.{ReferrerAuthenticator, CollaboratorsAuthenticator}
 import gitbucket.core.util.Implicits._
 import io.github.gitbucket.scalatra.forms._

 class MilestonesController extends MilestonesControllerBase
  with MilestonesService with RepositoryService with AccountService
-  with ReferrerAuthenticator with WritableUsersAuthenticator
+  with ReferrerAuthenticator with CollaboratorsAuthenticator

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

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

@@ -27,58 +27,58 @@ trait MilestonesControllerBase extends ControllerBase {
      params.getOrElse("state", "open"),
      getMilestonesWithIssueCount(repository.owner, repository.name),
      repository,
-      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })

-  get("/:owner/:repository/issues/milestones/new")(writableUsersOnly {
+  get("/:owner/:repository/issues/milestones/new")(collaboratorsOnly {
    html.edit(None, _)
  })

-  post("/:owner/:repository/issues/milestones/new", milestoneForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/issues/milestones/new", milestoneForm)(collaboratorsOnly { (form, repository) =>
    createMilestone(repository.owner, repository.name, form.title, form.description, form.dueDate)
    redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
  })

-  get("/:owner/:repository/issues/milestones/:milestoneId/edit")(writableUsersOnly { repository =>
+  get("/:owner/:repository/issues/milestones/:milestoneId/edit")(collaboratorsOnly { repository =>
    params("milestoneId").toIntOpt.map{ milestoneId =>
      html.edit(getMilestone(repository.owner, repository.name, milestoneId), repository)
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

-  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(collaboratorsOnly { (form, repository) =>
    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
        updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

-  get("/:owner/:repository/issues/milestones/:milestoneId/close")(writableUsersOnly { repository =>
+  get("/:owner/:repository/issues/milestones/:milestoneId/close")(collaboratorsOnly { repository =>
    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
        closeMilestone(milestone)
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

-  get("/:owner/:repository/issues/milestones/:milestoneId/open")(writableUsersOnly { repository =>
+  get("/:owner/:repository/issues/milestones/:milestoneId/open")(collaboratorsOnly { repository =>
    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
        openMilestone(milestone)
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

-  get("/:owner/:repository/issues/milestones/:milestoneId/delete")(writableUsersOnly { repository =>
+  get("/:owner/:repository/issues/milestones/:milestoneId/delete")(collaboratorsOnly { repository =>
    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
        deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

 }
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -6,32 +6,36 @@ import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.MergeService
 import gitbucket.core.service.IssuesService._
 import gitbucket.core.service.PullRequestService._
-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util._
+import gitbucket.core.view
+import gitbucket.core.view.helpers
+
 import io.github.gitbucket.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.PersonIdent
+import org.slf4j.LoggerFactory

 import scala.collection.JavaConverters._


 class PullRequestsController extends PullRequestsControllerBase
  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
-  with CommitsService with ActivityService with WebHookPullRequestService
-  with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
+  with CommitsService with ActivityService with WebHookPullRequestService with ReferrerAuthenticator with CollaboratorsAuthenticator
  with CommitStatusService with MergeService with ProtectedBranchService


 trait PullRequestsControllerBase extends ControllerBase {
  self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
-    with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService
-    with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
+    with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService with ReferrerAuthenticator with CollaboratorsAuthenticator
    with CommitStatusService with MergeService with ProtectedBranchService =>

+  private val logger = LoggerFactory.getLogger(classOf[PullRequestsControllerBase])
+
  val pullRequestForm = mapping(
    "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
    "content"               -> trim(label("Content", optional(text()))),
@@ -90,18 +94,17 @@ trait PullRequestsControllerBase extends ControllerBase {
            (commits.flatten.map(commit => getCommitComments(owner, name, commit.id, true)).flatten.toList ::: getComments(owner, name, issueId))
              .sortWith((a, b) => a.registeredDate before b.registeredDate),
            getIssueLabels(owner, name, issueId),
-            getAssignableUserNames(owner, name),
+            (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.groupAccount) Nil else List(owner))).sorted,
            getMilestonesWithIssueCount(owner, name),
            getLabels(owner, name),
            commits,
            diffs,
-            isEditable(repository),
-            isManageable(repository),
+            hasWritePermission(owner, name, context.loginAccount),
            repository,
            flash.toMap.map(f => f._1 -> f._2.toString))
        }
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(referrersOnly { repository =>
@@ -112,7 +115,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        val hasConflict = LockUtil.lock(s"${owner}/${name}"){
          checkConflict(owner, name, pullreq.branch, issueId)
        }
-        val hasMergePermission = hasDeveloperRole(owner, name, context.loginAccount)
+        val hasMergePermission = hasWritePermission(owner, name, context.loginAccount)
        val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
        val mergeStatus = PullRequestService.MergeStatus(
           hasConflict         = hasConflict,
@@ -122,7 +125,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           needStatusCheck     = context.loginAccount.map{ u =>
                                   branchProtection.needStatusCheck(u.userName)
                                 }.getOrElse(true),
-           hasUpdatePermission = hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount) &&
+           hasUpdatePermission = hasWritePermission(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount) &&
                                   context.loginAccount.map{ u =>
                                     !getProtectedBranchInfo(pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch).needStatusCheck(u.userName)
                                   }.getOrElse(false),
@@ -135,10 +138,10 @@ trait PullRequestsControllerBase extends ControllerBase {
          repository,
          getRepository(pullreq.requestUserName, pullreq.requestRepositoryName).get)
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

-  get("/:owner/:repository/pull/:id/delete/*")(writableUsersOnly { repository =>
+  get("/:owner/:repository/pull/:id/delete/*")(collaboratorsOnly { repository =>
    params("id").toIntOpt.map { issueId =>
      val branchName = multiParams("splat").head
      val userName   = context.loginAccount.get.userName
@@ -150,32 +153,32 @@ trait PullRequestsControllerBase extends ControllerBase {
      }
      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

-  post("/:owner/:repository/pull/:id/update_branch")(writableUsersOnly { baseRepository =>
+  post("/:owner/:repository/pull/:id/update_branch")(referrersOnly { baseRepository =>
    (for {
      issueId <- params("id").toIntOpt
      loginAccount <- context.loginAccount
      (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
      owner = pullreq.requestUserName
      name  = pullreq.requestRepositoryName
-      if hasDeveloperRole(owner, name, context.loginAccount)
+      if hasWritePermission(owner, name, context.loginAccount)
    } yield {
-      val repository = getRepository(owner, name).get
      val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
      if(branchProtection.needStatusCheck(loginAccount.userName)){
        flash += "error" -> s"branch ${pullreq.requestBranch} is protected need status check."
      } else {
+        val repository = getRepository(owner, name).get
        LockUtil.lock(s"${owner}/${name}"){
          val alias = if(pullreq.repositoryName == pullreq.requestRepositoryName && pullreq.userName == pullreq.requestUserName){
            pullreq.branch
-          } else {
+          }else{
            s"${pullreq.userName}:${pullreq.branch}"
          }
          val existIds = using(Git.open(Directory.getRepositoryDir(owner, name))) { git => JGitUtil.getAllCommitIds(git) }.toSet
          pullRemote(owner, name, pullreq.requestBranch, pullreq.userName, pullreq.repositoryName, pullreq.branch, loginAccount,
-                     s"Merge branch '${alias}' into ${pullreq.requestBranch}") match {
+                     "Merge branch '${alias}' into ${pullreq.requestBranch}") match {
            case None => // conflict
              flash += "error" -> s"Can't automatic merging branch '${alias}' into ${pullreq.requestBranch}."
            case Some(oldId) =>
@@ -184,10 +187,11 @@ trait PullRequestsControllerBase extends ControllerBase {

              using(Git.open(Directory.getRepositoryDir(owner, name))) { git =>
                //  after update branch
+
                val newCommitId = git.getRepository.resolve(s"refs/heads/${pullreq.requestBranch}")
                val commits = git.log.addRange(oldId, newCommitId).call.iterator.asScala.map(c => new JGitUtil.CommitInfo(c)).toList

-                commits.foreach { commit =>
+                commits.foreach{ commit =>
                  if(!existIds.contains(commit.id)){
                    createIssueComment(owner, name, commit)
                  }
@@ -198,7 +202,7 @@ trait PullRequestsControllerBase extends ControllerBase {

                // close issue by commit message
                if(pullreq.requestBranch == repository.repository.defaultBranch){
-                  commits.map { commit =>
+                  commits.map{ commit =>
                    closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
                  }
                }
@@ -216,13 +220,12 @@ trait PullRequestsControllerBase extends ControllerBase {
              flash += "info" -> s"Merge branch '${alias}' into ${pullreq.requestBranch}"
          }
        }
+        redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
      }
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

-  post("/:owner/:repository/pull/:id/merge", mergeForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
    params("id").toIntOpt.flatMap { issueId =>
      val owner = repository.owner
      val name  = repository.name
@@ -252,7 +255,10 @@ trait PullRequestsControllerBase extends ControllerBase {
              commits.flatten.foreach { commit =>
                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
              }
-              closeIssuesFromMessage(issue.title + " " + issue.content.getOrElse(""), loginAccount.userName, owner, name)
+              issue.content match {
+                case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name)
+                case _ =>
+              }
              closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
            }

@@ -270,7 +276,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          }
        }
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
@@ -287,7 +293,7 @@ trait PullRequestsControllerBase extends ControllerBase {

            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}")
          }
-        } getOrElse NotFound()
+        } getOrElse NotFound
      }
      case _ => {
        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
@@ -348,15 +354,7 @@ trait PullRequestsControllerBase extends ControllerBase {
              originRepository.owner, originRepository.name, oldId.getName,
              forkedRepository.owner, forkedRepository.name, newId.getName)

-            val title = if(commits.flatten.length == 1){
-              commits.flatten.head.shortMessage
-            } else {
-              val text = forkedId.replaceAll("[\\-_]", " ")
-              text.substring(0, 1).toUpperCase + text.substring(1)
-            }
-
            html.compare(
-              title,
              commits,
              diffs,
              (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
@@ -368,12 +366,11 @@ trait PullRequestsControllerBase extends ControllerBase {
              forkedId,
              oldId.getName,
              newId.getName,
-              getContentTemplate(originRepository, "PULL_REQUEST_TEMPLATE"),
              forkedRepository,
              originRepository,
              forkedRepository,
-              hasDeveloperRole(originRepository.owner, originRepository.name, context.loginAccount),
-              getAssignableUserNames(originRepository.owner, originRepository.name),
+              hasWritePermission(originRepository.owner, originRepository.name, context.loginAccount),
+              (getCollaborators(originRepository.owner, originRepository.name) ::: (if(getAccountByUserName(originRepository.owner).get.groupAccount) Nil else List(originRepository.owner))).sorted,
              getMilestones(originRepository.owner, originRepository.name),
              getLabels(originRepository.owner, originRepository.name)
            )
@@ -384,10 +381,10 @@ trait PullRequestsControllerBase extends ControllerBase {
                     s"${forkedOwner}:${newId.map(_ => forkedId).getOrElse(forkedRepository.repository.defaultBranch)}")
        }
      }
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

-  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(readableUsersOnly { forkedRepository =>
+  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { forkedRepository =>
    val Seq(origin, forked) = multiParams("splat")
    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)
@@ -414,37 +411,37 @@ trait PullRequestsControllerBase extends ControllerBase {
        }
        html.mergecheck(conflict)
      }
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

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

-      val issueId = insertIssue(
-        owner = repository.owner,
-        repository = repository.name,
-        loginUser = loginUserName,
-        title = form.title,
-        content = form.content,
-        assignedUserName = if (manageable) form.assignedUserName else None,
-        milestoneId = if (manageable) form.milestoneId else None,
-        isPullRequest = true)
+      val issueId = createIssue(
+        owner            = repository.owner,
+        repository       = repository.name,
+        loginUser        = loginUserName,
+        title            = form.title,
+        content          = form.content,
+        assignedUserName = if(writable) form.assignedUserName else None,
+        milestoneId      = if(writable) form.milestoneId else None,
+        isPullRequest    = true)

      createPullRequest(
-        originUserName = repository.owner,
-        originRepositoryName = repository.name,
-        issueId = issueId,
-        originBranch = form.targetBranch,
-        requestUserName = form.requestUserName,
+        originUserName        = repository.owner,
+        originRepositoryName  = repository.name,
+        issueId               = issueId,
+        originBranch          = form.targetBranch,
+        requestUserName       = form.requestUserName,
        requestRepositoryName = form.requestRepositoryName,
-        requestBranch = form.requestBranch,
-        commitIdFrom = form.commitIdFrom,
-        commitIdTo = form.commitIdTo)
+        requestBranch         = form.requestBranch,
+        commitIdFrom          = form.commitIdFrom,
+        commitIdTo            = form.commitIdTo)

      // insert labels
-      if (manageable) {
+      if(writable){
        form.labelNames.map { value =>
          val labels = getLabels(owner, name)
          value.split(",").foreach { labelName =>
@@ -469,7 +466,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)

        // notifications
-        Notifier().toNotify(repository, issue, form.content.getOrElse("")) {
+        Notifier().toNotify(repository, issue, form.content.getOrElse("")){
          Notifier.msgPullRequest(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
        }
      }
@@ -492,45 +489,53 @@ trait PullRequestsControllerBase extends ControllerBase {
      (defaultOwner, value)
    }

+  private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String,
+      requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) =
+    using(
+      Git.open(getRepositoryDir(userName, repositoryName)),
+      Git.open(getRepositoryDir(requestUserName, requestRepositoryName))
+    ){ (oldGit, newGit) =>
+      val oldId = oldGit.getRepository.resolve(branch)
+      val newId = newGit.getRepository.resolve(requestCommitId)
+
+      val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
+        new CommitInfo(revCommit)
+      }.toList.splitWith { (commit1, commit2) =>
+        helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
+      }
+
+      val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)
+
+      (commits, diffs)
+    }
+
  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
    defining(repository.owner, repository.name){ case (owner, repoName) =>
-      val page = IssueSearchCondition.page(request)
+      val page       = IssueSearchCondition.page(request)
+      val sessionKey = Keys.Session.Pulls(owner, repoName)

      // retrieve search condition
-      val condition = IssueSearchCondition(request)
+      val condition = session.putAndGet(sessionKey,
+        if(request.hasQueryString) IssueSearchCondition(request)
+        else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
+      )

      gitbucket.core.issues.html.list(
        "pulls",
        searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
        page,
-        getAssignableUserNames(owner, repoName),
+        if(!getAccountByUserName(owner).exists(_.groupAccount)){
+          (getCollaborators(owner, repoName) :+ owner).sorted
+        } else {
+          getCollaborators(owner, repoName)
+        },
        getMilestones(owner, repoName),
        getLabels(owner, repoName),
        countIssue(condition.copy(state = "open"  ), true, owner -> repoName),
        countIssue(condition.copy(state = "closed"), true, owner -> repoName),
        condition,
        repository,
-        isEditable(repository),
-        isManageable(repository))
+        hasWritePermission(owner, repoName, context.loginAccount))
    }

-  /**
-   * Tests whether an logged-in user can manage pull requests.
-   */
-  private def isManageable(repository: RepositoryInfo)(implicit context: Context): Boolean = {
-    hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-  }
-
-  /**
-   * Tests whether an logged-in user can post pull requests.
-   */
-  private def isEditable(repository: RepositoryInfo)(implicit context: Context): Boolean = {
-    repository.repository.options.issuesOption match {
-      case "ALL"     => !repository.repository.isPrivate && context.loginAccount.isDefined
-      case "PUBLIC"  => hasGuestRole(repository.owner, repository.name, context.loginAccount)
-      case "PRIVATE" => hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-      case "DISABLE" => false
-    }
-  }
-
 }
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -2,11 +2,11 @@ package gitbucket.core.controller

 import gitbucket.core.settings.html
 import gitbucket.core.model.WebHook
-import gitbucket.core.service._
+import gitbucket.core.service.{RepositoryService, AccountService, WebHookService, ProtectedBranchService, CommitStatusService}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.util._
 import gitbucket.core.util.JGitUtil._
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
 import io.github.gitbucket.scalatra.forms._
@@ -15,39 +15,23 @@ import org.scalatra.i18n.Messages
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.Constants
 import org.eclipse.jgit.lib.ObjectId
-import gitbucket.core.model.WebHookContentType
-import gitbucket.core.plugin.PluginRegistry


 class RepositorySettingsController extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
+  with RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService
  with OwnerAuthenticator with UsersAuthenticator

 trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService with DeployKeyService
+  self: RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService
    with OwnerAuthenticator with UsersAuthenticator =>

  // for repository options
-  case class OptionsForm(
-    repositoryName: String,
-    description: Option[String],
-    isPrivate: Boolean,
-    issuesOption: String,
-    externalIssuesUrl: Option[String],
-    wikiOption: String,
-    externalWikiUrl: Option[String],
-    allowFork: Boolean
-  )
-
+  case class OptionsForm(repositoryName: String, description: Option[String], isPrivate: Boolean)
+  
  val optionsForm = mapping(
-    "repositoryName"    -> trim(label("Repository Name"    , text(required, maxlength(100), identifier, 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()))
+    "repositoryName" -> trim(label("Repository Name", text(required, maxlength(40), identifier, renameRepositoryName))),
+    "description"    -> trim(label("Description"    , optional(text()))),
+    "isPrivate"      -> trim(label("Repository Type", boolean()))
  )(OptionsForm.apply)

  // for default branch
@@ -57,27 +41,21 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100))))
  )(DefaultBranchForm.apply)

+  // for collaborator addition
+  case class CollaboratorForm(userName: String)

-  // for deploy key
-  case class DeployKeyForm(title: String, publicKey: String, allowWrite: Boolean)
-
-  val deployKeyForm = mapping(
-    "title"      -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey"  -> trim(label("Key"  , text(required))), // TODO duplication check in the repository?
-    "allowWrite" -> trim(label("Key"  , boolean()))
-  )(DeployKeyForm.apply)
+  val collaboratorForm = mapping(
+    "userName" -> trim(label("Username", text(required, collaborator)))
+  )(CollaboratorForm.apply)

  // for web hook url addition
-  case class WebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
+  case class WebHookForm(url: String, events: Set[WebHook.Event], token: Option[String])

  def webHookForm(update:Boolean) = mapping(
    "url"    -> trim(label("url", text(required, webHook(update)))),
    "events" -> webhookEvents,
-    "ctype" -> label("ctype", text()),
    "token" -> optional(trim(label("token", text(maxlength(100)))))
-  )(
-    (url, events, ctype, token) => WebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
-  )
+  )(WebHookForm.apply)

  // for transfer ownership
  case class TransferOwnerShipForm(newOwner: String)
@@ -92,14 +70,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  get("/:owner/:repository/settings")(ownerOnly { repository =>
    redirect(s"/${repository.owner}/${repository.name}/settings/options")
  })
-
+  
  /**
   * Display the Options page.
   */
  get("/:owner/:repository/settings/options")(ownerOnly {
    html.options(_, flash.get("info"))
  })
-
+  
  /**
   * Save the repository options.
   */
@@ -109,13 +87,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      repository.name,
      form.description,
      repository.repository.parentUserName.map { _ =>
-        repository.repository.isPrivate
-      } getOrElse form.isPrivate,
-      form.issuesOption,
-      form.externalIssuesUrl,
-      form.wikiOption,
-      form.externalWikiUrl,
-      form.allowFork
+        repository.repository.`private`
+      } getOrElse form.isPrivate
    )
    // Change repository name
    if(repository.name != form.repositoryName){
@@ -123,27 +96,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
      // Move git repository
      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
-        if(dir.isDirectory){
-          FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
-        }
+        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
      }
      // Move wiki repository
      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
-        if(dir.isDirectory) {
-          FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
-        }
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
      }
-      // Move lfs directory
-      defining(getLfsDir(repository.owner, repository.name)){ dir =>
-        if(dir.isDirectory) {
-          FileUtils.moveDirectory(dir, getLfsDir(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))
    }
    flash += "info" -> "Repository settings has been updated."
    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
@@ -190,16 +148,26 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  get("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
    html.collaborators(
      getCollaborators(repository.owner, repository.name),
-      getAccountByUserName(repository.owner).get.isGroupAccount,
+      getAccountByUserName(repository.owner).get.groupAccount,
      repository)
  })

-  post("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
-    val collaborators = params("collaborators")
-    removeCollaborators(repository.owner, repository.name)
-    collaborators.split(",").withFilter(_.nonEmpty).map { collaborator =>
-      val userName :: role :: Nil = collaborator.split(":").toList
-      addCollaborator(repository.owner, repository.name, userName, role)
+  /**
+   * Add the collaborator.
+   */
+  post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
+    if(!getAccountByUserName(repository.owner).get.groupAccount){
+      addCollaborator(repository.owner, repository.name, form.userName)
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
+  })
+
+  /**
+   * Add the collaborator.
+   */
+  get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
+    if(!getAccountByUserName(repository.owner).get.groupAccount){
+      removeCollaborator(repository.owner, repository.name, params("name"))
    }
    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
  })
@@ -215,7 +183,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Display the web hook edit page.
   */
  get("/:owner/:repository/settings/hooks/new")(ownerOnly { repository =>
-    val webhook = WebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
+    val webhook = WebHook(repository.owner, repository.name, "", None)
    html.edithooks(webhook, Set(WebHook.Push), repository, flash.get("info"), true)
  })

@@ -223,7 +191,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Add the web hook URL.
   */
  post("/:owner/:repository/settings/hooks/new", webHookForm(false))(ownerOnly { (form, repository) =>
-    addWebHook(repository.owner, repository.name, form.url, form.events, form.ctype, form.token)
+    addWebHook(repository.owner, repository.name, form.url, form.events, form.token)
    flash += "info" -> s"Webhook ${form.url} created"
    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
  })
@@ -253,11 +221,10 @@ trait RepositorySettingsControllerBase extends ControllerBase {

      val url = params("url")
      val token = Some(params("token"))
-      val ctype = WebHookContentType.valueOf(params("ctype"))
-      val dummyWebHookInfo = WebHook(repository.owner, repository.name, url, ctype, token)
+      val dummyWebHookInfo = WebHook(repository.owner, repository.name, url, token)
      val dummyPayload = {
        val ownerAccount = getAccountByUserName(repository.owner).get
-        val commits = if(JGitUtil.isEmpty(git)) List.empty else git.log
+        val commits = if(repository.commitCount == 0) List.empty else git.log
          .add(git.getRepository.resolve(repository.repository.defaultBranch))
          .setMaxCount(4)
          .call.iterator.asScala.map(new CommitInfo(_)).toList
@@ -306,14 +273,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
    getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
      html.edithooks(webhook, events, repository, flash.get("info"), false)
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  /**
   * Update web hook settings.
   */
  post("/:owner/:repository/settings/hooks/edit", webHookForm(true))(ownerOnly { (form, repository) =>
-    updateWebHook(repository.owner, repository.name, form.url, form.events, form.ctype, form.token)
+    updateWebHook(repository.owner, repository.name, form.url, form.events, form.token)
    flash += "info" -> s"webhook ${form.url} updated"
    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
  })
@@ -322,7 +289,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Display the danger zone.
   */
  get("/:owner/:repository/settings/danger")(ownerOnly {
-    html.danger(_, flash.get("info"))
+    html.danger(_)
  })

  /**
@@ -336,27 +303,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
        renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
        // Move git repository
        defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
-          if(dir.isDirectory){
-            FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
-          }
+          FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
        }
        // Move wiki repository
        defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
-          if(dir.isDirectory) {
-            FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
-          }
+          FileUtils.moveDirectory(dir, getWikiRepositoryDir(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))
-          }
-        }
-        // Delere parent directory
-        FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
-
-        // Call hooks
-        PluginRegistry().getRepositoryHooks.foreach(_.transferred(repository.owner, form.newOwner, repository.name))
      }
    }
    redirect(s"/${form.newOwner}/${repository.name}")
@@ -367,54 +319,15 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   */
  post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
    LockUtil.lock(s"${repository.owner}/${repository.name}"){
-      // Delete the repository and related files
      deleteRepository(repository.owner, repository.name)

      FileUtils.deleteDirectory(getRepositoryDir(repository.owner, repository.name))
      FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
      FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
-      val lfsDir = getLfsDir(repository.owner, repository.name)
-      FileUtils.deleteDirectory(lfsDir)
-      FileUtil.deleteDirectoryIfEmpty(lfsDir.getParentFile())
-
-      // Call hooks
-      PluginRegistry().getRepositoryHooks.foreach(_.deleted(repository.owner, repository.name))
    }
-
    redirect(s"/${repository.owner}")
  })

-  /**
-   * Run GC
-   */
-  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();
-      }
-    }
-    flash += "info" -> "Garbage collection has been executed."
-    redirect(s"/${repository.owner}/${repository.name}/settings/danger")
-  })
-
-  /** List deploy keys */
-  get("/:owner/:repository/settings/deploykey")(ownerOnly { repository =>
-    html.deploykey(repository, getDeployKeys(repository.owner, repository.name))
-  })
-
-  /** Register a deploy key */
-  post("/:owner/:repository/settings/deploykey", deployKeyForm)(ownerOnly { (form, repository) =>
-    addDeployKey(repository.owner, repository.name, form.title, form.publicKey, form.allowWrite)
-    redirect(s"/${repository.owner}/${repository.name}/settings/deploykey")
-  })
-
-  /** Delete a deploy key */
-  get("/:owner/:repository/settings/deploykey/delete/:id")(ownerOnly { repository =>
-    val deployKeyId = params("id").toInt
-    deleteDeployKey(repository.owner, repository.name, deployKeyId)
-    redirect(s"/${repository.owner}/${repository.name}/settings/deploykey")
-  })
-
  /**
   * Provides duplication check for web hook url.
   */
@@ -444,20 +357,20 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    }
  }

-//  /**
-//   * Provides Constraint to validate the collaborator name.
-//   */
-//  private def collaborator: Constraint = new Constraint(){
-//    override def validate(name: String, value: String, messages: Messages): Option[String] =
-//      getAccountByUserName(value) match {
-//        case None => Some("User does not exist.")
-////        case Some(x) if(x.isGroupAccount)
-////                  => Some("User does not exist.")
-//        case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
-//                  => Some(value + " is repository owner.") // TODO also group members?
-//        case _    => None
-//      }
-//  }
+  /**
+   * Provides Constraint to validate the collaborator name.
+   */
+  private def collaborator: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None => Some("User does not exist.")
+        case Some(x) if(x.groupAccount)
+                  => Some("User does not exist.")
+        case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
+                  => Some("User can access this repository already.")
+        case _    => None
+      }
+  }

  /**
   * Duplicate check for the rename repository name.
@@ -471,15 +384,6 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      }
  }

-  /**
-   *
-   */
-  private def featureOption: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
-      if(Seq("DISABLE", "PRIVATE", "PUBLIC", "ALL").contains(value)) None else Some("Option is invalid.")
-  }
-
-
  /**
   * Provides Constraint to validate the repository transfer user.
   */
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -1,7 +1,6 @@
 package gitbucket.core.controller

-import java.io.FileInputStream
-import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}

 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.repo.html
@@ -10,15 +9,16 @@ import gitbucket.core.service._
 import gitbucket.core.util._
 import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.StringUtil._
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
 import gitbucket.core.model.{Account, WebHook}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers
+
 import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.io.IOUtils
+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
@@ -31,7 +31,7 @@ import org.scalatra._

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

 /**
@@ -39,7 +39,7 @@ class RepositoryViewerController extends RepositoryViewerControllerBase
 */
 trait RepositoryViewerControllerBase extends ControllerBase {
  self: RepositoryService with AccountService with ActivityService with IssuesService with WebHookService with CommitsService
-    with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator with PullRequestService with CommitStatusService
+    with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator with PullRequestService with CommitStatusService
    with WebHookPullRequestService with WebHookPullRequestReviewCommentService with ProtectedBranchService =>

  ArchiveCommand.registerFormat("zip", new ZipFormat)
@@ -102,47 +102,30 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   */
  post("/:owner/:repository/_preview")(referrersOnly { repository =>
    contentType = "text/html"
-    val filename = params.get("filename")
-    filename match {
-      case Some(f) => helpers.renderMarkup(
-          filePath = List(f),
-          fileContent = params("content"),
-          branch = "master",
-          repository = repository,
-          enableWikiLink = params("enableWikiLink").toBoolean,
-          enableRefsLink = params("enableRefsLink").toBoolean,
-          enableAnchor = false
-        )
-      case None => helpers.markdown(
-          markdown = params("content"),
-          repository = repository,
-          enableWikiLink = params("enableWikiLink").toBoolean,
-          enableRefsLink = params("enableRefsLink").toBoolean,
-          enableLineBreaks = params("enableLineBreaks").toBoolean,
-          enableTaskList = params("enableTaskList").toBoolean,
-          enableAnchor = false,
-          hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-        )
-    }
+    helpers.markdown(
+      markdown = params("content"),
+      repository = repository,
+      enableWikiLink = params("enableWikiLink").toBoolean,
+      enableRefsLink = params("enableRefsLink").toBoolean,
+      enableLineBreaks = params("enableLineBreaks").toBoolean,
+      enableTaskList = params("enableTaskList").toBoolean,
+      enableAnchor = false,
+      hasWritePermission = hasWritePermission(repository.owner, repository.name, context.loginAccount)
+    )
  })

  /**
   * Displays the file list of the repository root and the default branch.
   */
-  get("/:owner/:repository") {
-    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(_))
-    }
-  }
+  get("/:owner/:repository")(referrersOnly {
+    fileList(_)
+  })

  /**
   * Displays the file list of the specified path and branch.
   */
  get("/:owner/:repository/tree/*")(referrersOnly { repository =>
-    val (id, path) = repository.splitPath(multiParams("splat").head)
+    val (id, path) = splitPath(repository, multiParams("splat").head)
    if(path.isEmpty){
      fileList(repository, id)
    } else {
@@ -154,7 +137,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Displays the commit list of the specified resource.
   */
  get("/:owner/:repository/commits/*")(referrersOnly { repository =>
-    val (branchName, path) = repository.splitPath(multiParams("splat").head)
+    val (branchName, path) = splitPath(repository, multiParams("splat").head)
    val page = params.get("page").flatMap(_.toIntOpt).getOrElse(1)

    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
@@ -163,22 +146,22 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          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))
-        case Left(_) => NotFound()
+            }, page, hasNext, hasWritePermission(repository.owner, repository.name, context.loginAccount))
+        case Left(_) => NotFound
      }
    }
  })

-  get("/:owner/:repository/new/*")(writableUsersOnly { repository =>
-    val (branch, path) = repository.splitPath(multiParams("splat").head)
+  get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
    html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
-      None, JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
+      None, JGitUtil.ContentInfo("text", None, Some("UTF-8")),
      protectedBranch)
  })

-  get("/:owner/:repository/edit/*")(writableUsersOnly { repository =>
-    val (branch, path) = repository.splitPath(multiParams("splat").head)
+  get("/:owner/:repository/edit/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)

    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
@@ -189,12 +172,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
          JGitUtil.getContentInfo(git, path, objectId),
          protectedBranch)
-      } getOrElse NotFound()
+      } getOrElse NotFound
    }
  })

-  get("/:owner/:repository/remove/*")(writableUsersOnly { repository =>
-    val (branch, path) = repository.splitPath(multiParams("splat").head)
+  get("/:owner/:repository/remove/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))

@@ -202,11 +185,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        val paths = path.split("/")
        html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
          JGitUtil.getContentInfo(git, path, objectId))
-      } getOrElse NotFound()
+      } getOrElse NotFound
    }
  })

-  post("/:owner/:repository/create", editorForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/create", editorForm)(collaboratorsOnly { (form, repository) =>
    commitFile(
      repository  = repository,
      branch      = form.branch,
@@ -223,7 +206,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }")
  })

-  post("/:owner/:repository/update", editorForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/update", editorForm)(collaboratorsOnly { (form, repository) =>
    commitFile(
      repository  = repository,
      branch      = form.branch,
@@ -244,7 +227,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }")
  })

-  post("/:owner/:repository/remove", deleteForm)(writableUsersOnly { (form, repository) =>
+  post("/:owner/:repository/remove", deleteForm)(collaboratorsOnly { (form, repository) =>
    commitFile(repository, form.branch, form.path, None, Some(form.fileName), "", "",
      form.message.getOrElse(s"Delete ${form.fileName}"))

@@ -252,13 +235,17 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  })

  get("/:owner/:repository/raw/*")(referrersOnly { repository =>
-    val (id, path) = repository.splitPath(multiParams("splat").head)
+    val (id, path) = splitPath(repository, multiParams("splat").head)
    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      getPathObjectId(git, path, revCommit).map { objectId =>
-        responseRawFile(git, objectId, path, repository)
-      } getOrElse NotFound()
+      getPathObjectId(git, path, revCommit).flatMap { objectId =>
+        JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+          contentType = FileUtil.getMimeType(path)
+          response.setContentLength(loader.getSize.toInt)
+          loader.copyTo(response.outputStream)
+          ()
+        }
+      } getOrElse NotFound
    }
  })

@@ -266,36 +253,30 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Displays the file content of the specified branch or commit.
   */
  val blobRoute = get("/:owner/:repository/blob/*")(referrersOnly { repository =>
-    val (id, path) = repository.splitPath(multiParams("splat").head)
+    val (id, path) = splitPath(repository, multiParams("splat").head)
    val raw = params.get("raw").getOrElse("false").toBoolean
    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
      getPathObjectId(git, path, revCommit).map { objectId =>
        if(raw){
          // Download (This route is left for backword compatibility)
-          responseRawFile(git, objectId, path, repository)
+          JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
+            contentType = FileUtil.getMimeType(path)
+            response.setContentLength(loader.getSize.toInt)
+            loader.copyTo(response.outputStream)
+            ()
+          } getOrElse NotFound
        } else {
          html.blob(id, repository, path.split("/").toList,
            JGitUtil.getContentInfo(git, path, objectId),
            new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
-            hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-            request.paths(2) == "blame",
-            isLfsFile(git, objectId))
+            hasWritePermission(repository.owner, repository.name, context.loginAccount),
+            request.paths(2) == "blame")
        }
-      } getOrElse NotFound()
+      } getOrElse NotFound
    }
  })

-  private def isLfsFile(git: Git, objectId: ObjectId): Boolean = {
-    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/*"){
    blobRoute.action()
  }
@@ -304,7 +285,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Blame data.
   */
  ajaxGet("/:owner/:repository/get-blame/*")(referrersOnly { repository =>
-    val (id, path) = repository.splitPath(multiParams("splat").head)
+    val (id, path) = splitPath(repository, multiParams("splat").head)
    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
@@ -342,13 +323,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
              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))
+                getCommitComments(repository.owner, repository.name, id, false),
+                repository, diffs, oldCommitId, hasWritePermission(repository.owner, repository.name, context.loginAccount))
          }
        }
      }
    } catch {
-      case e:MissingObjectException => NotFound()
+      case e:MissingObjectException => NotFound
    }
  })

@@ -372,7 +353,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    html.commentform(
      commitId = id,
      fileName, oldLineNumber, newLineNumber, issueId,
-      hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+      hasWritePermission = hasWritePermission(repository.owner, repository.name, context.loginAccount),
      repository = repository
    )
  })
@@ -388,14 +369,15 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        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)
+    helper.html.commitcomment(comment, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
  })

  ajaxGet("/:owner/:repository/commit_comments/_data/:id")(readableUsersOnly { repository =>
    getCommitComment(repository.owner, repository.name, params("id")) map { x =>
      if(isEditable(x.userName, x.repositoryName, x.commentedUserName)){
        params.get("dataType") collect {
-          case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+          case t if t == "html" => html.editcomment(
+            x.content, x.commentId, x.userName, x.repositoryName)
        } getOrElse {
          contentType = formats("json")
          org.json4s.jackson.Serialization.write(
@@ -407,12 +389,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                enableRefsLink = true,
                enableAnchor = true,
                enableLineBreaks = true,
-                hasWritePermission = true
+                hasWritePermission = isEditable(x.userName, x.repositoryName, x.commentedUserName)
              )
            ))
        }
-      } else Unauthorized()
-    } getOrElse NotFound()
+      } else Unauthorized
+    } getOrElse NotFound
  })

  ajaxPost("/:owner/:repository/commit_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
@@ -421,8 +403,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        if(isEditable(owner, name, comment.commentedUserName)){
          updateCommitComment(comment.commentId, form.content)
          redirect(s"/${owner}/${name}/commit_comments/_data/${comment.commentId}")
-        } else Unauthorized()
-      } getOrElse NotFound()
+        } else Unauthorized
+      } getOrElse NotFound
    }
  })

@@ -431,8 +413,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      getCommitComment(owner, name, params("id")).map { comment =>
        if(isEditable(owner, name, comment.commentedUserName)){
          Ok(deleteCommitComment(comment.commentId))
-        } else Unauthorized()
-      } getOrElse NotFound()
+        } else Unauthorized
+      } getOrElse NotFound
    }
  })

@@ -451,13 +433,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    .map(br => (br, getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId), protectedBranches.contains(br.name)))
    .reverse

-    html.branches(branches, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
+    html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
  })

  /**
   * Creates a branch.
   */
-  post("/:owner/:repository/branches")(writableUsersOnly { repository =>
+  post("/:owner/:repository/branches")(collaboratorsOnly { repository =>
    val newBranchName = params.getOrElse("new", halt(400))
    val fromBranchName = params.getOrElse("from", halt(400))
    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
@@ -475,7 +457,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  /**
   * Deletes branch.
   */
-  get("/:owner/:repository/delete/*")(writableUsersOnly { repository =>
+  get("/:owner/:repository/delete/*")(collaboratorsOnly { repository =>
    val branchName = multiParams("splat").head
    val userName   = context.loginAccount.get.userName
    if(repository.repository.defaultBranch != branchName){
@@ -503,25 +485,19 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        archiveRepository(name, ".zip", repository)
      case name if name.endsWith(".tar.gz") =>
        archiveRepository(name, ".tar.gz", repository)
-      case _ => BadRequest()
+      case _ => BadRequest
    }
  })

  get("/:owner/:repository/network/members")(referrersOnly { repository =>
-    if(repository.repository.options.allowFork) {
-      html.forked(
-        getRepository(
-          repository.repository.originUserName.getOrElse(repository.owner),
-          repository.repository.originRepositoryName.getOrElse(repository.name)),
-        getForkedRepositories(
-          repository.repository.originUserName.getOrElse(repository.owner),
-          repository.repository.originRepositoryName.getOrElse(repository.name)),
-        context.loginAccount match {
-          case None => List()
-          case account: Option[Account] => getGroupsByUserName(account.get.userName)
-        }, // groups of current user
-        repository)
-    } else BadRequest()
+    html.forked(
+      getRepository(
+        repository.repository.originUserName.getOrElse(repository.owner),
+        repository.repository.originRepositoryName.getOrElse(repository.name)),
+      getForkedRepositories(
+        repository.repository.originUserName.getOrElse(repository.owner),
+        repository.repository.originRepositoryName.getOrElse(repository.name)),
+      repository)
  })

  /**
@@ -531,8 +507,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      val ref = multiParams("splat").head
      JGitUtil.getTreeId(git, ref).map{ treeId =>
-        html.find(ref, treeId, repository)
-      } getOrElse NotFound()
+        html.find(ref,
+                  treeId,
+                  repository,
+                  context.loginAccount match {
+                    case None => List()
+                    case account: Option[Account] => getGroupsByUserName(account.get.userName)
+                  })
+      } getOrElse NotFound
    }
  })

@@ -547,6 +529,17 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }
  })

+  private def splitPath(repository: RepositoryService.RepositoryInfo, path: String): (String, String) = {
+    val id = repository.branchList.collectFirst {
+      case branch if(path == branch || path.startsWith(branch + "/")) => branch
+    } orElse repository.tags.collectFirst {
+      case tag if(path == tag.name || path.startsWith(tag.name + "/")) => tag.name
+    } getOrElse path.split("/")(0)
+
+    (id, path.substring(id.length).stripPrefix("/"))
+  }
+
+
  private val readmeFiles = PluginRegistry().renderableExtensions.map { extension =>
    s"readme.${extension}"
  } ++ Seq("readme.txt", "readme")
@@ -560,10 +553,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * @return HTML of the file list
   */
  private def fileList(repository: RepositoryService.RepositoryInfo, revstr: String = "", path: String = ".") = {
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      if(JGitUtil.isEmpty(git)){
-        html.guide(repository, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
-      } else {
+    if(repository.commitCount == 0){
+      html.guide(repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
+    } else {
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
        // get specified commit
        JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
          defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
@@ -582,17 +575,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {

            html.files(revision, repository,
              if(path == ".") Nil else path.split("/").toList, // current path
+              context.loginAccount match {
+                case None => List()
+                case account: Option[Account] => getGroupsByUserName(account.get.userName)
+              }, // groups of current user
              new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
-              JGitUtil.getCommitCount(repository.owner, repository.name, lastModifiedCommit.getName),
-              files,
-              readme,
-              hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+              files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount),
              getPullRequestFromBranch(repository.owner, repository.name, revstr, repository.repository.defaultBranch),
-              flash.get("info"),
-              flash.get("error")
-            )
+              flash.get("info"), flash.get("error"))
          }
-        } getOrElse NotFound()
+        } getOrElse NotFound
      }
    }
  }
@@ -612,18 +604,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        val headName = s"refs/heads/${branch}"
        val headTip  = git.getRepository.resolve(headName)

-        val permission = JGitUtil.processTree(git, headTip){ (path, tree) =>
-          // Add all entries except the editing file
+        JGitUtil.processTree(git, headTip){ (path, tree) =>
          if(!newPath.exists(_ == path) && !oldPath.exists(_ == path)){
            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
          }
-          // Retrieve permission if file exists to keep it
-          oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
-        }.flatten.headOption
+        }

        newPath.foreach { newPath =>
-          builder.add(JGitUtil.createDirCacheEntry(newPath,
-            permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
+          builder.add(JGitUtil.createDirCacheEntry(newPath, FileMode.REGULAR_FILE,
            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
        }
        builder.finish()
@@ -646,11 +634,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        updatePullRequests(repository.owner, repository.name, branch)

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

        // close issue by commit message
        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
@@ -668,8 +653,28 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }
  }

+  private def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
+    @scala.annotation.tailrec
+    def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true  => _getPathObjectId(path, walk)
+      case false => None
+    }
+
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
+      treeWalk.addTree(revCommit.getTree)
+      treeWalk.setRecursive(true)
+      _getPathObjectId(path, treeWalk)
+    }
+  }
+
  private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = {
    val revision = name.stripSuffix(suffix)
+    val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
+    if(workDir.exists) {
+      FileUtils.deleteDirectory(workDir)
+    }
+    workDir.mkdirs

    val filename = repository.name + "-" +
      (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + suffix
@@ -683,14 +688,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {

      git.archive
         .setFormat(suffix.tail)
-         .setTree(revCommit)
+         .setTree(revCommit.getTree)
         .setOutputStream(response.getOutputStream)
         .call()
    }
  }

  private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+    hasWritePermission(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+
+

  override protected def renderUncaughtException(e: Throwable)(implicit request: HttpServletRequest, response: HttpServletResponse): Unit = {
    e.printStackTrace()
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -1,19 +1,17 @@
 package gitbucket.core.controller

-import java.io.FileInputStream
-
 import gitbucket.core.admin.html
-import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
-import gitbucket.core.util.{AdminAuthenticator, Mailer}
+import gitbucket.core.service.{AccountService, SystemSettingsService, RepositoryService}
+import gitbucket.core.util.AdminAuthenticator
 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.ControlUtil._
 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.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages

 class SystemSettingsController extends SystemSettingsControllerBase
@@ -41,7 +39,6 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
        "user"                     -> trim(label("SMTP User", optional(text()))),
        "password"                 -> trim(label("SMTP Password", optional(text()))),
        "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
-        "starttls"                 -> trim(label("Enable STARTTLS", optional(boolean()))),
        "fromAddress"              -> trim(label("FROM Address", optional(text()))),
        "fromName"                 -> trim(label("FROM Name", optional(text())))
    )(Smtp.apply)),
@@ -71,46 +68,34 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
    ).flatten
  }

-  private val sendMailForm = mapping(
-    "smtp"        -> mapping(
-      "host"        -> trim(label("SMTP Host", text(required))),
-      "port"        -> trim(label("SMTP Port", optional(number()))),
-      "user"        -> trim(label("SMTP User", optional(text()))),
-      "password"    -> trim(label("SMTP Password", optional(text()))),
-      "ssl"         -> trim(label("Enable SSL", optional(boolean()))),
-      "starttls"    -> trim(label("Enable STARTTLS", optional(boolean()))),
-      "fromAddress" -> trim(label("FROM Address", optional(text()))),
-      "fromName"    -> trim(label("FROM Name", optional(text())))
-    )(Smtp.apply),
-    "testAddress" -> trim(label("", text(required)))
-  )(SendMailForm.apply)
+  private val pluginForm = mapping(
+    "pluginId" -> list(trim(label("", text())))
+  )(PluginForm.apply)

-  case class SendMailForm(smtp: Smtp, testAddress: String)
+  case class PluginForm(pluginIds: List[String])

-  case class DataExportForm(tableNames: List[String])

  case class NewUserForm(userName: String, password: String, fullName: String,
                         mailAddress: String, isAdmin: Boolean,
-                         description: Option[String], url: Option[String], fileId: Option[String])
+                         url: Option[String], fileId: Option[String])

  case class EditUserForm(userName: String, password: Option[String], fullName: String,
-                          mailAddress: String, isAdmin: Boolean, description: Option[String], url: Option[String],
+                          mailAddress: String, isAdmin: Boolean, url: Option[String],
                          fileId: Option[String], clearImage: Boolean, isRemoved: Boolean)

-  case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
+  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
                          members: String)

-  case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String],
+  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
                           members: String, clearImage: Boolean, isRemoved: Boolean)


  val newUserForm = mapping(
-    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName))),
    "password"    -> trim(label("Password"     ,text(required, maxlength(20)))),
    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
    "isAdmin"     -> trim(label("User Type"    ,boolean())),
-    "description" -> trim(label("bio"          ,optional(text()))),
    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
    "fileId"      -> trim(label("File ID"      ,optional(text())))
  )(NewUserForm.apply)
@@ -121,7 +106,6 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
    "isAdmin"     -> trim(label("User Type"    ,boolean())),
-    "description" -> trim(label("bio"          ,optional(text()))),
    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
    "fileId"      -> trim(label("File ID"      ,optional(text()))),
    "clearImage"  -> trim(label("Clear image"  ,boolean())),
@@ -129,8 +113,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  )(EditUserForm.apply)

  val newGroupForm = mapping(
-    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "description" -> trim(label("Group description", optional(text()))),
+    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
    "fileId"    -> trim(label("File ID"    ,optional(text()))),
    "members"   -> trim(label("Members"    ,text(required, members)))
@@ -138,7 +121,6 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {

  val editGroupForm = mapping(
    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
-    "description" -> trim(label("Group description", optional(text()))),
    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
    "fileId"     -> trim(label("File ID"     ,optional(text()))),
    "members"    -> trim(label("Members"     ,text(required, members))),
@@ -167,19 +149,6 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
    redirect("/admin/system")
  })

-  post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
-    try {
-      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
-
-    } catch {
-      case e: Exception => "[Error] " + e.toString
-    }
-  })
-
  get("/admin/plugins")(adminOnly {
    html.plugins(PluginRegistry().getPlugins())
  })
@@ -188,7 +157,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  get("/admin/users")(adminOnly {
    val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
    val users          = getAllUsers(includeRemoved)
-    val members        = users.collect { case account if(account.isGroupAccount) =>
+    val members        = users.collect { case account if(account.groupAccount) =>
      account.userName -> getGroupMembers(account.userName).map(_.userName)
    }.toMap

@@ -200,48 +169,44 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  })

  post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
-    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.description, form.url)
+    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.url)
    updateImage(form.userName, form.fileId, false)
    redirect("/admin/users")
  })

  get("/admin/users/:userName/_edituser")(adminOnly {
    val userName = params("userName")
-    html.user(getAccountByUserName(userName, true), flash.get("error"))
+    html.user(getAccountByUserName(userName, true))
  })

  post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
    val userName = params("userName")
    getAccountByUserName(userName, true).map { account =>
-      if(account.isAdmin && (form.isRemoved || !form.isAdmin) && isLastAdministrator(account)){
-        flash += "error" -> "Account can't be turned off because this is last one administrator."
-        redirect(s"/admin/users/${userName}/_edituser")
-      } else {
-        if(form.isRemoved){
-          // Remove repositories
-          //        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
-          //          deleteRepository(userName, repositoryName)
-          //          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
-          //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
-          //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
-          //        }
-          // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
-          removeUserRelatedData(userName)
-        }

-        updateAccount(account.copy(
-          password     = form.password.map(sha1).getOrElse(account.password),
-          fullName     = form.fullName,
-          mailAddress  = form.mailAddress,
-          isAdmin      = form.isAdmin,
-          description  = form.description,
-          url          = form.url,
-          isRemoved    = form.isRemoved))
-
-        updateImage(userName, form.fileId, form.clearImage)
-        redirect("/admin/users")
+      if(form.isRemoved){
+        // Remove repositories
+        //        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
+        //          deleteRepository(userName, repositoryName)
+        //          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
+        //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
+        //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
+        //        }
+        // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+        removeUserRelatedData(userName)
      }
-    } getOrElse NotFound()
+
+      updateAccount(account.copy(
+        password      = form.password.map(sha1).getOrElse(account.password),
+        fullName      = form.fullName,
+        mailAddress   = form.mailAddress,
+        administrator = form.isAdmin,
+        url           = form.url,
+        removed       = form.isRemoved))
+
+      updateImage(userName, form.fileId, form.clearImage)
+      redirect("/admin/users")
+
+    } getOrElse NotFound
  })

  get("/admin/users/_newgroup")(adminOnly {
@@ -249,7 +214,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  })

  post("/admin/users/_newgroup", newGroupForm)(adminOnly { form =>
-    createGroup(form.groupName, form.description, form.url)
+    createGroup(form.groupName, form.url)
    updateGroupMembers(form.groupName, form.members.split(",").map {
      _.split(":") match {
        case Array(userName, isManager) => (userName, isManager.toBoolean)
@@ -272,7 +237,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
      }
    }.toList){ case (groupName, members) =>
      getAccountByUserName(groupName, true).map { account =>
-        updateGroup(groupName, form.description, form.url, form.isRemoved)
+        updateGroup(groupName, form.url, form.isRemoved)

        if(form.isRemoved){
          // Remove from GROUP_MEMBER
@@ -287,43 +252,22 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
        } else {
          // Update GROUP_MEMBER
          updateGroupMembers(form.groupName, members)
-//          // Update COLLABORATOR for group repositories
-//          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-//            removeCollaborators(form.groupName, repositoryName)
-//            members.foreach { case (userName, isManager) =>
-//              addCollaborator(form.groupName, repositoryName, userName)
-//            }
-//          }
+          // Update COLLABORATOR for group repositories
+          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+            removeCollaborators(form.groupName, repositoryName)
+            members.foreach { case (userName, isManager) =>
+              addCollaborator(form.groupName, repositoryName, userName)
+            }
+          }
        }

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

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

-  get("/admin/data")(adminOnly {
-    import gitbucket.core.util.JDBCUtil._
-    val session = request2Session(request)
-    html.data(session.conn.allTableNames())
-  })
-
-  post("/admin/export")(adminOnly {
-    import gitbucket.core.util.JDBCUtil._
-    val file = request2Session(request).conn.exportAsSQL(request.getParameterValues("tableNames").toSeq)
-
-    contentType = "application/octet-stream"
-    response.setHeader("Content-Disposition", "attachment; filename=" + file.getName)
-    response.setContentLength(file.length.toInt)
-
-    using(new FileInputStream(file)){ in =>
-      IOUtils.copy(in, response.outputStream)
-    }
-
-    ()
-  })
-
  private def members: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] = {
      if(value.split(",").exists {
--- a/src/main/scala/gitbucket/core/controller/WikiController.scala
+++ b/src/main/scala/gitbucket/core/controller/WikiController.scala
@@ -1,26 +1,24 @@
 package gitbucket.core.controller

-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.wiki.html
-import gitbucket.core.service.{AccountService, ActivityService, RepositoryService, WikiService}
+import gitbucket.core.service.{RepositoryService, WikiService, ActivityService, AccountService}
 import gitbucket.core.util._
 import gitbucket.core.util.StringUtil._
-import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
 import io.github.gitbucket.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages

-class WikiController extends WikiControllerBase
-  with WikiService with RepositoryService with AccountService with ActivityService
-  with ReadableUsersAuthenticator with ReferrerAuthenticator
+class WikiController extends WikiControllerBase 
+  with WikiService with RepositoryService with AccountService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator

 trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with ActivityService with ReadableUsersAuthenticator with ReferrerAuthenticator =>
+  self: WikiService with RepositoryService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator =>

  case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
-
+  
  val newForm = mapping(
    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename, unique))),
    "content"         -> trim(label("Content"           , text(required, conflictForNew))),
@@ -28,7 +26,7 @@ trait WikiControllerBase extends ControllerBase {
    "currentPageName" -> trim(label("Current page name" , text())),
    "id"              -> trim(label("Latest commit id"  , text()))
  )(WikiPageEditForm.apply)
-
+  
  val editForm = mapping(
    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename))),
    "content"         -> trim(label("Content"           , text(required, conflictForEdit))),
@@ -36,162 +34,149 @@ trait WikiControllerBase extends ControllerBase {
    "currentPageName" -> trim(label("Current page name" , text(required))),
    "id"              -> trim(label("Latest commit id"  , text(required)))
  )(WikiPageEditForm.apply)
-
+  
  get("/:owner/:repository/wiki")(referrersOnly { repository =>
    getWikiPage(repository.owner, repository.name, "Home").map { page =>
      html.page("Home", page, getWikiPageList(repository.owner, repository.name),
-        repository, isEditable(repository),
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount),
        getWikiPage(repository.owner, repository.name, "_Sidebar"),
        getWikiPage(repository.owner, repository.name, "_Footer"))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
  })
-
+  
  get("/:owner/:repository/wiki/:page")(referrersOnly { repository =>
    val pageName = StringUtil.urlDecode(params("page"))

    getWikiPage(repository.owner, repository.name, pageName).map { page =>
      html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
-        repository, isEditable(repository),
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount),
        getWikiPage(repository.owner, repository.name, "_Sidebar"),
        getWikiPage(repository.owner, repository.name, "_Footer"))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
  })
-
+  
  get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
    val pageName = StringUtil.urlDecode(params("page"))

    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
-        case Right((logs, hasNext)) => html.history(Some(pageName), logs, repository, isEditable(repository))
-        case Left(_) => NotFound()
+        case Right((logs, hasNext)) => html.history(Some(pageName), logs, repository)
+        case Left(_) => NotFound
      }
    }
  })
-
+  
  get("/:owner/:repository/wiki/:page/_compare/:commitId")(referrersOnly { repository =>
    val pageName = StringUtil.urlDecode(params("page"))
    val Array(from, to) = params("commitId").split("\\.\\.\\.")

    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).filter(_.newPath == pageName + ".md"), repository,
-        isEditable(repository), flash.get("info"))
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
    }
  })
-
+  
  get("/:owner/:repository/wiki/_compare/:commitId")(referrersOnly { repository =>
    val Array(from, to) = params("commitId").split("\\.\\.\\.")

    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
-        isEditable(repository), flash.get("info"))
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
    }
  })

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

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

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

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

-  get("/:owner/:repository/wiki/:page/_edit")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
-      val pageName = StringUtil.urlDecode(params("page"))
-      html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
-    } else Unauthorized()
+  get("/:owner/:repository/wiki/:page/_edit")(collaboratorsOnly { repository =>
+    val pageName = StringUtil.urlDecode(params("page"))
+    html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
  })
-
-  post("/:owner/:repository/wiki/_edit", editForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){
-      defining(context.loginAccount.get){ loginAccount =>
-        saveWikiPage(
-          repository.owner,
-          repository.name,
-          form.currentPageName,
-          form.pageName,
-          appendNewLine(convertLineSeparator(form.content, "LF"), "LF"),
-          loginAccount,
-          form.message.getOrElse(""),
-          Some(form.id)
-        ).map { commitId =>
-          updateLastActivityDate(repository.owner, repository.name)
-          recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
-        }
-        if(notReservedPageName(form.pageName)) {
-          redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-        } else {
-          redirect(s"/${repository.owner}/${repository.name}/wiki")
-        }
-      }
-    } else Unauthorized()
-  })
-
-  get("/:owner/:repository/wiki/_new")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
-      html.edit("", None, repository)
-    } else Unauthorized()
-  })
-
-  post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){
-      defining(context.loginAccount.get){ loginAccount =>
-        saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
-          form.content, loginAccount, form.message.getOrElse(""), None)
-
+  
+  post("/:owner/:repository/wiki/_edit", editForm)(collaboratorsOnly { (form, repository) =>
+    defining(context.loginAccount.get){ loginAccount =>
+      saveWikiPage(
+        repository.owner,
+        repository.name,
+        form.currentPageName,
+        form.pageName,
+        appendNewLine(convertLineSeparator(form.content, "LF"), "LF"),
+        loginAccount,
+        form.message.getOrElse(""),
+        Some(form.id)
+      ).map { commitId =>
        updateLastActivityDate(repository.owner, repository.name)
-        recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
-
-        if(notReservedPageName(form.pageName)) {
-          redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-        } else {
-          redirect(s"/${repository.owner}/${repository.name}/wiki")
-        }
+        recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
      }
-    } else Unauthorized()
-  })
-
-  get("/:owner/:repository/wiki/:page/_delete")(readableUsersOnly { repository =>
-    if(isEditable(repository)){
-      val pageName = StringUtil.urlDecode(params("page"))
-
-      defining(context.loginAccount.get){ loginAccount =>
-        deleteWikiPage(repository.owner, repository.name, pageName, loginAccount.fullName, loginAccount.mailAddress, s"Destroyed ${pageName}")
-        updateLastActivityDate(repository.owner, repository.name)
-
+      if(notReservedPageName(form.pageName)) {
+        redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+      } else {
        redirect(s"/${repository.owner}/${repository.name}/wiki")
      }
-    } else Unauthorized()
+    }
  })
+  
+  get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
+    html.edit("", None, _)
+  })
+  
+  post("/:owner/:repository/wiki/_new", newForm)(collaboratorsOnly { (form, repository) =>
+    defining(context.loginAccount.get){ loginAccount =>
+      saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
+          form.content, loginAccount, form.message.getOrElse(""), None)

+      updateLastActivityDate(repository.owner, repository.name)
+      recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+
+      if(notReservedPageName(form.pageName)) {
+        redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+      } else {
+        redirect(s"/${repository.owner}/${repository.name}/wiki")
+      }
+    }
+  })
+  
+  get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository =>
+    val pageName = StringUtil.urlDecode(params("page"))
+
+    defining(context.loginAccount.get){ loginAccount =>
+      deleteWikiPage(repository.owner, repository.name, pageName, loginAccount.fullName, loginAccount.mailAddress, s"Destroyed ${pageName}")
+      updateLastActivityDate(repository.owner, repository.name)
+
+      redirect(s"/${repository.owner}/${repository.name}/wiki")
+    }
+  })
+  
  get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
-    html.pages(getWikiPageList(repository.owner, repository.name), repository, isEditable(repository))
+    html.pages(getWikiPageList(repository.owner, repository.name), repository,
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })
-
+  
  get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      JGitUtil.getCommitLog(git, "master") match {
-        case Right((logs, hasNext)) => html.history(None, logs, repository, isEditable(repository))
-        case Left(_) => NotFound()
+        case Right((logs, hasNext)) => html.history(None, logs, repository)
+        case Left(_) => NotFound
      }
    }
  })
@@ -201,7 +186,7 @@ trait WikiControllerBase extends ControllerBase {

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

  private def unique: Constraint = new Constraint(){
@@ -240,13 +225,4 @@ trait WikiControllerBase extends ControllerBase {

  private def targetWikiPage = getWikiPage(params("owner"), params("repository"), params("pageName"))

-  private def isEditable(repository: RepositoryInfo)(implicit context: Context): Boolean = {
-    repository.repository.options.wikiOption match {
-      case "ALL"     => !repository.repository.isPrivate && context.loginAccount.isDefined
-      case "PUBLIC"  => hasGuestRole(repository.owner, repository.name, context.loginAccount)
-      case "PRIVATE" => hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-      case "DISABLE" => false
-    }
-  }
-
 }
--- a/src/main/scala/gitbucket/core/model/AccessToken.scala
+++ b/src/main/scala/gitbucket/core/model/AccessToken.scala
@@ -2,8 +2,7 @@ package gitbucket.core.model


 trait AccessTokenComponent { self: Profile =>
-  import profile.api._
-
+  import profile.simple._
  lazy val AccessTokens = TableQuery[AccessTokens]

  class AccessTokens(tag: Tag) extends Table[AccessToken](tag, "ACCESS_TOKEN") {
--- a/src/main/scala/gitbucket/core/model/Account.scala
+++ b/src/main/scala/gitbucket/core/model/Account.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait AccountComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

  lazy val Accounts = TableQuery[Accounts]
@@ -11,7 +11,7 @@ trait AccountComponent { self: Profile =>
    val fullName = column[String]("FULL_NAME")
    val mailAddress = column[String]("MAIL_ADDRESS")
    val password = column[String]("PASSWORD")
-    val isAdmin = column[Boolean]("ADMINISTRATOR")
+    val administrator = column[Boolean]("ADMINISTRATOR")
    val url = column[String]("URL")
    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
    val updatedDate = column[java.util.Date]("UPDATED_DATE")
@@ -19,8 +19,7 @@ trait AccountComponent { self: Profile =>
    val image = column[String]("IMAGE")
    val groupAccount = column[Boolean]("GROUP_ACCOUNT")
    val removed = column[Boolean]("REMOVED")
-    val description = column[String]("DESCRIPTION")
-    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed, description.?) <> (Account.tupled, Account.unapply)
+    def * = (userName, fullName, mailAddress, password, administrator, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
  }
 }

@@ -29,13 +28,12 @@ case class Account(
  fullName: String,
  mailAddress: String,
  password: String,
-  isAdmin: Boolean,
+  administrator: Boolean,
  url: Option[String],
  registeredDate: java.util.Date,
  updatedDate: java.util.Date,
  lastLoginDate: Option[java.util.Date],
  image: Option[String],
-  isGroupAccount: Boolean,
-  isRemoved: Boolean,
-  description: Option[String]
+  groupAccount: Boolean,
+  removed: Boolean
 )
--- a/src/main/scala/gitbucket/core/model/Activity.scala
+++ b/src/main/scala/gitbucket/core/model/Activity.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait ActivityComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

  lazy val Activities = TableQuery[Activities]
--- a/src/main/scala/gitbucket/core/model/BasicTemplate.scala
+++ b/src/main/scala/gitbucket/core/model/BasicTemplate.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 protected[model] trait TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._

  trait BasicTemplate { self: Table[_] =>
    val userName = column[String]("USER_NAME")
@@ -10,7 +10,7 @@ protected[model] trait TemplateComponent { self: Profile =>
    def byRepository(owner: String, repository: String) =
      (userName === owner.bind) && (repositoryName === repository.bind)

-    def byRepository(userName: Rep[String], repositoryName: Rep[String]) =
+    def byRepository(userName: Column[String], repositoryName: Column[String]) =
      (this.userName === userName) && (this.repositoryName === repositoryName)
  }

@@ -20,7 +20,7 @@ protected[model] trait TemplateComponent { self: Profile =>
    def byIssue(owner: String, repository: String, issueId: Int) =
      byRepository(owner, repository) && (this.issueId === issueId.bind)

-    def byIssue(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) =
+    def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
      byRepository(userName, repositoryName) && (this.issueId === issueId)
  }

@@ -31,7 +31,7 @@ protected[model] trait TemplateComponent { self: Profile =>
    def byLabel(owner: String, repository: String, labelId: Int) =
      byRepository(owner, repository) && (this.labelId === labelId.bind)

-    def byLabel(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) =
+    def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
      byRepository(userName, repositoryName) && (this.labelId === labelId)

    def byLabel(owner: String, repository: String, labelName: String) =
@@ -44,7 +44,7 @@ protected[model] trait TemplateComponent { self: Profile =>
    def byMilestone(owner: String, repository: String, milestoneId: Int) =
      byRepository(owner, repository) && (this.milestoneId === milestoneId.bind)

-    def byMilestone(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) =
+    def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
      byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
  }

@@ -54,13 +54,13 @@ protected[model] trait TemplateComponent { self: Profile =>
    def byCommit(owner: String, repository: String, commitId: String) =
      byRepository(owner, repository) && (this.commitId === commitId)

-    def byCommit(owner: Rep[String], repository: Rep[String], commitId: Rep[String]) =
+    def byCommit(owner: Column[String], repository: Column[String], commitId: Column[String]) =
      byRepository(userName, repositoryName) && (this.commitId === commitId)
  }

  trait BranchTemplate extends BasicTemplate{ self: Table[_] =>
    val branch = column[String]("BRANCH")
    def byBranch(owner: String, repository: String, branchName: String) = byRepository(owner, repository) && (branch === branchName.bind)
-    def byBranch(owner: Rep[String], repository: Rep[String], branchName: Rep[String]) = byRepository(owner, repository) && (this.branch === branchName)
+    def byBranch(owner: Column[String], repository: Column[String], branchName: Column[String]) = byRepository(owner, repository) && (this.branch === branchName)
  }
 }
--- a/src/main/scala/gitbucket/core/model/Collaborator.scala
+++ b/src/main/scala/gitbucket/core/model/Collaborator.scala
@@ -1,14 +1,13 @@
 package gitbucket.core.model

 trait CollaboratorComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._

  lazy val Collaborators = TableQuery[Collaborators]

  class Collaborators(tag: Tag) extends Table[Collaborator](tag, "COLLABORATOR") with BasicTemplate {
    val collaboratorName = column[String]("COLLABORATOR_NAME")
-    val role = column[String]("ROLE")
-    def * = (userName, repositoryName, collaboratorName, role) <> (Collaborator.tupled, Collaborator.unapply)
+    def * = (userName, repositoryName, collaboratorName) <> (Collaborator.tupled, Collaborator.unapply)

    def byPrimaryKey(owner: String, repository: String, collaborator: String) =
      byRepository(owner, repository) && (collaboratorName === collaborator.bind)
@@ -18,23 +17,5 @@ trait CollaboratorComponent extends TemplateComponent { self: Profile =>
 case class Collaborator(
  userName: String,
  repositoryName: String,
-  collaboratorName: String,
-  role: String
+  collaboratorName: String
 )
-
-sealed abstract class Role(val name: String)
-
-object Role {
-  object ADMIN extends Role("ADMIN")
-  object DEVELOPER extends Role("DEVELOPER")
-  object GUEST extends Role("GUEST")
-
-//  val values: Vector[Permission] = Vector(ADMIN, WRITE, READ)
-//
-//  private val map: Map[String, Permission] = values.map(enum => enum.name -> enum).toMap
-//
-//  def apply(name: String): Permission = map(name)
-//
-//  def valueOf(name: String): Option[Permission] = map.get(name)
-
-}
--- a/src/main/scala/gitbucket/core/model/Comment.scala
+++ b/src/main/scala/gitbucket/core/model/Comment.scala
@@ -6,10 +6,12 @@ trait Comment {
 }

 trait IssueCommentComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

-  lazy val IssueComments = TableQuery[IssueComments]
+  lazy val IssueComments = new TableQuery(tag => new IssueComments(tag)){
+    def autoInc = this returning this.map(_.commentId)
+  }

  class IssueComments(tag: Tag) extends Table[IssueComment](tag, "ISSUE_COMMENT") with IssueTemplate {
    val commentId = column[Int]("COMMENT_ID", O AutoInc)
@@ -37,10 +39,12 @@ case class IssueComment (
 ) extends Comment

 trait CommitCommentComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

-  lazy val CommitComments = TableQuery[CommitComments]
+  lazy val CommitComments = new TableQuery(tag => new CommitComments(tag)){
+    def autoInc = this returning this.map(_.commentId)
+  }

  class CommitComments(tag: Tag) extends Table[CommitComment](tag, "COMMIT_COMMENT") with CommitTemplate {
    val commentId = column[Int]("COMMENT_ID", O AutoInc)
--- a/src/main/scala/gitbucket/core/model/CommitStatus.scala
+++ b/src/main/scala/gitbucket/core/model/CommitStatus.scala
@@ -1,7 +1,10 @@
 package gitbucket.core.model

+import scala.slick.lifted.MappedTo
+import scala.slick.jdbc._
+
 trait CommitStatusComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

  implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name , i => CommitState(i))
@@ -87,5 +90,7 @@ object CommitState {
    }
  }

+  implicit val getResult: GetResult[CommitState] = GetResult(r => CommitState(r.<<))
+  implicit val getResultOpt: GetResult[Option[CommitState]] = GetResult(r => r.<<?[String].map(CommitState(_)))
 }

--- a/src/main/scala/gitbucket/core/model/DeployKey.scala
+++ b/src/main/scala/gitbucket/core/model/DeployKey.scala
@@ -1,27 +0,0 @@
-package gitbucket.core.model
-
-trait DeployKeyComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
-
-  lazy val DeployKeys = TableQuery[DeployKeys]
-
-  class DeployKeys(tag: Tag) extends Table[DeployKey](tag, "DEPLOY_KEY") with BasicTemplate {
-    val deployKeyId = column[Int]("DEPLOY_KEY_ID", O AutoInc)
-    val title = column[String]("TITLE")
-    val publicKey = column[String]("PUBLIC_KEY")
-    val allowWrite = column[Boolean]("ALLOW_WRITE")
-    def * = (userName, repositoryName, deployKeyId, title, publicKey, allowWrite) <> (DeployKey.tupled, DeployKey.unapply)
-
-    def byPrimaryKey(userName: String, repositoryName: String, deployKeyId: Int) =
-      (this.userName === userName.bind) && (this.repositoryName === repositoryName.bind) && (this.deployKeyId === deployKeyId.bind)
-  }
-}
-
-case class DeployKey(
-  userName: String,
-  repositoryName: String,
-  deployKeyId: Int = 0,
-  title: String,
-  publicKey: String,
-  allowWrite: Boolean
-)
--- a/src/main/scala/gitbucket/core/model/GroupMembers.scala
+++ b/src/main/scala/gitbucket/core/model/GroupMembers.scala
@@ -1,20 +1,20 @@
 package gitbucket.core.model

 trait GroupMemberComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._

  lazy val GroupMembers = TableQuery[GroupMembers]

  class GroupMembers(tag: Tag) extends Table[GroupMember](tag, "GROUP_MEMBER") {
    val groupName = column[String]("GROUP_NAME", O PrimaryKey)
    val userName = column[String]("USER_NAME", O PrimaryKey)
-    val isManager = column[Boolean]("MANAGER")
-    def * = (groupName, userName, isManager) <> (GroupMember.tupled, GroupMember.unapply)
+    val manager = column[Boolean]("MANAGER")
+    def * = (groupName, userName, manager) <> (GroupMember.tupled, GroupMember.unapply)
  }
 }

 case class GroupMember(
  groupName: String,
  userName: String,
-  isManager: Boolean
+  manager: Boolean
 )
--- a/src/main/scala/gitbucket/core/model/Issue.scala
+++ b/src/main/scala/gitbucket/core/model/Issue.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait IssueComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

  lazy val IssueId = TableQuery[IssueId]
--- a/src/main/scala/gitbucket/core/model/IssueLabels.scala
+++ b/src/main/scala/gitbucket/core/model/IssueLabels.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait IssueLabelComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._

  lazy val IssueLabels = TableQuery[IssueLabels]

--- a/src/main/scala/gitbucket/core/model/Labels.scala
+++ b/src/main/scala/gitbucket/core/model/Labels.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait LabelComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._

  lazy val Labels = TableQuery[Labels]

@@ -12,7 +12,7 @@ trait LabelComponent extends TemplateComponent { self: Profile =>
    def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)

    def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], labelId: Rep[Int]) = byLabel(userName, repositoryName, labelId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
  }
 }

--- a/src/main/scala/gitbucket/core/model/Milestone.scala
+++ b/src/main/scala/gitbucket/core/model/Milestone.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait MilestoneComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

  lazy val Milestones = TableQuery[Milestones]
@@ -15,7 +15,7 @@ trait MilestoneComponent extends TemplateComponent { self: Profile =>
    def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply)

    def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) = byMilestone(userName, repositoryName, milestoneId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
  }
 }

--- a/src/main/scala/gitbucket/core/model/Plugin.scala
+++ b/src/main/scala/gitbucket/core/model/Plugin.scala
@@ -0,0 +1,19 @@
+package gitbucket.core.model
+
+trait PluginComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val Plugins = TableQuery[Plugins]
+
+  class Plugins(tag: Tag) extends Table[Plugin](tag, "PLUGIN"){
+    val pluginId = column[String]("PLUGIN_ID", O PrimaryKey)
+    val version = column[String]("VERSION")
+    def * = (pluginId, version) <> (Plugin.tupled, Plugin.unapply)
+  }
+}
+
+case class Plugin(
+  pluginId: String,
+  version: String
+)
--- a/src/main/scala/gitbucket/core/model/Profile.scala
+++ b/src/main/scala/gitbucket/core/model/Profile.scala
@@ -1,11 +1,9 @@
 package gitbucket.core.model

-import gitbucket.core.util.DatabaseConfig
-import com.github.takezoe.slick.blocking.BlockingJdbcProfile

 trait Profile {
-  val profile: BlockingJdbcProfile
-  import profile.blockingApi._
+  val profile: slick.driver.JdbcProfile
+  import profile.simple._

  /**
   * java.util.Date Mapped Column Types
@@ -18,8 +16,8 @@ trait Profile {
  /**
   * Extends Column to add conditional condition
   */
-  implicit class RichColumn(c1: Rep[Boolean]){
-    def &&(c2: => Rep[Boolean], guard: => Boolean): Rep[Boolean] = if(guard) c1 && c2 else c1
+  implicit class RichColumn(c1: Column[Boolean]){
+    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
  }

  /**
@@ -30,9 +28,7 @@ trait Profile {
 }

 trait ProfileProvider { self: Profile =>
-
-  lazy val profile = DatabaseConfig.slickDriver
-
+  val profile = slick.driver.H2Driver
 }

 trait CoreProfile extends ProfileProvider with Profile
@@ -53,7 +49,7 @@ trait CoreProfile extends ProfileProvider with Profile
  with SshKeyComponent
  with WebHookComponent
  with WebHookEventComponent
+  with PluginComponent
  with ProtectedBranchComponent
-  with DeployKeyComponent

 object Profile extends CoreProfile
--- a/src/main/scala/gitbucket/core/model/ProtectedBranch.scala
+++ b/src/main/scala/gitbucket/core/model/ProtectedBranch.scala
@@ -1,7 +1,10 @@
 package gitbucket.core.model

+import scala.slick.lifted.MappedTo
+import scala.slick.jdbc._
+
 trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

  lazy val ProtectedBranches = TableQuery[ProtectedBranches]
@@ -9,7 +12,7 @@ trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
    val statusCheckAdmin = column[Boolean]("STATUS_CHECK_ADMIN")
    def * = (userName, repositoryName, branch, statusCheckAdmin) <> (ProtectedBranch.tupled, ProtectedBranch.unapply)
    def byPrimaryKey(userName: String, repositoryName: String, branch: String) = byBranch(userName, repositoryName, branch)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], branch: Rep[String]) = byBranch(userName, repositoryName, branch)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], branch: Column[String]) = byBranch(userName, repositoryName, branch)
  }

  lazy val ProtectedBranchContexts = TableQuery[ProtectedBranchContexts]
--- a/src/main/scala/gitbucket/core/model/PullRequest.scala
+++ b/src/main/scala/gitbucket/core/model/PullRequest.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait PullRequestComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._

  lazy val PullRequests = TableQuery[PullRequests]

@@ -15,7 +15,7 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
    def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)

    def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
-    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], issueId: Rep[Int]) = byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
  }
 }

--- a/src/main/scala/gitbucket/core/model/Repository.scala
+++ b/src/main/scala/gitbucket/core/model/Repository.scala
@@ -1,67 +1,23 @@
 package gitbucket.core.model

 trait RepositoryComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._
  import self._

  lazy val Repositories = TableQuery[Repositories]

  class Repositories(tag: Tag) extends Table[Repository](tag, "REPOSITORY") with BasicTemplate {
-    val isPrivate            = column[Boolean]("PRIVATE")
-    val description          = column[String]("DESCRIPTION")
-    val defaultBranch        = column[String]("DEFAULT_BRANCH")
-    val registeredDate       = column[java.util.Date]("REGISTERED_DATE")
-    val updatedDate          = column[java.util.Date]("UPDATED_DATE")
-    val lastActivityDate     = column[java.util.Date]("LAST_ACTIVITY_DATE")
-    val originUserName       = column[String]("ORIGIN_USER_NAME")
+    val isPrivate = column[Boolean]("PRIVATE")
+    val description = column[String]("DESCRIPTION")
+    val defaultBranch = column[String]("DEFAULT_BRANCH")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
+    val originUserName = column[String]("ORIGIN_USER_NAME")
    val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
-    val parentUserName       = column[String]("PARENT_USER_NAME")
+    val parentUserName = column[String]("PARENT_USER_NAME")
    val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
-    val issuesOption         = column[String]("ISSUES_OPTION")
-    val externalIssuesUrl    = column[String]("EXTERNAL_ISSUES_URL")
-    val wikiOption           = column[String]("WIKI_OPTION")
-    val externalWikiUrl      = column[String]("EXTERNAL_WIKI_URL")
-    val allowFork            = column[Boolean]("ALLOW_FORK")
-
-    def * = (
-      (userName, repositoryName, isPrivate, description.?, defaultBranch,
-      registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?),
-      (issuesOption, externalIssuesUrl.?, wikiOption, externalWikiUrl.?, allowFork)
-    ).shaped <> (
-      { case (repository, options) =>
-        Repository(
-          repository._1,
-          repository._2,
-          repository._3,
-          repository._4,
-          repository._5,
-          repository._6,
-          repository._7,
-          repository._8,
-          repository._9,
-          repository._10,
-          repository._11,
-          repository._12,
-          RepositoryOptions.tupled.apply(options)
-        )
-      }, { (r: Repository) =>
-        Some(((
-          r.userName,
-          r.repositoryName,
-          r.isPrivate,
-          r.description,
-          r.defaultBranch,
-          r.registeredDate,
-          r.updatedDate,
-          r.lastActivityDate,
-          r.originUserName,
-          r.originRepositoryName,
-          r.parentUserName,
-          r.parentRepositoryName
-        ),(
-          RepositoryOptions.unapply(r.options).get
-        )))
-      })
+    def * = (userName, repositoryName, isPrivate, description.?, defaultBranch, registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?) <> (Repository.tupled, Repository.unapply)

    def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
  }
@@ -70,7 +26,7 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
 case class Repository(
  userName: String,
  repositoryName: String,
-  isPrivate: Boolean,
+  `private`: Boolean,
  description: Option[String],
  defaultBranch: String,
  registeredDate: java.util.Date,
@@ -79,14 +35,5 @@ case class Repository(
  originUserName: Option[String],
  originRepositoryName: Option[String],
  parentUserName: Option[String],
-  parentRepositoryName: Option[String],
-  options: RepositoryOptions
-)
-
-case class RepositoryOptions(
-  issuesOption: String,
-  externalIssuesUrl: Option[String],
-  wikiOption: String,
-  externalWikiUrl: Option[String],
-  allowFork: Boolean
+  parentRepositoryName: Option[String]
 )
--- a/src/main/scala/gitbucket/core/model/SshKey.scala
+++ b/src/main/scala/gitbucket/core/model/SshKey.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.model

 trait SshKeyComponent { self: Profile =>
-  import profile.api._
+  import profile.simple._

  lazy val SshKeys = TableQuery[SshKeys]

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Naoki Takezoe	8a9588f17f	Moving to Quill	2016-03-10 18:30:48 +09:00
Naoki Takezoe	682f3a4c10	Moving to Quill	2016-03-10 16:40:25 +09:00
Naoki Takezoe	dad29d93c2	Moving to Quill	2016-03-10 13:27:02 +09:00
Naoki Takezoe	fc99de8a65	Merge branch 'master' into quill # Conflicts: # build.sbt # src/main/scala/gitbucket/core/controller/AccountController.scala # src/main/scala/gitbucket/core/controller/UserManagementController.scala	2016-03-10 01:51:35 +09:00
Naoki Takezoe	bc4af8e7c1	Finished to move AccountService to quill	2016-03-07 10:05:51 +09:00
Naoki Takezoe	cb3a79c9b3	Move some methods of AccountService to quill	2016-03-06 14:20:32 +09:00
Naoki Takezoe	b775ce157f	Fix GroupMember model	2016-03-06 14:04:27 +09:00
Naoki Takezoe	cfcd250914	Introduction to quill	2016-03-03 18:36:52 +09:00
				`@@ -1 +0,0 @@`
				`addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")`
				`@@ -0,0 +1 @@`
				`ALTER TABLE ACCOUNT ADD COLUMN REMOVED BOOLEAN DEFAULT FALSE;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE COMMIT_COMMENT ALTER COLUMN FILE_NAME NVARCHAR(260);`
				`@@ -0,0 +1 @@`
				`ALTER TABLE WEB_HOOK ADD COLUMN TOKEN VARCHAR(100);`