Moving to Quill

2026-05-08 12:16:32 +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
350 changed files with 17606 additions and 27205 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +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
-
--- a/2
+++ b/2
@@ -187,7 +187,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2013-2016 GitBucket Team
+   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,10 +1,7 @@
 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
 --------
@@ -49,8 +46,6 @@ GitBucket has the plug-in system to extend GitBucket from outside of GitBucket.
 - [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)
- [gitbucket-network-plugin](https://github.com/mrkm4ntr/gitbucket-network-plugin)
- [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)

 You can find community plugins other than them at [gitbucket community plugins](http://gitbucket-plugins.github.io/).

@@ -61,89 +56,10 @@ Support
 - 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 API compatibility with GitHub, so we might reject if your request is against it.
+- First priority of GitBucket is easy installation and reproduce GitHub behavior, so we might reject if your request is against it.

 Release Notes
-------------
-### 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.7.0"
-val ScalatraVersion = "2.4.1"
-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,62 +10,55 @@ sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.11.8"
+scalaVersion := "2.11.7"

 // dependency settings
 resolvers ++= Seq(
  Classpaths.typesafeReleases,
-  "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.scala-lang.modules"   %% "scala-java8-compat"           % "0.7.0",
-  "org.eclipse.jgit"          % "org.eclipse.jgit.http.server" % "4.1.2.201602141800-r",
-  "org.eclipse.jgit"          % "org.eclipse.jgit.archive"     % "4.1.2.201602141800-r",
+  "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"       % "solidbase"                    % "1.0.0",
-  "io.github.gitbucket"       % "markedj"                      % "1.0.9",
-  "org.apache.commons"        % "commons-compress"             % "1.11",
+  "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.2.0",
-  "org.apache.tika"           % "tika-core"                    % "1.13",
+  "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.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.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.15",
+  "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",
-  "com.wix"                   % "wix-embedded-mysql"           % "1.0.3"          % "test",
-  "ru.yandex.qatools.embed"   % "postgresql-embedded"          % "1.14"           % "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", "-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
+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
@@ -80,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
@@ -105,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 }

@@ -162,55 +155,9 @@ executableKey := {
  log info s"built executable webapp ${outputFile}"
  outputFile
 }
-publishTo <<= version { (v: String) =>
-  val nexus = "https://oss.sonatype.org/"
-  if (v.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/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.12
+sbt.version=0.13.9
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,6 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

-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("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")
--- 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,14 +3,12 @@ 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 = "/";
        boolean forceHttps = false;

@@ -31,13 +29,7 @@ public class JettyLauncher {
            }
        }

-        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) {
@@ -51,9 +43,10 @@ public class JettyLauncher {
        WebAppContext context = new WebAppContext();

        File tmpDir = new File(getGitBucketHome(), "tmp");
-        if(!tmpDir.exists()){
-            tmpDir.mkdirs();
+        if(tmpDir.exists()){
+            deleteDirectory(tmpDir);
        }
+        tmpDir.mkdirs();
        context.setTempDirectory(tmpDir);

        ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
@@ -68,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.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/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,26 +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")
-  )
-)
--- a/src/main/scala/gitbucket/core/api/ApiBranch.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranch.scala
@@ -14,10 +14,3 @@ case class ApiBranch(
   "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,18 +0,0 @@
-package gitbucket.core.api
-
-import gitbucket.core.util.JGitUtil.FileInfo
-import org.apache.commons.codec.binary.Base64
-
-case class ApiContents(`type`: String, name: String, content: Option[String], encoding: Option[String])
-
-object ApiContents{
-  def apply(fileInfo: FileInfo, content: Option[Array[Byte]]): ApiContents = {
-    if(fileInfo.isDirectory) {
-      ApiContents("dir", fileInfo.name, None, None)
-    } else {
-      content.map(arr =>
-        ApiContents("file", fileInfo.name, Some(Base64.encodeBase64String(arr)), Some("base64"))
-      ).getOrElse(ApiContents("file", fileInfo.name, None, None))
-    }
-  }
-}
--- 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
@@ -31,8 +31,7 @@ case class ApiPullRequest(
 }

 object ApiPullRequest{
-  def apply(issue: Issue, pullRequest: PullRequest, headRepo: ApiRepository, baseRepo: ApiRepository, user: ApiUser): 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,
--- 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/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -14,7 +14,6 @@ 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


 class AccountController extends AccountControllerBase
@@ -39,7 +38,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  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()))),
@@ -69,7 +68,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  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))),
+    "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)))
@@ -115,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") {
@@ -156,8 +155,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  get("/:userName/_edit")(oneselfOnly {
    val userName = params("userName")
    getAccountByUserName(userName).map { x =>
-      html.edit(x, flash.get("info"), flash.get("error"))
-    } getOrElse NotFound()
+      html.edit(x, flash.get("info"))
+    } getOrElse NotFound
  })

  post("/:userName/_edit", editForm)(oneselfOnly { form =>
@@ -173,17 +172,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      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)
@@ -192,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 =>
@@ -235,7 +232,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        case _ => None
      }
      html.application(x, tokens, generatedToken)
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

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

  post("/register", newForm){ form =>
@@ -269,7 +266,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      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 {
@@ -319,18 +316,18 @@ trait AccountControllerBase extends AccountManagementControllerBase {

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

@@ -356,80 +353,76 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  })

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

-//          // Add collaborators for group repository
-//          val ownerAccount = getAccountByUserName(accountName).get
-//          if(ownerAccount.isGroupAccount){
-//            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)
-          // redirect to the repository
-          redirect(s"/${accountName}/${repository.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)
+        // redirect to the repository
+        redirect(s"/${accountName}/${repository.name}")
      }
-    } else BadRequest()
+    }
  })

  private def existsAccount: Constraint = new Constraint(){
@@ -454,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
@@ -7,10 +7,9 @@ import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service._
 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._
@@ -35,7 +34,7 @@ class ApiController extends ApiControllerBase
  with GroupManagerAuthenticator
  with ReferrerAuthenticator
  with ReadableUsersAuthenticator
-  with WritableUsersAuthenticator
+  with CollaboratorsAuthenticator

 trait ApiControllerBase extends ControllerBase {
  self: RepositoryService
@@ -52,154 +51,26 @@ trait ApiControllerBase extends ControllerBase {
    with GroupManagerAuthenticator
    with ReferrerAuthenticator
    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
-
-  /**
-    * 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
   */
  get("/api/v3/users/:userName") {
-    getAccountByUserName(params("userName")).filterNot(account => account.isGroupAccount).map { account =>
+    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/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" =>
-              content
-            case "application/vnd.github.v3.html" if isRenderable(f.name) =>
-              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" =>
-              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, content)))
-          }
-        }).getOrElse(NotFound())
-      } else { // directory
-        JsonFormat(fileList.map{f => ApiContents(f, 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().getRef(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
@@ -221,7 +92,7 @@ trait ApiControllerBase extends ControllerBase {
          )
        }
      }
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  /**
@@ -245,12 +116,10 @@ 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{
@@ -263,7 +132,7 @@ trait ApiControllerBase extends ControllerBase {
        disableBranchProtection(repository.owner, repository.name, branch)
      }
      JsonFormat(ApiBranch(branch, protection)(RepositoryName(repository)))
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  /**
@@ -285,7 +154,7 @@ trait ApiControllerBase extends ControllerBase {
      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)
  })

  /**
@@ -301,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
  })

  /**
@@ -328,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 {
@@ -353,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 {
@@ -379,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)
@@ -392,28 +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,
        pullRequest,
        ApiRepository(headRepo, ApiUser(headOwner)),
        ApiRepository(repository, ApiUser(baseOwner)),
-        ApiUser(issueUser)
-      )
-    })
+        ApiUser(issueUser)) })
  })

  /**
@@ -435,7 +294,7 @@ trait ApiControllerBase extends ControllerBase {
        ApiRepository(headRepo, ApiUser(headOwner)),
        ApiRepository(repository, ApiUser(baseOwner)),
        ApiUser(issueUser)))
-    }) getOrElse NotFound()
+    }).getOrElse(NotFound)
  })

  /**
@@ -454,7 +313,7 @@ trait ApiControllerBase extends ControllerBase {
          JsonFormat(commits)
        }
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  /**
@@ -467,7 +326,7 @@ 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)
@@ -479,7 +338,7 @@ trait ApiControllerBase extends ControllerBase {
      status <- getCommitStatus(repository.owner, repository.name, statusId)
    } yield {
      JsonFormat(ApiCommitStatus(status, ApiUser(creator)))
-    }) getOrElse NotFound()
+    }) getOrElse NotFound
  })

  /**
@@ -495,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
  })

  /**
@@ -520,11 +379,11 @@ trait ApiControllerBase extends ControllerBase {
    } 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
+    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
@@ -50,7 +50,7 @@ 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 {
@@ -191,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.
@@ -245,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
@@ -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),
-      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true),
-      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),
-      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true),
-      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.{AccountService, RepositoryService}
-import gitbucket.core.servlet.Database
-import gitbucket.core.util._
+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.{FileMode, Constants}
-import org.scalatra
 import org.scalatra._
 import org.scalatra.servlet.{MultipartConfig, FileUploadSupport, FileItem}
-import org.apache.commons.io.{IOUtils, FileUtils}
+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,71 +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
-      collaboratorsOnly(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 collaboratorsOnly(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
-    implicit val session = Database.getSession(request)
-    loginAccount match {
-      case x if(x.isAdmin) => action
-      case x if(getCollaborators(owner, repository).contains(x.userName)) => action
-      case _ => 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,13 +1,14 @@
 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.ControlUtil._
-import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, StringUtil, UsersAuthenticator}
+import gitbucket.core.util.{LDAPUtil, Keys, UsersAuthenticator, ReferrerAuthenticator, StringUtil}
+
 import io.github.gitbucket.scalatra.forms._
-import org.scalatra.Ok


 class IndexController extends IndexControllerBase 
@@ -81,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.
   */
@@ -117,29 +109,16 @@ 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?
@@ -159,21 +138,13 @@ trait IndexControllerBase extends ControllerBase {

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

        case _ => gitbucket.core.search.html.code(
          searchFiles(repository.owner, repository.name, query),
          countIssues(repository.owner, repository.name, query),
-          countWikiPages(repository.owner, repository.name, query),
          query, page, repository)
      }
    }
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -2,24 +2,24 @@ package gitbucket.core.controller

 import gitbucket.core.issues.html
 import gitbucket.core.service.IssuesService._
-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service._
 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.Ok


 class IssuesController extends IssuesControllerBase
  with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService with HandleCommentService
-  with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator with PullRequestService with WebHookIssueCommentService
+  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 ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator with PullRequestService with WebHookIssueCommentService =>
+    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])
@@ -67,149 +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),
-          isEditable(repository),
-          isManageable(repository),
+          hasWritePermission(owner, name, context.loginAccount),
          repository)
-      } getOrElse NotFound()
+      } getOrElse NotFound
    }
  })

  get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    if(isEditable(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),
-          isManageable(repository),
+          hasWritePermission(owner, name, context.loginAccount),
          repository)
-      }
-    } else Unauthorized()
+    }
  })

  post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    if(isEditable(repository)){ // TODO Should this check is provided by authenticator?
-      defining(repository.owner, repository.name){ case (owner, name) =>
-        val manageable = isManageable(repository)
-        val userName = context.loginAccount.get.userName
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      val writable = hasWritePermission(owner, name, context.loginAccount)
+      val userName = context.loginAccount.get.userName

-        // insert issue
-        val issueId = createIssue(owner, name, userName, form.title, form.content,
-          if (manageable) form.assignedUserName else None,
-          if (manageable) form.milestoneId else None)
+      // 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 (manageable) {
-          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)
-              }
+      // 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}")
      }
-    } else Unauthorized()
+
+      // 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(
@@ -223,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(
@@ -249,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 =>
@@ -311,17 +308,17 @@ trait IssuesControllerBase extends ControllerBase {
    }
  })

-  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)
@@ -329,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)
@@ -345,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 {
@@ -361,51 +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,
-          isEditable(repository),
-          isManageable(repository))
+          hasWritePermission(owner, repoName, context.loginAccount))
    }
  }
-
-  /**
-   * Tests whether an logged-in user can manage issues.
-   */
-  private def isManageable(repository: RepositoryInfo)(implicit context: Context): Boolean = {
-    hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
-  }
-
-  /**
-   * Tests whether an logged-in user can post issues.
-   */
-  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
-    }
-  }
-
-  /**
-   * 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,7 +6,6 @@ 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.ControlUtil._
 import gitbucket.core.util.Directory._
@@ -15,26 +14,28 @@ 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()))),
@@ -93,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 =>
@@ -115,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,
@@ -125,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),
@@ -138,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
@@ -153,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) =>
@@ -187,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)
                  }
@@ -201,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)
                  }
                }
@@ -219,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
@@ -255,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)
            }

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

  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
@@ -290,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 =>
@@ -351,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 {
@@ -374,8 +369,8 @@ trait PullRequestsControllerBase extends ControllerBase {
              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)
            )
@@ -386,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)
@@ -416,71 +411,67 @@ 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 editable = isEditable(repository)
+      val writable = hasWritePermission(owner, name, context.loginAccount)
+      val loginUserName = context.loginAccount.get.userName

-      if(editable) {
-        val loginUserName = context.loginAccount.get.userName
+      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)

-        val issueId = createIssue(
-          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)
+      createPullRequest(
+        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)

-        createPullRequest(
-          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)
-
-        // insert labels
-        if (manageable) {
-          form.labelNames.map { value =>
-            val labels = getLabels(owner, name)
-            value.split(",").foreach { labelName =>
-              labels.find(_.labelName == labelName).map { label =>
-                registerIssueLabel(repository.owner, repository.name, issueId, label.labelId)
-              }
+      // insert labels
+      if(writable){
+        form.labelNames.map { value =>
+          val labels = getLabels(owner, name)
+          value.split(",").foreach { labelName =>
+            labels.find(_.labelName == labelName).map { label =>
+              registerIssueLabel(repository.owner, repository.name, issueId, label.labelId)
            }
          }
        }
+      }

-        // fetch requested branch
-        fetchAsPullRequest(owner, name, form.requestUserName, form.requestRepositoryName, form.requestBranch, issueId)
+      // fetch requested branch
+      fetchAsPullRequest(owner, name, form.requestUserName, form.requestRepositoryName, form.requestBranch, issueId)

-        // record activity
-        recordPullRequestActivity(owner, name, loginUserName, issueId, form.title)
+      // record activity
+      recordPullRequestActivity(owner, name, loginUserName, issueId, form.title)

-        // call web hook
-        callPullRequestWebHook("opened", repository, issueId, context.baseUrl, context.loginAccount.get)
+      // call web hook
+      callPullRequestWebHook("opened", repository, issueId, context.baseUrl, context.loginAccount.get)

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

-          // notifications
-          Notifier().toNotify(repository, issue, form.content.getOrElse("")) {
-            Notifier.msgPullRequest(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
-          }
+        // notifications
+        Notifier().toNotify(repository, issue, form.content.getOrElse("")){
+          Notifier.msgPullRequest(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
        }
+      }

-        redirect(s"/${owner}/${name}/pull/${issueId}")
-      } else Unauthorized()
+      redirect(s"/${owner}/${name}/pull/${issueId}")
    }
  })

@@ -520,43 +511,31 @@ trait PullRequestsControllerBase extends ControllerBase {

  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
@@ -15,7 +15,6 @@ 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


 class RepositorySettingsController extends RepositorySettingsControllerBase
@@ -27,26 +26,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    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
@@ -56,24 +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)
-//
-//  val collaboratorForm = mapping(
-//    "userName" -> trim(label("Username", text(required, collaborator)))
-//  )(CollaboratorForm.apply)
+  // for collaborator addition
+  case class CollaboratorForm(userName: String)
+
+  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)
@@ -105,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){
@@ -171,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")
  })
@@ -196,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)
  })

@@ -204,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")
  })
@@ -234,8 +221,7 @@ 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(repository.commitCount == 0) List.empty else git.log
@@ -287,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")
  })
@@ -303,7 +289,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Display the danger zone.
   */
  get("/:owner/:repository/settings/danger")(ownerOnly {
-    html.danger(_, flash.get("info"))
+    html.danger(_)
  })

  /**
@@ -342,19 +328,6 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    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")
-  })
-
  /**
   * Provides duplication check for web hook url.
   */
@@ -384,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.
@@ -411,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
@@ -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)
@@ -110,27 +110,22 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      enableLineBreaks = params("enableLineBreaks").toBoolean,
      enableTaskList = params("enableTaskList").toBoolean,
      enableAnchor = false,
-      hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+      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 {
@@ -142,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 =>
@@ -151,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, 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 =>
@@ -177,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))

@@ -190,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,
@@ -211,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,
@@ -232,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}"))

@@ -240,7 +235,7 @@ 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).flatMap { objectId =>
@@ -250,7 +245,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          loader.copyTo(response.outputStream)
          ()
        }
-      } getOrElse NotFound()
+      } getOrElse NotFound
    }
  })

@@ -258,7 +253,7 @@ 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))
@@ -270,15 +265,15 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            response.setContentLength(loader.getSize.toInt)
            loader.copyTo(response.outputStream)
            ()
-          } getOrElse NotFound()
+          } 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),
+            hasWritePermission(repository.owner, repository.name, context.loginAccount),
            request.paths(2) == "blame")
        }
-      } getOrElse NotFound()
+      } getOrElse NotFound
    }
  })

@@ -290,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
@@ -329,12 +324,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                JGitUtil.getBranchesOfCommit(git, revCommit.getName),
                JGitUtil.getTagsOfCommit(git, revCommit.getName),
                getCommitComments(repository.owner, repository.name, id, false),
-                repository, diffs, oldCommitId, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+                repository, diffs, oldCommitId, hasWritePermission(repository.owner, repository.name, context.loginAccount))
          }
        }
      }
    } catch {
-      case e:MissingObjectException => NotFound()
+      case e:MissingObjectException => NotFound
    }
  })

@@ -358,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
    )
  })
@@ -374,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(
@@ -393,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) =>
@@ -407,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
    }
  })

@@ -417,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
    }
  })

@@ -437,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 =>
@@ -461,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){
@@ -489,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)
  })

  /**
@@ -517,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
    }
  })

@@ -533,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")
@@ -547,7 +554,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   */
  private def fileList(repository: RepositoryService.RepositoryInfo, revstr: String = "", path: String = ".") = {
    if(repository.commitCount == 0){
-      html.guide(repository, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+      html.guide(repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } else {
      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
        // get specified commit
@@ -568,12 +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
-              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"))
          }
-        } getOrElse NotFound()
+        } getOrElse NotFound
      }
    }
  }
@@ -593,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()
@@ -627,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)
@@ -691,7 +695,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  }

  private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+    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,10 +1,8 @@
 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._
@@ -13,7 +11,7 @@ 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
@@ -70,22 +68,12 @@ 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()))),
-      "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,
@@ -103,7 +91,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {


  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()))),
@@ -125,7 +113,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  )(EditUserForm.apply)

  val newGroupForm = mapping(
-    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
+    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
    "fileId"    -> trim(label("File ID"    ,optional(text()))),
    "members"   -> trim(label("Members"    ,text(required, members)))
@@ -161,18 +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.")
-
-      "Test mail has been sent to: " + form.testAddress
-
-    } catch {
-      case e: Exception => "[Error] " + e.toString
-    }
-  })
-
  get("/admin/plugins")(adminOnly {
    html.plugins(PluginRegistry().getPlugins())
  })
@@ -181,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,40 +176,37 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {

  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,
-          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 {
@@ -279,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,8 +1,7 @@
 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.ControlUtil._
@@ -13,11 +12,10 @@ 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
+  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)
  
@@ -40,7 +38,7 @@ trait WikiControllerBase extends ControllerBase {
  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")
@@ -51,7 +49,7 @@ trait WikiControllerBase extends ControllerBase {

    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")
@@ -62,8 +60,8 @@ trait WikiControllerBase extends ControllerBase {

    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
      }
    }
  })
@@ -74,7 +72,7 @@ trait WikiControllerBase extends ControllerBase {

    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"))
    }
  })
  
@@ -83,115 +81,102 @@ trait WikiControllerBase extends ControllerBase {

    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/Account.scala
+++ b/src/main/scala/gitbucket/core/model/Account.scala
@@ -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,7 +19,7 @@ trait AccountComponent { self: Profile =>
    val image = column[String]("IMAGE")
    val groupAccount = column[Boolean]("GROUP_ACCOUNT")
    val removed = column[Boolean]("REMOVED")
-    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
+    def * = (userName, fullName, mailAddress, password, administrator, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
  }
 }

@@ -28,12 +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
+  groupAccount: Boolean,
+  removed: Boolean
 )
--- a/src/main/scala/gitbucket/core/model/Collaborator.scala
+++ b/src/main/scala/gitbucket/core/model/Collaborator.scala
@@ -7,8 +7,7 @@ trait CollaboratorComponent extends TemplateComponent { self: Profile =>

  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/GroupMembers.scala
+++ b/src/main/scala/gitbucket/core/model/GroupMembers.scala
@@ -8,13 +8,13 @@ trait GroupMemberComponent { self: Profile =>
  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/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,6 +1,5 @@
 package gitbucket.core.model

-import gitbucket.core.util.DatabaseConfig

 trait Profile {
  val profile: slick.driver.JdbcProfile
@@ -29,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
@@ -52,6 +49,7 @@ trait CoreProfile extends ProfileProvider with Profile
  with SshKeyComponent
  with WebHookComponent
  with WebHookEventComponent
+  with PluginComponent
  with ProtectedBranchComponent

 object Profile extends CoreProfile
--- a/src/main/scala/gitbucket/core/model/Repository.scala
+++ b/src/main/scala/gitbucket/core/model/Repository.scala
@@ -7,61 +7,17 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
  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/WebHook.scala
+++ b/src/main/scala/gitbucket/core/model/WebHook.scala
@@ -3,42 +3,21 @@ package gitbucket.core.model
 trait WebHookComponent extends TemplateComponent { self: Profile =>
  import profile.simple._

-  implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
-  
  lazy val WebHooks = TableQuery[WebHooks]

  class WebHooks(tag: Tag) extends Table[WebHook](tag, "WEB_HOOK") with BasicTemplate {
    val url = column[String]("URL")
    val token = column[Option[String]]("TOKEN", O.Nullable)
-    val ctype = column[WebHookContentType]("CTYPE", O.NotNull)
-    def * = (userName, repositoryName, url, ctype, token) <> ((WebHook.apply _).tupled, WebHook.unapply)
+    def * = (userName, repositoryName, url, token) <> ((WebHook.apply _).tupled, WebHook.unapply)

    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
  }
 }

-case class WebHookContentType(val code: String, val ctype: String)
-
-object WebHookContentType {
-  object JSON extends WebHookContentType("json", "application/json")
-
-  object FORM extends WebHookContentType("form", "application/x-www-form-urlencoded")
-
-  val values: Vector[WebHookContentType] = Vector(JSON, FORM)
-
-  private val map: Map[String, WebHookContentType] = values.map(enum => enum.code -> enum).toMap
-
-  def apply(code: String): WebHookContentType = map(code)
-
-  def valueOf(code: String): WebHookContentType = map(code)
-  def valueOpt(code: String): Option[WebHookContentType] = map.get(code)
-}
-
 case class WebHook(
  userName: String,
  repositoryName: String,
  url: String,
-  ctype: WebHookContentType,
  token: Option[String]
 )

--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -1,18 +1,16 @@
 package gitbucket.core.plugin

 import javax.servlet.ServletContext
-import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
-import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.ControlUtil._
-import io.github.gitbucket.solidbase.model.Version
+import gitbucket.core.util.Version

 /**
 * Trait for define plugin interface.
- * To provide a plugin, put a Plugin class which extends this class into the package root.
+ * To provide plugin, put Plugin class which mixed in this trait into the package root.
 */
-abstract class Plugin {
+trait Plugin {

  val pluginId: String
  val pluginName: String
@@ -79,106 +77,6 @@ abstract class Plugin {
   */
  def receiveHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[ReceiveHook] = Nil

-  /**
-   * Override to add global menus.
-   */
-  val globalMenus: Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add global menus.
-   */
-  def globalMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add repository menus.
-   */
-  val repositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add repository menus.
-   */
-  def repositoryMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add repository setting tabs.
-   */
-  val repositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add repository setting tabs.
-   */
-  def repositorySettingTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add profile tabs.
-   */
-  val profileTabs: Seq[(Account, Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add profile tabs.
-   */
-  def profileTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Account, Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add system setting menus.
-   */
-  val systemSettingMenus: Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add system setting menus.
-   */
-  def systemSettingMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add account setting menus.
-   */
-  val accountSettingMenus: Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add account setting menus.
-   */
-  def accountSettingMenus(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add dashboard tabs.
-   */
-  val dashboardTabs: Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add dashboard tabs.
-   */
-  def dashboardTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
-
-  /**
-   * Override to add assets mappings.
-   */
-  val assetsMappings: Seq[(String, String)] = Nil
-
-  /**
-   * Override to add assets mappings.
-   */
-  def assetsMappings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, String)] = Nil
-
-  /**
-   * Override to add text decorators.
-   */
-  val textDecorators: Seq[TextDecorator] = Nil
-
-  /**
-   * Override to add text decorators.
-   */
-  def textDecorators(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[TextDecorator] = Nil
-
-  /**
-   * Override to add suggestion provider.
-   */
-  val suggestionProviders: Seq[SuggestionProvider] = Nil
-
-  /**
-   * Override to add suggestion provider.
-   */
-  def suggestionProviders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[SuggestionProvider] = Nil
-
  /**
   * This method is invoked in initialization of plugin system.
   * Register plugin functionality to PluginRegistry.
@@ -202,36 +100,6 @@ abstract class Plugin {
    (receiveHooks ++ receiveHooks(registry, context, settings)).foreach { receiveHook =>
      registry.addReceiveHook(receiveHook)
    }
-    (globalMenus ++ globalMenus(registry, context, settings)).foreach { globalMenu =>
-      registry.addGlobalMenu(globalMenu)
-    }
-    (repositoryMenus ++ repositoryMenus(registry, context, settings)).foreach { repositoryMenu =>
-      registry.addRepositoryMenu(repositoryMenu)
-    }
-    (repositorySettingTabs ++ repositorySettingTabs(registry, context, settings)).foreach { repositorySettingTab =>
-      registry.addRepositorySettingTab(repositorySettingTab)
-    }
-    (profileTabs ++ profileTabs(registry, context, settings)).foreach { profileTab =>
-      registry.addProfileTab(profileTab)
-    }
-    (systemSettingMenus ++ systemSettingMenus(registry, context, settings)).foreach { systemSettingMenu =>
-      registry.addSystemSettingMenu(systemSettingMenu)
-    }
-    (accountSettingMenus ++ accountSettingMenus(registry, context, settings)).foreach { accountSettingMenu =>
-      registry.addAccountSettingMenu(accountSettingMenu)
-    }
-    (dashboardTabs ++ dashboardTabs(registry, context, settings)).foreach { dashboardTab =>
-      registry.addDashboardTab(dashboardTab)
-    }
-    (assetsMappings ++ assetsMappings(registry, context, settings)).foreach { assetMapping =>
-      registry.addAssetsMapping((assetMapping._1, assetMapping._2, getClass.getClassLoader))
-    }
-    (textDecorators ++ textDecorators(registry, context, settings)).foreach { textDecorator =>
-      registry.addTextDecorator(textDecorator)
-    }
-    (suggestionProviders ++ suggestionProviders(registry, context, settings)).foreach { suggestionProvider =>
-      registry.addSuggestionProvider(suggestionProvider)
-    }
  }

  /**
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -3,18 +3,16 @@ package gitbucket.core.plugin
 import java.io.{File, FilenameFilter, InputStream}
 import java.net.URLClassLoader
 import javax.servlet.ServletContext
+import javax.servlet.http.{HttpServletRequest, HttpServletResponse}

 import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
 import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.ControlUtil._
-import gitbucket.core.util.DatabaseConfig
 import gitbucket.core.util.Directory._
-import io.github.gitbucket.solidbase.Solidbase
-import io.github.gitbucket.solidbase.manager.JDBCVersionManager
-import io.github.gitbucket.solidbase.model.Module
+import gitbucket.core.util.JDBCUtil._
+import gitbucket.core.util.{Version, Versions}
 import org.apache.commons.codec.binary.{Base64, StringUtils}
 import org.slf4j.LoggerFactory

@@ -35,20 +33,9 @@ class PluginRegistry {
  private val receiveHooks = new ListBuffer[ReceiveHook]
  receiveHooks += new ProtectedBranchReceiveHook()

-  private val globalMenus = new ListBuffer[(Context) => Option[Link]]
-  private val repositoryMenus = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
-  private val repositorySettingTabs = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
-  private val profileTabs = new ListBuffer[(Account, Context) => Option[Link]]
-  private val systemSettingMenus = new ListBuffer[(Context) => Option[Link]]
-  private val accountSettingMenus = new ListBuffer[(Context) => Option[Link]]
-  private val dashboardTabs = new ListBuffer[(Context) => Option[Link]]
-  private val assetsMappings = new ListBuffer[(String, String, ClassLoader)]
-  private val textDecorators = new ListBuffer[TextDecorator]
-
-  private val suggestionProviders = new ListBuffer[SuggestionProvider]
-  suggestionProviders += new UserNameSuggestionProvider()
-
-  def addPlugin(pluginInfo: PluginInfo): Unit = plugins += pluginInfo
+  def addPlugin(pluginInfo: PluginInfo): Unit = {
+    plugins += pluginInfo
+  }

  def getPlugins(): List[PluginInfo] = plugins.toList

@@ -69,26 +56,42 @@ class PluginRegistry {

  def getImage(id: String): String = images(id)

-  def addController(path: String, controller: ControllerBase): Unit = controllers += ((controller, path))
+  def addController(path: String, controller: ControllerBase): Unit = {
+    controllers += ((controller, path))
+  }

  @deprecated("Use addController(path: String, controller: ControllerBase) instead", "3.4.0")
-  def addController(controller: ControllerBase, path: String): Unit = addController(path, controller)
+  def addController(controller: ControllerBase, path: String): Unit = {
+    addController(path, controller)
+  }

  def getControllers(): Seq[(ControllerBase, String)] = controllers.toSeq

-  def addJavaScript(path: String, script: String): Unit = javaScripts += ((path, script))
+  def addJavaScript(path: String, script: String): Unit = {
+    javaScripts += ((path, script))
+  }

-  def getJavaScript(currentPath: String): List[String] = javaScripts.filter(x => currentPath.matches(x._1)).toList.map(_._2)
+  def getJavaScript(currentPath: String): List[String] = {
+    javaScripts.filter(x => currentPath.matches(x._1)).toList.map(_._2)
+  }

-  def addRenderer(extension: String, renderer: Renderer): Unit = renderers += ((extension, renderer))
+  def addRenderer(extension: String, renderer: Renderer): Unit = {
+    renderers += ((extension, renderer))
+  }

-  def getRenderer(extension: String): Renderer = renderers.get(extension).getOrElse(DefaultRenderer)
+  def getRenderer(extension: String): Renderer = {
+    renderers.get(extension).getOrElse(DefaultRenderer)
+  }

  def renderableExtensions: Seq[String] = renderers.keys.toSeq

-  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = repositoryRoutings += routing
+  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = {
+    repositoryRoutings += routing
+  }

-  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = repositoryRoutings.toSeq
+  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = {
+    repositoryRoutings.toSeq
+  }

  def getRepositoryRouting(repositoryPath: String): Option[GitRepositoryRouting] = {
    PluginRegistry().getRepositoryRoutings().find {
@@ -98,49 +101,24 @@ class PluginRegistry {
    }
  }

-  def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks += commitHook
+  def addReceiveHook(commitHook: ReceiveHook): Unit = {
+    receiveHooks += commitHook
+  }

  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq

-  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus += globalMenu
+  private case class GlobalAction(
+    method: String,
+    path: String,
+    function: (HttpServletRequest, HttpServletResponse, Context) => Any
+  )

-  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq
+  private case class RepositoryAction(
+    method: String,
+    path: String,
+    function: (HttpServletRequest, HttpServletResponse, Context, RepositoryInfo) => Any
+  )

-  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus += repositoryMenu
-
-  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.toSeq
-
-  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs += repositorySettingTab
-
-  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.toSeq
-
-  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = profileTabs += profileTab
-
-  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.toSeq
-
-  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus += systemSettingMenu
-
-  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.toSeq
-
-  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus += accountSettingMenu
-
-  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.toSeq
-
-  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = dashboardTabs += dashboardTab
-
-  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.toSeq
-
-  def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings += assetsMapping
-
-  def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.toSeq
-
-  def addTextDecorator(textDecorator: TextDecorator): Unit = textDecorators += textDecorator
-
-  def getTextDecorators: Seq[TextDecorator] = textDecorators.toSeq
-
-  def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders += suggestionProvider
-
-  def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.toSeq
 }

 /**
@@ -162,8 +140,6 @@ object PluginRegistry {
   */
  def initialize(context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = {
    val pluginDir = new File(PluginHome)
-    val manager = new JDBCVersionManager(conn)
-
    if(pluginDir.exists && pluginDir.isDirectory){
      pluginDir.listFiles(new FilenameFilter {
        override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
@@ -173,29 +149,37 @@ object PluginRegistry {
          val plugin = classLoader.loadClass("Plugin").newInstance().asInstanceOf[Plugin]

          // Migration
-          val solidbase = new Solidbase()
-          solidbase.migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
+          val headVersion = plugin.versions.head
+          val currentVersion = conn.find("SELECT * FROM PLUGIN WHERE PLUGIN_ID = ?", plugin.pluginId)(_.getString("VERSION")) match {
+            case Some(x) => {
+              val dim = x.split("\\.")
+              Version(dim(0).toInt, dim(1).toInt)
+            }
+            case None => Version(0, 0)
+          }

-          // Check version
-          val databaseVersion = manager.getCurrentVersion(plugin.pluginId)
-          val pluginVersion = plugin.versions.last.getVersion
-          if(databaseVersion != pluginVersion){
-            throw new IllegalStateException(s"Plugin version is ${pluginVersion}, but database version is ${databaseVersion}")
+          Versions.update(conn, headVersion, currentVersion, plugin.versions, new URLClassLoader(Array(pluginJar.toURI.toURL))){ conn =>
+            currentVersion.versionString match {
+              case "0.0" =>
+                conn.update("INSERT INTO PLUGIN (PLUGIN_ID, VERSION) VALUES (?, ?)", plugin.pluginId, headVersion.versionString)
+              case _ =>
+                conn.update("UPDATE PLUGIN SET VERSION = ? WHERE PLUGIN_ID = ?", headVersion.versionString, plugin.pluginId)
+            }
          }

          // Initialize
          plugin.initialize(instance, context, settings)
          instance.addPlugin(PluginInfo(
-            pluginId      = plugin.pluginId,
-            pluginName    = plugin.pluginName,
-            pluginVersion = plugin.versions.last.getVersion,
-            description   = plugin.description,
-            pluginClass   = plugin
+            pluginId    = plugin.pluginId,
+            pluginName  = plugin.pluginName,
+            version     = plugin.versions.head.versionString,
+            description = plugin.description,
+            pluginClass = plugin
          ))

        } catch {
          case e: Throwable => {
-            logger.error(s"Error during plugin initialization: ${pluginJar.getAbsolutePath}", e)
+            logger.error(s"Error during plugin initialization", e)
          }
        }
      }
@@ -217,12 +201,10 @@ object PluginRegistry {

 }

-case class Link(id: String, label: String, path: String, icon: Option[String] = None)
-
 case class PluginInfo(
  pluginId: String,
  pluginName: String,
-  pluginVersion: String,
+  version: String,
  description: String,
  pluginClass: Plugin
 )
--- a/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
+++ b/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
@@ -1,27 +0,0 @@
-package gitbucket.core.plugin
-
-import gitbucket.core.controller.Context
-import gitbucket.core.service.RepositoryService.RepositoryInfo
-
-trait SuggestionProvider {
-
-  val id: String
-  val prefix: String
-  val suffix: String = " "
-  val context: Seq[String]
-
-  def values(repository: RepositoryInfo): Seq[String]
-  def template(implicit context: Context): String = "value"
-  def additionalScript(implicit context: Context): String = ""
-
-}
-
-class UserNameSuggestionProvider extends SuggestionProvider {
-  override val id: String = "user"
-  override val prefix: String = "@"
-  override val context: Seq[String] = Seq("issues")
-  override def values(repository: RepositoryInfo): Seq[String] = Nil
-  override def template(implicit context: Context): String = "'@' + value"
-  override def additionalScript(implicit context: Context): String =
-    s"""$$.get('${context.path}/_user/proposals', { query: '' }, function (data) { user = data.options; });"""
-}
--- a/src/main/scala/gitbucket/core/plugin/TextDecorator.scala
+++ b/src/main/scala/gitbucket/core/plugin/TextDecorator.scala
@@ -1,10 +0,0 @@
-package gitbucket.core.plugin
-
-import gitbucket.core.controller.Context
-import gitbucket.core.service.RepositoryService.RepositoryInfo
-
-trait TextDecorator {
-
-  def decorate(text: String, repository: RepositoryInfo)(implicit context: Context): String
-
-}
--- a/src/main/scala/gitbucket/core/service/AccessTokenService.scala
+++ b/src/main/scala/gitbucket/core/service/AccessTokenService.scala
@@ -5,6 +5,8 @@ import profile.simple._

 import gitbucket.core.model.{Account, AccessToken}
 import gitbucket.core.util.StringUtil
+import gitbucket.core.servlet.Database._
+import io.getquill._

 import scala.util.Random

@@ -27,28 +29,36 @@ trait AccessTokenService {
    var hash: String = null
    do{
      token = makeAccessTokenString
-      hash = tokenToHash(token)
-    }while(AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
+      hash  = tokenToHash(token)
+    } while (
+      db.run(quote { (hash: String) => query[AccessToken].filter(_.tokenHash == hash).nonEmpty })(hash).head
+    )
    val newToken = AccessToken(
        userName = userName,
        note = note,
        tokenHash = hash)
+
+    // TODO Remain Slick code
    val tokenId = (AccessTokens returning AccessTokens.map(_.accessTokenId)) += newToken
    (tokenId, token)
  }

-  def getAccountByAccessToken(token: String)(implicit s: Session): Option[Account] =
-    Accounts
-      .innerJoin(AccessTokens)
-      .filter{ case (ac, t) => (ac.userName === t.userName) && (t.tokenHash === tokenToHash(token).bind) && (ac.removed === false.bind) }
-      .map{ case (ac, t) => ac }
-      .firstOption
+  def getAccountByAccessToken(token: String): Option[Account] =
+    db.run(quote { (tokenHash: String) =>
+        query[AccessToken].filter(_.tokenHash == tokenHash)
+          .join(query[Account]).on { (t, a) => t.userName == a.userName && a.registeredDate == false }
+          .map { case (t, a) => a }
+    })(tokenToHash(token)).headOption

-  def getAccessTokens(userName: String)(implicit s: Session): List[AccessToken] =
-    AccessTokens.filter(_.userName === userName.bind).sortBy(_.accessTokenId.desc).list
+  def getAccessTokens(userName: String): List[AccessToken] =
+    db.run(quote { (userName: String) =>
+      query[AccessToken].filter(_.userName == userName).sortBy(_.accessTokenId)(Ord.desc)
+    })(userName)

-  def deleteAccessToken(userName: String, accessTokenId: Int)(implicit s: Session): Unit =
-    AccessTokens filter (t => t.userName === userName.bind && t.accessTokenId === accessTokenId) delete
+  def deleteAccessToken(userName: String, accessTokenId: Int): Unit =
+    db.run(quote { (userName: String, accessTokenId: Int) =>
+      query[AccessToken].filter { t => t.userName == userName && t.accessTokenId == accessTokenId }.delete
+    })(List((userName, accessTokenId)))

 }

--- a/src/main/scala/gitbucket/core/service/AccountService.scala
+++ b/src/main/scala/gitbucket/core/service/AccountService.scala
@@ -1,20 +1,23 @@
 package gitbucket.core.service

-import gitbucket.core.model.{GroupMember, Account}
+import java.util.Date
+
+import gitbucket.core.model.{GroupMember, Account, Collaborator, Repository}
 import gitbucket.core.model.Profile._
 import gitbucket.core.util.{StringUtil, LDAPUtil}
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import profile.simple._
 import StringUtil._
 import org.slf4j.LoggerFactory
-// TODO Why is direct import required?
-import gitbucket.core.model.Profile.dateColumnType
+
+import gitbucket.core.servlet.Database._
+import io.getquill._

 trait AccountService {

  private val logger = LoggerFactory.getLogger(classOf[AccountService])

-  def authenticate(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] =
+  def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] =
    if(settings.ldapAuthentication){
      ldapAuthentication(settings, userName, password)
    } else {
@@ -24,22 +27,21 @@ trait AccountService {
  /**
   * Authenticate by internal database.
   */
-  private def defaultAuthentication(userName: String, password: String)(implicit s: Session) = {
+  private def defaultAuthentication(userName: String, password: String) = {
    getAccountByUserName(userName).collect {
-      case account if(!account.isGroupAccount && account.password == sha1(password)) => Some(account)
+      case account if(!account.groupAccount && account.password == sha1(password)) => Some(account)
    } getOrElse None
  }

  /**
   * Authenticate by LDAP.
   */
-  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String)
-                                (implicit s: Session): Option[Account] = {
+  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String): Option[Account] = {
    LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
      case Right(ldapUserInfo) => {
        // Create or update account by LDAP information
        getAccountByUserName(ldapUserInfo.userName, true) match {
-          case Some(x) if(!x.isRemoved) => {
+          case Some(x) if(!x.removed) => {
            if(settings.ldap.get.mailAttribute.getOrElse("").isEmpty) {
              updateAccount(x.copy(fullName = ldapUserInfo.fullName))
            } else {
@@ -47,16 +49,16 @@ trait AccountService {
            }
            getAccountByUserName(ldapUserInfo.userName)
          }
-          case Some(x) if(x.isRemoved)  => {
+          case Some(x) if(x.removed)  => {
            logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
            defaultAuthentication(userName, password)
          }
          case None => getAccountByMailAddress(ldapUserInfo.mailAddress, true) match {
-            case Some(x) if(!x.isRemoved) => {
+            case Some(x) if(!x.removed) => {
              updateAccount(x.copy(fullName = ldapUserInfo.fullName))
              getAccountByUserName(ldapUserInfo.userName)
            }
-            case Some(x) if(x.isRemoved)  => {
+            case Some(x) if(x.removed)  => {
              logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
              defaultAuthentication(userName, password)
            }
@@ -74,118 +76,163 @@ trait AccountService {
    }
  }

-  def getAccountByUserName(userName: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
-    Accounts filter(t => (t.userName === userName.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
+  def getAccountByUserName(userName: String, includeRemoved: Boolean = false): Option[Account] = {
+    db.run(quote { (userName: String, includeRemoved: Boolean) =>
+      query[Account].filter { t =>
+        if(includeRemoved){
+          t.userName == userName
+        } else {
+          t.userName == userName && t.removed == false
+        }
+      }
+    })(userName, includeRemoved).headOption
+  }

-  def getAccountsByUserNames(userNames: Set[String], knowns:Set[Account], includeRemoved: Boolean = false)(implicit s: Session): Map[String, Account] = {
+
+  def getAccountsByUserNames(userNames: Set[String], knowns:Set[Account], includeRemoved: Boolean = false): Map[String, Account] = {
    val map = knowns.map(a => a.userName -> a).toMap
    val needs = userNames -- map.keySet
    if(needs.isEmpty){
      map
-    }else{
-      map ++ Accounts.filter(t => (t.userName inSetBind needs) && (t.removed === false.bind, !includeRemoved)).list.map(a => a.userName -> a).toMap
-    }
-  }
-
-  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
-    Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
-
-  def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
-    if(includeRemoved){
-      Accounts sortBy(_.userName) list
    } else {
-      Accounts filter (_.removed === false.bind) sortBy(_.userName) list
+      map ++ db.run(quote { (userNames: Set[String]) =>
+          query[Account].filter { t => userNames.contains(t.userName) && t.removed == false }
+      })(userNames.toSet).map { a => a.userName -> a }.toMap
    }
-
-  def isLastAdministrator(account: Account)(implicit s: Session): Boolean = {
-    if(account.isAdmin){
-      (Accounts filter (_.removed === false.bind) filter (_.isAdmin === true.bind) map (_.userName.length)).first == 1
-    } else false
  }

-  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String])
-                   (implicit s: Session): Unit =
-    Accounts insert Account(
+  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] = {
+    db.run(quote { (mailAddress: String, includeRemoved: Boolean) =>
+      query[Account].filter { t =>
+        if(includeRemoved){
+          t.mailAddress.toLowerCase == mailAddress.toLowerCase
+        } else {
+          t.mailAddress.toLowerCase == mailAddress.toLowerCase && t.removed == false
+        }
+      }
+    })(mailAddress, includeRemoved).headOption
+  }
+
+  def getAllUsers(includeRemoved: Boolean = true): List[Account] = {
+    db.run(
+      if(includeRemoved){
+        quote { query[Account].sortBy(_.userName) }
+      } else {
+        quote { query[Account].filter(_.removed == false).sortBy(_.userName) }
+      }
+    )
+  }
+
+  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit = {
+    db.run(quote { query[Account].insert })(Account(
      userName       = userName,
      password       = password,
      fullName       = fullName,
      mailAddress    = mailAddress,
-      isAdmin        = isAdmin,
+      administrator  = isAdmin,
      url            = url,
      registeredDate = currentDate,
      updatedDate    = currentDate,
      lastLoginDate  = None,
      image          = None,
-      isGroupAccount = false,
-      isRemoved      = false)
+      groupAccount   = false,
+      removed        = false
+    ))
+  }

-  def updateAccount(account: Account)(implicit s: Session): Unit =
-    Accounts
-      .filter { a =>  a.userName === account.userName.bind }
-      .map    { a => (a.password, a.fullName, a.mailAddress, a.isAdmin, a.url.?, a.registeredDate, a.updatedDate, a.lastLoginDate.?, a.removed) }
-      .update (
-        account.password,
-        account.fullName,
-        account.mailAddress,
-        account.isAdmin,
-        account.url,
-        account.registeredDate,
-        currentDate,
-        account.lastLoginDate,
-        account.isRemoved)
+  def updateAccount(account: Account): Unit = {
+    db.run(quote { (userName: String, password: String, fullName: String, mailAddress: String, administrator: Boolean,
+                    url: Option[String], registeredDate: Date, updatedDate: Date, lastLoginDate: Option[Date], removed: Boolean) =>
+      query[Account].filter(_.userName == userName).update(
+        _.password       -> password,
+        _.fullName       -> fullName,
+        _.mailAddress    -> mailAddress,
+        _.administrator  -> administrator,
+        _.url            -> url,
+        _.registeredDate -> registeredDate,
+        _.updatedDate    -> updatedDate,
+        _.lastLoginDate  -> lastLoginDate,
+        _.removed        -> removed
+      )
+    })((
+      account.userName,
+      account.password,
+      account.fullName,
+      account.mailAddress,
+      account.administrator,
+      account.url,
+      account.registeredDate,
+      currentDate,
+      account.lastLoginDate,
+      account.removed
+    ))
+  }

-  def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit =
-    Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image)
+  def updateAvatarImage(userName: String, image: Option[String]): Unit = {
+    db.run(quote { (userName: String, image: Option[String]) =>
+      query[Account].filter(_.userName == userName).update(_.image -> image)
+    })((userName, image))
+  }

-  def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
-    Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)
+  def updateLastLoginDate(userName: String): Unit = {
+    db.run(quote { (userName: String, lastLoginDate: Option[Date]) =>
+      query[Account].filter(_.userName == userName).update(_.lastLoginDate -> lastLoginDate)
+    })((userName, Some(currentDate)))
+  }

-  def createGroup(groupName: String, url: Option[String])(implicit s: Session): Unit =
-    Accounts insert Account(
+  def createGroup(groupName: String, url: Option[String]): Unit = {
+    db.run( quote { query[Account].insert })(List(Account(
      userName       = groupName,
      password       = "",
      fullName       = groupName,
      mailAddress    = groupName + "@devnull",
-      isAdmin        = false,
+      administrator  = false,
      url            = url,
      registeredDate = currentDate,
      updatedDate    = currentDate,
      lastLoginDate  = None,
      image          = None,
-      isGroupAccount = true,
-      isRemoved      = false)
+      groupAccount  = true,
+      removed       = false
+    )))
+  }

-  def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit =
-    Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed)
+  def updateGroup(groupName: String, url: Option[String], removed: Boolean): Unit = {
+    db.run(quote { (groupName: String, url: Option[String], removed: Boolean) =>
+      query[Account].filter(_.userName == groupName).update(_.url -> url, _.removed -> removed)
+    })(List((groupName, url, removed)))
+  }
+
+  def updateGroupMembers(groupName: String, members: List[(String, Boolean)]): Unit = {
+    db.run(quote { (groupName: String) => query[GroupMember].filter(_.groupName == groupName).delete })(groupName)

-  def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = {
-    GroupMembers.filter(_.groupName === groupName.bind).delete
    members.foreach { case (userName, isManager) =>
-      GroupMembers insert GroupMember (groupName, userName, isManager)
+      db.run(quote { query[GroupMember].insert })(GroupMember(groupName, userName, isManager))
    }
  }

-  def getGroupMembers(groupName: String)(implicit s: Session): List[GroupMember] =
-    GroupMembers
-      .filter(_.groupName === groupName.bind)
-      .sortBy(_.userName)
-      .list
-
-  def getGroupsByUserName(userName: String)(implicit s: Session): List[String] =
-    GroupMembers
-      .filter(_.userName === userName.bind)
-      .sortBy(_.groupName)
-      .map(_.groupName)
-      .list
-
-  def removeUserRelatedData(userName: String)(implicit s: Session): Unit = {
-    GroupMembers.filter(_.userName === userName.bind).delete
-    Collaborators.filter(_.collaboratorName === userName.bind).delete
+  def getGroupMembers(groupName: String): List[GroupMember] = {
+    db.run(quote { (groupName: String) =>
+      query[GroupMember].filter(_.groupName == groupName).sortBy(_.userName)
+    })(groupName)
  }

-  def getGroupNames(userName: String)(implicit s: Session): List[String] = {
-    List(userName) ++
-      Collaborators.filter(_.collaboratorName === userName.bind).sortBy(_.userName).map(_.userName).list.distinct
+  def getGroupsByUserName(userName: String): List[String] = {
+    db.run(quote { (userName: String) =>
+      query[GroupMember].filter(_.userName == userName).sortBy(_.groupName).map(_.groupName)
+    })(userName)
+  }
+
+  def removeUserRelatedData(userName: String): Unit = {
+    db.run(quote { (userName: String) => query[GroupMember].filter(_.userName == userName).delete })(userName)
+    db.run(quote { (userName: String) => query[Collaborator].filter(_.collaboratorName == userName).delete })(userName)
+    db.run(quote { (userName: String) => query[Repository].filter(_.userName == userName).delete })(userName)
+  }
+
+  def getGroupNames(userName: String): List[String] = {
+    List(userName) ++ db.run(quote { (userName: String) =>
+      query[Collaborator].filter(_.collaboratorName == userName).sortBy(_.userName).map(_.userName)
+    })(userName)
  }

 }
--- a/src/main/scala/gitbucket/core/service/ActivityService.scala
+++ b/src/main/scala/gitbucket/core/service/ActivityService.scala
@@ -1,194 +1,180 @@
 package gitbucket.core.service

-import gitbucket.core.model.Activity
+import gitbucket.core.model._
 import gitbucket.core.model.Profile._
 import gitbucket.core.util.JGitUtil
 import profile.simple._

+import gitbucket.core.servlet.Database._
+import io.getquill._
+
 trait ActivityService {

-  def deleteOldActivities(limit: Int)(implicit s: Session): Int = {
-    Activities.map(_.activityId).sortBy(_ desc).drop(limit).firstOption.map { id =>
-      Activities.filter(_.activityId <= id.bind).delete
+  def deleteOldActivities(limit: Int): Int =
+    db.run (quote { (limit: Int) =>
+      query[Activity].map(_.activityId).sortBy(x => x)(Ord.desc).drop(limit)
+    })(limit).headOption.map { activityId =>
+      db.run (
+        quote { (activityId: Int) => query[Activity].filter(_.activityId <= activityId).delete }
+      )(activityId)
    } getOrElse 0
-  }

-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean)(implicit s: Session): List[Activity] =
-    Activities
-      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) =>
-        if(isPublic){
-          (t1.activityUserName === activityUserName.bind) && (t2.isPrivate === false.bind)
-        } else {
-          (t1.activityUserName === activityUserName.bind)
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
+    db.run(quote { (activityUserName: String, isPublic: Boolean) =>
+      query[Activity].join(query[Repository]).on((a, r) => a.userName == r.userName && a.repositoryName == r.repositoryName)
+        .filter { case (a, r) =>
+          if(isPublic){
+            a.activityUserName == activityUserName
+          } else {
+            a.activityUserName == activityUserName && r.`private` == false
+          }
        }
-      }
-      .sortBy { case (t1, t2) => t1.activityId desc }
-      .map    { case (t1, t2) => t1 }
-      .take(30)
-      .list
+        .sortBy { case (a, r) => a.activityId }(Ord.desc)
+        .map    { case (a, r) => a }
+        .take(30)
+    })(activityUserName, isPublic)

-  def getRecentActivities()(implicit s: Session): List[Activity] =
-    Activities
-      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) =>  t2.isPrivate === false.bind }
-      .sortBy { case (t1, t2) => t1.activityId desc }
-      .map    { case (t1, t2) => t1 }
-      .take(30)
-      .list
+  def getRecentActivities(): List[Activity] =
+    db.run(quote {
+      query[Activity].join(query[Repository]).on((a, r) => a.userName == r.userName && a.repositoryName == r.repositoryName)
+        .filter { case (a, r) => r.`private` == false}
+        .sortBy { case (a, r) => a.activityId }(Ord.desc)
+        .map    { case (a, r) => a }
+        .take(30)
+    })

-  def getRecentActivitiesByOwners(owners : Set[String])(implicit s: Session): List[Activity] =
-    Activities
-      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) => (t2.isPrivate === false.bind) || (t2.userName inSetBind owners) }
-      .sortBy { case (t1, t2) => t1.activityId desc }
-      .map    { case (t1, t2) => t1 }
-      .take(30)
-      .list
+  def getRecentActivitiesByOwners(owners : Set[String]): List[Activity] =
+    db.run(quote { (owners: Set[String]) =>
+      query[Activity].join(query[Repository]).on((a, r) => a.userName == r.userName && a.repositoryName == r.repositoryName)
+        .filter { case (a, r) => r.`private` == false || owners.contains(r.userName) }
+        .sortBy { case (a, r) => a.activityId }(Ord.desc)
+        .map    { case (a, r) => a }
+        .take(30)
+    })(owners)

-  def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String)
-                                    (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "create_repository",
      s"[user:${activityUserName}] created [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate)
+      None)

-  def recordCreateIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
-                               (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCreateIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "open_issue",
      s"[user:${activityUserName}] opened issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(title), 
-      currentDate)
+      Some(title))

-  def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
-                              (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "close_issue",
      s"[user:${activityUserName}] closed issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate)
+      Some(title))

-  def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
-                                    (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "close_issue",
      s"[user:${activityUserName}] closed pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate)
+      Some(title))

-  def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
-                               (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "reopen_issue",
      s"[user:${activityUserName}] reopened issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate)
+      Some(title))

-  def recordCommentIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
-                                (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCommentIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "comment_issue",
      s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
-      Some(cut(comment, 200)),
-      currentDate)
+      Some(cut(comment, 200)))

-  def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
-                                      (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "comment_issue",
      s"[user:${activityUserName}] commented on pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(cut(comment, 200)),
-      currentDate)
+      Some(cut(comment, 200)))

-  def recordCommentCommitActivity(userName: String, repositoryName: String, activityUserName: String, commitId: String, comment: String)
-                                 (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCommentCommitActivity(userName: String, repositoryName: String, activityUserName: String, commitId: String, comment: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "comment_commit",
      s"[user:${activityUserName}] commented on commit [commit:${userName}/${repositoryName}@${commitId}]",
-      Some(cut(comment, 200)),
-      currentDate
-    )
+      Some(cut(comment, 200)))

-  def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String)
-                                  (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "create_wiki",
      s"[user:${activityUserName}] created the [repo:${userName}/${repositoryName}] wiki",
-      Some(pageName),
-      currentDate)
+      Some(pageName))

-  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String, commitId: String)
-                                (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String, commitId: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "edit_wiki",
      s"[user:${activityUserName}] edited the [repo:${userName}/${repositoryName}] wiki",
-      Some(pageName + ":" + commitId),
-      currentDate)
+      Some(pageName + ":" + commitId))

  def recordPushActivity(userName: String, repositoryName: String, activityUserName: String,
-      branchName: String, commits: List[JGitUtil.CommitInfo])(implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+      branchName: String, commits: List[JGitUtil.CommitInfo]): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "push",
      s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
-      Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
-      currentDate)
+      Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")))

  def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String, 
-      tagName: String, commits: List[JGitUtil.CommitInfo])(implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+      tagName: String, commits: List[JGitUtil.CommitInfo]): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "create_tag",
      s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate)
+      None)

  def recordDeleteTagActivity(userName: String, repositoryName: String, activityUserName: String,
-                              tagName: String, commits: List[JGitUtil.CommitInfo])(implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+                              tagName: String, commits: List[JGitUtil.CommitInfo]): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "delete_tag",
      s"[user:${activityUserName}] deleted tag ${tagName} at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate)
+      None)

-  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
-                                (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "create_branch",
      s"[user:${activityUserName}] created branch [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate)
+      None)

-  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
-                                (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "delete_branch",
      s"[user:${activityUserName}] deleted branch ${branchName} at [repo:${userName}/${repositoryName}]",
-      None,
-      currentDate)
+      None)

-  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(implicit s: Session): Unit = 
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "fork",
      s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${forkedUserName}/${repositoryName}]",
-      None,
-      currentDate)
+      None)

-  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
-                               (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "open_pullreq",
      s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(title),
-      currentDate)
+      Some(title))

-  def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String)
-                         (implicit s: Session): Unit =
-    Activities insert Activity(userName, repositoryName, activityUserName,
+  def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String): Unit =
+    insertActivity(userName, repositoryName, activityUserName,
      "merge_pullreq",
      s"[user:${activityUserName}] merged pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
-      Some(message),
-      currentDate)
+      Some(message))
+
+  private def insertActivity(userName: String, repositoryName: String, activityUserName: String, activityType: String,
+                             message: String, additionalInfo: Option[String]): Unit = {
+    db.run(quote { query[Activity].insert })(Activity(
+      userName         = userName,
+      repositoryName   = repositoryName,
+      activityUserName = activityUserName,
+      activityType     = activityType,
+      message          = message,
+      additionalInfo   = additionalInfo,
+      activityDate     = currentDate
+    ))
+  }

  private def cut(value: String, length: Int): String =
    if(value.length > length) value.substring(0, length) + "..." else value
--- a/src/main/scala/gitbucket/core/service/CommitsService.scala
+++ b/src/main/scala/gitbucket/core/service/CommitsService.scala
@@ -1,35 +1,34 @@
 package gitbucket.core.service

 import gitbucket.core.model.CommitComment
-import gitbucket.core.util.{StringUtil, Implicits}
-
-import scala.slick.jdbc.{StaticQuery => Q}
-import Q.interpolation
 import gitbucket.core.model.Profile._
 import profile.simple._
-import Implicits._
-import StringUtil._
+
+import gitbucket.core.servlet.Database._
+import io.getquill._


 trait CommitsService {

-  def getCommitComments(owner: String, repository: String, commitId: String, includePullRequest: Boolean)(implicit s: Session) =
-    CommitComments filter {
-      t => t.byCommit(owner, repository, commitId) && (t.issueId.isEmpty || includePullRequest)
-    } list
+  def getCommitComments(owner: String, repository: String, commitId: String, includePullRequest: Boolean) =
+    db.run(quote { (owner: String, repository: String, commitId: String, includePullRequest: Boolean) =>
+      query[CommitComment].filter { t =>
+        t.userName == owner && t.repositoryName == repository && t.commitId == commitId && (t.issueId.isEmpty || includePullRequest)
+      }
+    })(owner, repository, commitId, includePullRequest)

-  def getCommitComment(owner: String, repository: String, commentId: String)(implicit s: Session) =
+  def getCommitComment(owner: String, repository: String, commentId: String) =
    if (commentId forall (_.isDigit))
-      CommitComments filter { t =>
-        t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
-      } firstOption
+      db.run(quote { (owner: String, repository: String, commentId: Int) =>
+        query[CommitComment].filter(t => t.userName == owner && t.repositoryName == repository && t.commentId == commentId)
+      })(owner, repository, commentId.toInt).headOption
    else
      None

  def createCommitComment(owner: String, repository: String, commitId: String, loginUser: String,
                          content: String, fileName: Option[String], oldLine: Option[Int], newLine: Option[Int],
                          issueId: Option[Int])(implicit s: Session): Int =
-    CommitComments.autoInc insert CommitComment(
+    CommitComments.autoInc insert CommitComment( // TODO Remain Slick code
      userName          = owner,
      repositoryName    = repository,
      commitId          = commitId,
@@ -42,13 +41,12 @@ trait CommitsService {
      updatedDate       = currentDate,
      issueId           = issueId)

-  def updateCommitComment(commentId: Int, content: String)(implicit s: Session) =
-    CommitComments
-      .filter (_.byPrimaryKey(commentId))
-      .map { t =>
-      t.content -> t.updatedDate
-    }.update (content, currentDate)
+  def updateCommitComment(commentId: Int, content: String) =
+    db.run(quote { (commentId: Int, content: String, updatedDate: java.util.Date) =>
+      query[CommitComment].filter(_.commentId == commentId).update(_.content -> content, _.updatedDate -> updatedDate)
+    })(commentId, content, currentDate)
+
+  def deleteCommitComment(commentId: Int) =
+    db.run(quote { (commentId: Int) => query[CommitComment].filter(_.commentId == commentId).delete })(commentId)

-  def deleteCommitComment(commentId: Int)(implicit s: Session) =
-    CommitComments filter (_.byPrimaryKey(commentId)) delete
 }
--- a/src/main/scala/gitbucket/core/service/HandleCommentService.scala
+++ b/src/main/scala/gitbucket/core/service/HandleCommentService.scala
@@ -13,7 +13,7 @@ trait HandleCommentService {
    with WebHookService with WebHookIssueCommentService with WebHookPullRequestService =>

  /**
-   * @see [[https://github.com/gitbucket/gitbucket/wiki/CommentAction]]
+   * @see [[https://github.com/takezoe/gitbucket/wiki/CommentAction]]
   */
  def handleComment(issue: Issue, content: Option[String], repository: RepositoryService.RepositoryInfo, actionOpt: Option[String])
                   (implicit context: Context, s: Session) = {
@@ -54,20 +54,18 @@ trait HandleCommentService {

      // call web hooks
      action match {
-        case None => commentId.map { commentIdSome => callIssueCommentWebHook(repository, issue, commentIdSome, context.loginAccount.get) }
-        case Some(act) => {
-          val webHookAction = act match {
-            case "open"   => "opened"
-            case "reopen" => "reopened"
-            case "close"  => "closed"
-            case _ => act
-          }
-          if (issue.isPullRequest) {
+        case None => commentId.map{ commentIdSome => callIssueCommentWebHook(repository, issue, commentIdSome, context.loginAccount.get) }
+        case Some(act) => val webHookAction = act match {
+          case "open"   => "opened"
+          case "reopen" => "reopened"
+          case "close"  => "closed"
+          case _ => act
+        }
+          if(issue.isPullRequest){
            callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, context.loginAccount.get)
          } else {
            callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, context.loginAccount.get)
          }
-        }
      }

      // notifications
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -14,11 +14,11 @@ import Q.interpolation


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

  def getIssue(owner: String, repository: String, issueId: String)(implicit s: Session) =
-    if (isInteger(issueId))
+    if (issueId forall (_.isDigit))
      Issues filter (_.byPrimaryKey(owner, repository, issueId.toInt)) firstOption
    else None

@@ -108,41 +108,25 @@ trait IssuesService {
      }
      import gitbucket.core.model.Profile.commitStateColumnType
      val query = Q.query[Seq[(String, String, Int)], (String, String, Int, Int, Int, Option[String], Option[CommitState], Option[String], Option[String])](s"""
-        SELECT
-          SUMM.USER_NAME,
-          SUMM.REPOSITORY_NAME,
-          SUMM.ISSUE_ID,
-          CS_ALL,
-          CS_SUCCESS,
-          CSD.CONTEXT,
-          CSD.STATE,
-          CSD.TARGET_URL,
-          CSD.DESCRIPTION
-        FROM (
-          SELECT
-            PR.USER_NAME,
-            PR.REPOSITORY_NAME,
-            PR.ISSUE_ID,
-            COUNT(CS.STATE) AS CS_ALL,
-            CSS.CS_SUCCESS  AS CS_SUCCESS,
-            PR.COMMIT_ID_TO AS COMMIT_ID
+        SELECT SUMM.USER_NAME, SUMM.REPOSITORY_NAME, SUMM.ISSUE_ID, CS_ALL, CS_SUCCESS
+             , CSD.CONTEXT, CSD.STATE, CSD.TARGET_URL, CSD.DESCRIPTION
+        FROM (SELECT
+           PR.USER_NAME
+         , PR.REPOSITORY_NAME
+         , PR.ISSUE_ID
+         , COUNT(CS.STATE) AS CS_ALL
+         , SUM(CS.STATE='success') AS CS_SUCCESS
+         , PR.COMMIT_ID_TO AS COMMIT_ID
          FROM PULL_REQUEST PR
          JOIN COMMIT_STATUS CS
-            ON PR.USER_NAME = CS.USER_NAME AND PR.REPOSITORY_NAME = CS.REPOSITORY_NAME AND PR.COMMIT_ID_TO = CS.COMMIT_ID
-          JOIN (
-            SELECT
-              COUNT(*) AS CS_SUCCESS,
-              USER_NAME,
-              REPOSITORY_NAME,
-              COMMIT_ID
-            FROM COMMIT_STATUS WHERE STATE = 'success' GROUP BY USER_NAME, REPOSITORY_NAME, COMMIT_ID
-          ) CSS ON PR.USER_NAME = CSS.USER_NAME AND PR.REPOSITORY_NAME = CSS.REPOSITORY_NAME AND PR.COMMIT_ID_TO = CSS.COMMIT_ID
-          WHERE $issueIdQuery
-          GROUP BY PR.USER_NAME, PR.REPOSITORY_NAME, PR.ISSUE_ID, CSS.CS_SUCCESS
-        ) as SUMM
+            ON PR.USER_NAME=CS.USER_NAME
+           AND PR.REPOSITORY_NAME=CS.REPOSITORY_NAME
+           AND PR.COMMIT_ID_TO=CS.COMMIT_ID
+         WHERE $issueIdQuery
+         GROUP BY PR.USER_NAME, PR.REPOSITORY_NAME, PR.ISSUE_ID) as SUMM
        LEFT OUTER JOIN COMMIT_STATUS CSD
          ON SUMM.CS_ALL = 1 AND SUMM.COMMIT_ID = CSD.COMMIT_ID""");
-      query(issueList).list.map {
+      query(issueList).list.map{
        case(userName, repositoryName, issueId, count, successCount, context, state, targetUrl, description) =>
          (userName, repositoryName, issueId) -> CommitStatusInfo(count, successCount, context, state, targetUrl, description)
        }.toMap
@@ -163,62 +147,66 @@ trait IssuesService {
                 (implicit s: Session): List[IssueInfo] = {
    // get issues and comment count and labels
    val result = searchIssueQueryBase(condition, pullRequest, offset, limit, repos)
-      .leftJoin (IssueLabels) .on { case (((t1, t2), i), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
-      .leftJoin (Labels)      .on { case ((((t1, t2), i), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
-      .leftJoin (Milestones)  .on { case (((((t1, t2), i), t3), t4), t5) => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
-      .sortBy { case (((((t1, t2), i), t3), t4), t5) => i asc }
-      .map { case (((((t1, t2), i), t3), t4), t5) => (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?, t5.title.?) }
-      .list
-      .splitWith { (c1, c2) => c1._1.userName == c2._1.userName && c1._1.repositoryName == c2._1.repositoryName && c1._1.issueId == c2._1.issueId }
-
+        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
+        .leftJoin (Milestones)  .on { case ((((t1, t2), t3), t4), t5) => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
+        .map { case ((((t1, t2), t3), t4), t5) =>
+          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?, t5.title.?)
+        }
+        .list
+        .splitWith { (c1, c2) =>
+          c1._1.userName       == c2._1.userName &&
+          c1._1.repositoryName == c2._1.repositoryName &&
+          c1._1.issueId        == c2._1.issueId
+        }
    val status = getCommitStatues(result.map(_.head._1).map(is => (is.userName, is.repositoryName, is.issueId)))

    result.map { issues => issues.head match {
-      case (issue, commentCount, _, _, _, milestone) =>
-        IssueInfo(issue,
-          issues.flatMap { t => t._3.map (
-            Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
-          )} toList,
-          milestone,
-          commentCount,
-          status.get(issue.userName, issue.repositoryName, issue.issueId))
-    }} toList
+          case (issue, commentCount, _, _, _, milestone) =>
+            IssueInfo(issue,
+             issues.flatMap { t => t._3.map (
+                 Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
+             )} toList,
+             milestone,
+             commentCount,
+             status.get(issue.userName, issue.repositoryName, issue.issueId))
+        }} toList
  }

  /** for api
   * @return (issue, issueUser, commentCount, pullRequest, headRepo, headOwner)
   */
  def searchPullRequestByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*)
-                            (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = {
+                 (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = {
    // get issues and comment count and labels
    searchIssueQueryBase(condition, true, offset, limit, repos)
-      .innerJoin(PullRequests).on { case (((t1, t2), i), t3) => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
-      .innerJoin(Repositories).on { case ((((t1, t2), i), t3), t4) => t4.byRepository(t1.userName, t1.repositoryName) }
-      .innerJoin(Accounts).on { case (((((t1, t2), i), t3), t4), t5) => t5.userName === t1.openedUserName }
-      .innerJoin(Accounts).on { case ((((((t1, t2), i), t3), t4), t5), t6) => t6.userName === t4.userName }
-      .sortBy { case ((((((t1, t2), i), t3), t4), t5), t6) => i asc }
-      .map { case ((((((t1, t2), i), t3), t4), t5), t6) => (t1, t5, t2.commentCount, t3, t4, t6) }
+      .innerJoin(PullRequests).on { case ((t1, t2), t3) => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
+      .innerJoin(Repositories).on { case (((t1, t2), t3), t4) => t4.byRepository(t1.userName, t1.repositoryName) }
+      .innerJoin(Accounts).on { case ((((t1, t2), t3), t4), t5) => t5.userName === t1.openedUserName }
+      .innerJoin(Accounts).on { case (((((t1, t2), t3), t4), t5), t6) => t6.userName === t4.userName }
+      .map { case (((((t1, t2), t3), t4), t5), t6) =>
+          (t1, t5, t2.commentCount, t3, t4, t6)
+      }
      .list
  }

  private def searchIssueQueryBase(condition: IssueSearchCondition, pullRequest: Boolean, offset: Int, limit: Int, repos: Seq[(String, String)])
-                                  (implicit s: Session) =
+                 (implicit s: Session) =
    searchIssueQuery(repos, condition, pullRequest)
-      .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
-      .sortBy { case (t1, t2) => t1.issueId desc }
-      .sortBy { case (t1, t2) =>
-        (condition.sort match {
-          case "created"  => t1.registeredDate
-          case "comments" => t2.commentCount
-          case "updated"  => t1.updatedDate
-        }) match {
-          case sort => condition.direction match {
-            case "asc"  => sort asc
-            case "desc" => sort desc
+        .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
+        .sortBy { case (t1, t2) =>
+          (condition.sort match {
+            case "created"  => t1.registeredDate
+            case "comments" => t2.commentCount
+            case "updated"  => t1.updatedDate
+          }) match {
+            case sort => condition.direction match {
+              case "asc"  => sort asc
+              case "desc" => sort desc
+            }
          }
        }
-      }
-      .drop(offset).take(limit).zipWithIndex
+        .drop(offset).take(limit)


  /**
@@ -230,8 +218,9 @@ trait IssuesService {
        .map { case (owner, repository) => t1.byRepository(owner, repository) }
        .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
      (t1.closed           === (condition.state == "closed").bind) &&
-      (t1.milestoneId.?      isEmpty, condition.milestone == Some(None)) &&
-      (t1.assignedUserName.? isEmpty, condition.assigned  == Some(None)) &&
+      //(t1.milestoneId      === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
+      (t1.milestoneId.?    isEmpty, condition.milestone == Some(None)) &&
+      (t1.assignedUserName === condition.assigned.get.bind, condition.assigned.isDefined) &&
      (t1.openedUserName   === condition.author.get.bind, condition.author.isDefined) &&
      (t1.pullRequest      === pullRequest.bind) &&
      // Milestone filter
@@ -239,8 +228,6 @@ trait IssuesService {
        (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) &&
        (t2.title === condition.milestone.get.get.bind)
      } exists, condition.milestone.flatten.isDefined) &&
-      // Assignee filter
-      (t1.assignedUserName === condition.assigned.get.get.bind, condition.assigned.flatten.isDefined) &&
      // Label filter
      (IssueLabels filter { t2 =>
        (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
@@ -433,11 +420,6 @@ trait IssuesService {
    }
  }

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

 object IssuesService {
@@ -449,7 +431,7 @@ object IssuesService {
      labels: Set[String] = Set.empty,
      milestone: Option[Option[String]] = None,
      author: Option[String] = None,
-      assigned: Option[Option[String]] = None,
+      assigned: Option[String] = None,
      mentioned: Option[String] = None,
      state: String = "open",
      sort: String = "created",
@@ -493,15 +475,12 @@ object IssuesService {
    def toURL: String =
      "?" + List(
        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
-        milestone.map {
+        milestone.map { _ match {
          case Some(x) => "milestone=" + urlEncode(x)
          case None    => "milestone=none"
-        },
+        }},
        author   .map(x => "author="    + urlEncode(x)),
-        assigned.map {
-          case Some(x) => "assigned="  + urlEncode(x)
-          case None    => "assigned=none"
-        },
+        assigned .map(x => "assigned="  + urlEncode(x)),
        mentioned.map(x => "mentioned=" + urlEncode(x)),
        Some("state="     + urlEncode(state)),
        Some("sort="      + urlEncode(sort)),
@@ -519,6 +498,46 @@ object IssuesService {
      if(value == null || value.isEmpty || (allow.nonEmpty && !allow.contains(value))) None else Some(value)
    }

+    /**
+     * Restores IssueSearchCondition instance from filter query.
+     */
+    def apply(filter: String, milestones: Map[String, Int]): IssueSearchCondition = {
+      val conditions = filter.split("[ 　\t]+").flatMap { x =>
+        x.split(":") match {
+           case Array(key, value) => Some((key, value))
+           case _ => None
+        }
+      }.groupBy(_._1).map { case (key, values) =>
+        key -> values.map(_._2).toSeq
+      }
+
+      val (sort, direction) = conditions.get("sort").flatMap(_.headOption).getOrElse("created-desc") match {
+        case "created-asc"   => ("created" , "asc" )
+        case "comments-desc" => ("comments", "desc")
+        case "comments-asc"  => ("comments", "asc" )
+        case "updated-desc"  => ("comments", "desc")
+        case "updated-asc"   => ("comments", "asc" )
+        case _               => ("created" , "desc")
+      }
+
+      IssueSearchCondition(
+        conditions.get("label").map(_.toSet).getOrElse(Set.empty),
+        conditions.get("milestone").flatMap(_.headOption) match {
+          case None         => None
+          case Some("none") => Some(None)
+          case Some(x)      => Some(Some(x)) //milestones.get(x).map(x => Some(x))
+        },
+        conditions.get("author").flatMap(_.headOption),
+        conditions.get("assignee").flatMap(_.headOption),
+        conditions.get("mentions").flatMap(_.headOption),
+        conditions.get("is").getOrElse(Seq.empty).find(x => x == "open" || x == "closed").getOrElse("open"),
+        sort,
+        direction,
+        conditions.get("visibility").flatMap(_.headOption),
+        conditions.get("group").map(_.toSet).getOrElse(Set.empty)
+      )
+    }
+
    /**
     * Restores IssueSearchCondition instance from request parameters.
     */
@@ -530,10 +549,7 @@ object IssuesService {
          case x      => Some(x)
        },
        param(request, "author"),
-        param(request, "assigned").map {
-          case "none" => None
-          case x      => Some(x)
-        },
+        param(request, "assigned"),
        param(request, "mentioned"),
        param(request, "state",     Seq("open", "closed")).getOrElse("open"),
        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
--- a/src/main/scala/gitbucket/core/service/MilestonesService.scala
+++ b/src/main/scala/gitbucket/core/service/MilestonesService.scala
@@ -41,7 +41,7 @@ trait MilestonesService {

  def getMilestonesWithIssueCount(owner: String, repository: String)(implicit s: Session): List[(Milestone, Int, Int)] = {
    val counts = Issues
-      .filter  { t => t.byRepository(owner, repository) && (t.milestoneId.? isDefined) }
+      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId.? isDefined) }
      .groupBy { t => t.milestoneId -> t.closed }
      .map     { case (t1, t2) => t1._1 -> t1._2 -> t2.length }
      .toMap
@@ -52,6 +52,6 @@ trait MilestonesService {
  }

  def getMilestones(owner: String, repository: String)(implicit s: Session): List[Milestone] =
-    Milestones.filter(_.byRepository(owner, repository)).sortBy(t => (t.dueDate.asc, t.closedDate.desc, t.milestoneId.desc)).list
+    Milestones.filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list

 }
--- a/src/main/scala/gitbucket/core/service/PluginService.scala
+++ b/src/main/scala/gitbucket/core/service/PluginService.scala
@@ -0,0 +1,24 @@
+package gitbucket.core.service
+
+import gitbucket.core.model.Plugin
+import gitbucket.core.model.Profile._
+import profile.simple._
+
+trait PluginService {
+
+  def getPlugins()(implicit s: Session): List[Plugin] =
+    Plugins.sortBy(_.pluginId).list
+
+  def registerPlugin(plugin: Plugin)(implicit s: Session): Unit =
+    Plugins.insert(plugin)
+
+  def updatePlugin(plugin: Plugin)(implicit s: Session): Unit =
+    Plugins.filter(_.pluginId === plugin.pluginId.bind).map(_.version).update(plugin.version)
+
+  def deletePlugin(pluginId: String)(implicit s: Session): Unit =
+    Plugins.filter(_.pluginId === pluginId.bind).delete
+
+  def getPlugin(pluginId: String)(implicit s: Session): Option[Plugin] =
+    Plugins.filter(_.pluginId === pluginId.bind).firstOption
+
+}
--- a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
+++ b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
@@ -76,7 +76,7 @@ object ProtectedBranchService {
    includeAdministrators: Boolean) extends AccountService with CommitStatusService {

    def isAdministrator(pusher: String)(implicit session: Session): Boolean =
-      pusher == owner || getGroupMembers(owner).filter(gm => gm.userName == pusher && gm.isManager).nonEmpty
+      pusher == owner || getGroupMembers(owner).filter(gm => gm.userName == pusher && gm.manager).nonEmpty

    /**
     * Can't be force pushed
--- a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
@@ -21,12 +21,12 @@ trait RepositoryCreationService {
    // Insert to the database at first
    insertRepository(name, owner, description, isPrivate)

-//    // Add collaborators for group repository
-//    if(ownerAccount.isGroupAccount){
-//      getGroupMembers(owner).foreach { member =>
-//        addCollaborator(owner, name, member.userName)
-//      }
-//    }
+    // Add collaborators for group repository
+    if(ownerAccount.groupAccount){
+      getGroupMembers(owner).foreach { member =>
+        addCollaborator(owner, name, member.userName)
+      }
+    }

    // Insert default labels
    insertDefaultLabels(owner, name)
--- a/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
@@ -53,30 +53,7 @@ trait RepositorySearchService { self: IssuesService =>
      }
    }

-  def countWikiPages(owner: String, repository: String, query: String): Int =
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(JGitUtil.isEmpty(git)) 0 else searchRepositoryFiles(git, query).length
-    }
-
-  def searchWikiPages(owner: String, repository: String, query: String): List[FileSearchResult] =
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(JGitUtil.isEmpty(git)){
-        Nil
-      } else {
-        val files = searchRepositoryFiles(git, query)
-        val commits = JGitUtil.getLatestCommitFromPaths(git, files.map(_._1), "HEAD")
-        files.map { case (path, text) =>
-          val (highlightText, lineNumber) = getHighlightText(text, query)
-          FileSearchResult(
-            path.replaceFirst("\\.md$", ""),
-            commits(path).getCommitterIdent.getWhen,
-            highlightText,
-            lineNumber)
-        }
-      }
-    }
-
-  def searchRepositoryFiles(git: Git, query: String): List[(String, String)] = {
+  private def searchRepositoryFiles(git: Git, query: String): List[(String, String)] = {
    val revWalk   = new RevWalk(git.getRepository)
    val objectId  = git.getRepository.resolve("HEAD")
    val revCommit = revWalk.parseCommit(objectId)
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.service

 import gitbucket.core.controller.Context
-import gitbucket.core.model.{Collaborator, Repository, RepositoryOptions, Account, Role}
+import gitbucket.core.model.{Collaborator, Repository, Account}
 import gitbucket.core.model.Profile._
 import gitbucket.core.util.JGitUtil
 import profile.simple._
@@ -27,7 +27,7 @@ trait RepositoryService { self: AccountService =>
      Repository(
        userName             = userName,
        repositoryName       = repositoryName,
-        isPrivate            = isPrivate,
+        `private`            = isPrivate,
        description          = description,
        defaultBranch        = "master",
        registeredDate       = currentDate,
@@ -36,15 +36,7 @@ trait RepositoryService { self: AccountService =>
        originUserName       = originUserName,
        originRepositoryName = originRepositoryName,
        parentUserName       = parentUserName,
-        parentRepositoryName = parentRepositoryName,
-        options              = RepositoryOptions(
-          issuesOption         = "PUBLIC", // TODO DISABLE for the forked repository?
-          externalIssuesUrl    = None,
-          wikiOption           = "PUBLIC", // TODO DISABLE for the forked repository?
-          externalWikiUrl      = None,
-          allowFork            = true
-        )
-      )
+        parentRepositoryName = parentRepositoryName)

    IssueId insert (userName, repositoryName, 0)
  }
@@ -123,8 +115,11 @@ trait RepositoryService { self: AccountService =>
          repositoryName = newRepositoryName
        )) :_*)

-        // TODO Drop transfered owner from collaborators?
-        Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        if(account.groupAccount){
+          Collaborators.insertAll(getGroupMembers(newUserName).map(m => Collaborator(newUserName, newRepositoryName, m.userName)) :_*)
+        } else {
+          Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        }

        // Update activity messages
        Activities.filter { t =>
@@ -227,7 +222,7 @@ trait RepositoryService { self: AccountService =>
   * Include public repository, private own repository and private but collaborator repository.
   *
   * @param userName the user name of collaborator
-   * @return the repository information list
+   * @return the repository infomation list
   */
  def getAllRepositories(userName: String)(implicit s: Session): List[(String, String)] = {
    Repositories.filter { t1 =>
@@ -275,9 +270,9 @@ trait RepositoryService { self: AccountService =>
                            (implicit s: Session): List[RepositoryInfo] = {
    (loginAccount match {
      // for Administrators
-      case Some(x) if(x.isAdmin) => Repositories
+      case Some(x) if(x.administrator) => Repositories
      // for Normal Users
-      case Some(x) if(!x.isAdmin) =>
+      case Some(x) if(!x.administrator) =>
        Repositories filter { t => (t.isPrivate === false.bind) || (t.userName === x.userName) ||
          (Collaborators.filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName === x.userName.bind)} exists)
        }
@@ -302,8 +297,8 @@ trait RepositoryService { self: AccountService =>
  }

  private def getRepositoryManagers(userName: String)(implicit s: Session): Seq[String] =
-    if(getAccountByUserName(userName).exists(_.isGroupAccount)){
-      getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
+    if(getAccountByUserName(userName).exists(_.groupAccount)){
+      getGroupMembers(userName).collect { case x if(x.manager) => x.userName }
    } else {
      Seq(userName)
    }
@@ -318,13 +313,10 @@ trait RepositoryService { self: AccountService =>
   * Save repository options.
   */
  def saveRepositoryOptions(userName: String, repositoryName: String,
-      description: Option[String], isPrivate: Boolean,
-      issuesOption: String, externalIssuesUrl: Option[String],
-      wikiOption: String, externalWikiUrl: Option[String],
-      allowFork: Boolean)(implicit s: Session): Unit =
+      description: Option[String], isPrivate: Boolean)(implicit s: Session): Unit =
    Repositories.filter(_.byRepository(userName, repositoryName))
-      .map { r => (r.description.?, r.isPrivate, r.issuesOption, r.externalIssuesUrl.?, r.wikiOption, r.externalWikiUrl.?, r.allowFork, r.updatedDate) }
-      .update (description, isPrivate, issuesOption, externalIssuesUrl, wikiOption, externalWikiUrl, allowFork, currentDate)
+      .map { r => (r.description.?, r.isPrivate, r.updatedDate) }
+      .update (description, isPrivate, currentDate)

  def saveRepositoryDefaultBranch(userName: String, repositoryName: String,
      defaultBranch: String)(implicit s: Session): Unit =
@@ -333,64 +325,49 @@ trait RepositoryService { self: AccountService =>
      .update (defaultBranch)

  /**
-   * Add collaborator (user or group) to the repository.
+   * Add collaborator to the repository.
+   *
+   * @param userName the user name of the repository owner
+   * @param repositoryName the repository name
+   * @param collaboratorName the collaborator name
   */
-  def addCollaborator(userName: String, repositoryName: String, collaboratorName: String, role: String)(implicit s: Session): Unit =
-    Collaborators insert Collaborator(userName, repositoryName, collaboratorName, role)
+  def addCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
+    Collaborators insert Collaborator(userName, repositoryName, collaboratorName)
+
+  /**
+   * Remove collaborator from the repository.
+   * 
+   * @param userName the user name of the repository owner
+   * @param repositoryName the repository name
+   * @param collaboratorName the collaborator name
+   */
+  def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
+    Collaborators.filter(_.byPrimaryKey(userName, repositoryName, collaboratorName)).delete

  /**
   * Remove all collaborators from the repository.
+   *
+   * @param userName the user name of the repository owner
+   * @param repositoryName the repository name
   */
  def removeCollaborators(userName: String, repositoryName: String)(implicit s: Session): Unit =
    Collaborators.filter(_.byRepository(userName, repositoryName)).delete

  /**
-   * Returns the list of collaborators name (user name or group name) which is sorted with ascending order.
+   * Returns the list of collaborators name which is sorted with ascending order.
+   * 
+   * @param userName the user name of the repository owner
+   * @param repositoryName the repository name
+   * @return the list of collaborators name
   */
-  def getCollaborators(userName: String, repositoryName: String)(implicit s: Session): List[(Collaborator, Boolean)] =
-    Collaborators
-      .innerJoin(Accounts).on(_.collaboratorName === _.userName)
-      .filter { case (t1, t2) => t1.byRepository(userName, repositoryName) }
-      .map { case (t1, t2) => (t1, t2.groupAccount) }
-      .sortBy { case (t1, t2) => t1.collaboratorName }
-      .list
+  def getCollaborators(userName: String, repositoryName: String)(implicit s: Session): List[String] =
+    Collaborators.filter(_.byRepository(userName, repositoryName)).sortBy(_.collaboratorName).map(_.collaboratorName).list

-  /**
-   * Returns the list of all collaborator name and permission which is sorted with ascending order.
-   * If a group is added as a collaborator, this method returns users who are belong to that group.
-   */
-  def getCollaboratorUserNames(userName: String, repositoryName: String, filter: Seq[Role] = Nil)(implicit s: Session): List[String] = {
-    val q1 = Collaborators
-      .innerJoin(Accounts).on { case (t1, t2) => (t1.collaboratorName === t2.userName) && (t2.groupAccount === false.bind) }
-      .filter { case (t1, t2) => t1.byRepository(userName, repositoryName) }
-      .map { case (t1, t2) => (t1.collaboratorName, t1.role) }
-
-    val q2 = Collaborators
-      .innerJoin(Accounts).on { case (t1, t2) => (t1.collaboratorName === t2.userName) && (t2.groupAccount === true.bind) }
-      .innerJoin(GroupMembers).on { case ((t1, t2), t3) => t2.userName === t3.groupName }
-      .filter { case ((t1, t2), t3) => t1.byRepository(userName, repositoryName) }
-      .map { case ((t1, t2), t3) => (t3.userName, t1.role) }
-
-    q1.union(q2).list.filter { x => filter.isEmpty || filter.exists(_.name == x._2) }.map(_._1)
-  }
-
-
-  def hasDeveloperRole(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
+  def hasWritePermission(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
    loginAccount match {
-      case Some(a) if(a.isAdmin) => true
+      case Some(a) if(a.administrator) => true
      case Some(a) if(a.userName == owner) => true
-      case Some(a) if(getGroupMembers(owner).exists(_.userName == a.userName)) => true
-      case Some(a) if(getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER)).contains(a.userName)) => true
-      case _ => false
-    }
-  }
-
-  def hasGuestRole(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
-    loginAccount match {
-      case Some(a) if(a.isAdmin) => true
-      case Some(a) if(a.userName == owner) => true
-      case Some(a) if(getGroupMembers(owner).exists(_.userName == a.userName)) => true
-      case Some(a) if(getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER, Role.GUEST)).contains(a.userName)) => true
+      case Some(a) if(getCollaborators(owner, repository).contains(a.userName)) => true
      case _ => false
    }
  }
@@ -435,23 +412,14 @@ object RepositoryService {

    def httpUrl(implicit context: Context): String = RepositoryService.httpUrl(owner, name)
    def sshUrl(implicit context: Context): Option[String] = RepositoryService.sshUrl(owner, name)
-
-    def splitPath(path: String): (String, String) = {
-      val id = branchList.collectFirst {
-        case branch if(path == branch || path.startsWith(branch + "/")) => branch
-      } orElse tags.collectFirst {
-        case tag if(path == tag.name || path.startsWith(tag.name + "/")) => tag.name
-      } getOrElse path.split("/")(0)
-
-      (id, path.substring(id.length).stripPrefix("/"))
-    }
-
  }

  def httpUrl(owner: String, name: String)(implicit context: Context): String = s"${context.baseUrl}/git/${owner}/${name}.git"
  def sshUrl(owner: String, name: String)(implicit context: Context): Option[String] =
    if(context.settings.ssh){
-      context.settings.sshAddress.map { x => s"ssh://${x.genericUser}@${x.host}:${x.port}/${owner}/${name}.git" }
+      context.loginAccount.flatMap { loginAccount =>
+        context.settings.sshAddress.map { x => s"ssh://${loginAccount.userName}@${x.host}:${x.port}/${owner}/${name}.git" }
+      }
    } else None
  def openRepoUrl(openUrl: String)(implicit context: Context): String = s"github-${context.platform}://openRepo/${openUrl}"

--- a/src/main/scala/gitbucket/core/service/RequestCache.scala
+++ b/src/main/scala/gitbucket/core/service/RequestCache.scala
@@ -11,7 +11,7 @@ import Implicits.request2Session
 * It may be called many times in one request, so each method stores
 * its result into the cache which available during a request.
 */
-trait RequestCache extends SystemSettingsService with AccountService with IssuesService with RepositoryService {
+trait RequestCache extends SystemSettingsService with AccountService with IssuesService {

  private implicit def context2Session(implicit context: Context): Session =
    request2Session(context.request)
--- a/src/main/scala/gitbucket/core/service/SshKeyService.scala
+++ b/src/main/scala/gitbucket/core/service/SshKeyService.scala
@@ -12,9 +12,6 @@ trait SshKeyService {
  def getPublicKeys(userName: String)(implicit s: Session): List[SshKey] =
    SshKeys.filter(_.userName === userName.bind).sortBy(_.sshKeyId).list

-  def getAllKeys()(implicit s: Session): List[SshKey] =
-    SshKeys.filter(_.publicKey.trim =!= "").list
-
  def deletePublicKey(userName: String, sshKeyId: Int)(implicit s: Session): Unit =
    SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete

--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -73,7 +73,7 @@ trait SystemSettingsService {
        getValue(props, AllowAccountRegistration, false),
        getValue(props, AllowAnonymousAccess, true),
        getValue(props, IsCreateRepoOptionPublic, true),
-        getValue(props, Gravatar, false),
+        getValue(props, Gravatar, true),
        getValue(props, Notification, false),
        getOptionValue[Int](props, ActivityLogLimit, None),
        getValue(props, Ssh, false),
@@ -141,11 +141,7 @@ object SystemSettingsService {
      for {
        host <- sshHost if ssh
      }
-      yield SshAddress(
-        host,
-        sshPort.getOrElse(DefaultSshPort),
-        "git"
-      )
+      yield SshAddress(host, sshPort.getOrElse(DefaultSshPort))
  }

  case class Ldap(
@@ -173,8 +169,7 @@ object SystemSettingsService {

  case class SshAddress(
    host:String,
-    port:Int,
-    genericUser:String)
+    port:Int)

  val DefaultSshPort = 29418
  val DefaultSmtpPort = 25
--- a/src/main/scala/gitbucket/core/service/WebHookService.scala
+++ b/src/main/scala/gitbucket/core/service/WebHookService.scala
@@ -1,5 +1,7 @@
 package gitbucket.core.service

+import java.io.ByteArrayInputStream
+
 import fr.brouillard.oss.security.xhub.XHub
 import fr.brouillard.oss.security.xhub.XHub.{XHubDigest, XHubConverter}
 import gitbucket.core.api._
@@ -10,6 +12,7 @@ import profile.simple._
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.RepositoryName
 import gitbucket.core.service.RepositoryService.RepositoryInfo
+
 import org.apache.http.NameValuePair
 import org.apache.http.client.entity.UrlEncodedFormEntity
 import org.apache.http.message.BasicNameValuePair
@@ -19,9 +22,6 @@ import org.slf4j.LoggerFactory
 import scala.concurrent._
 import org.apache.http.HttpRequest
 import org.apache.http.HttpResponse
-import gitbucket.core.model.WebHookContentType
-import org.apache.http.client.entity.EntityBuilder
-import org.apache.http.entity.ContentType


 trait WebHookService {
@@ -52,15 +52,15 @@ trait WebHookService {
      .map{ case (w,t) => w -> t.event }
      .list.groupBy(_._1).mapValues(_.map(_._2).toSet).headOption

-  def addWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType,  token: Option[String])(implicit s: Session): Unit = {
-    WebHooks insert WebHook(owner, repository, url, ctype, token)
+  def addWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], token: Option[String])(implicit s: Session): Unit = {
+    WebHooks insert WebHook(owner, repository, url, token)
    events.toSet.map{ event: WebHook.Event =>
      WebHookEvents insert WebHookEvent(owner, repository, url, event)
    }
  }

-  def updateWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
-    WebHooks.filter(_.byPrimaryKey(owner, repository, url)).map(w => (w.ctype, w.token)).update((ctype, token))
+  def updateWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], token: Option[String])(implicit s: Session): Unit = {
+    WebHooks.filter(_.byPrimaryKey(owner, repository, url)).map(w => w.token).update(token)
    WebHookEvents.filter(_.byWebHook(owner, repository, url)).delete
    events.toSet.map{ event: WebHook.Event =>
      WebHookEvents insert WebHookEvent(owner, repository, url, event)
@@ -97,32 +97,22 @@ trait WebHookService {
            }
          }
          try{
-            val httpClient = HttpClientBuilder.create.useSystemProperties.addInterceptorLast(itcp).build
+            val httpClient = HttpClientBuilder.create.addInterceptorLast(itcp).build
            logger.debug(s"start web hook invocation for ${webHook.url}")
            val httpPost = new HttpPost(webHook.url)
-            logger.info(s"Content-Type: ${webHook.ctype.ctype}")
-            httpPost.addHeader("Content-Type", webHook.ctype.ctype)
+            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded")
            httpPost.addHeader("X-Github-Event", event.name)
            httpPost.addHeader("X-Github-Delivery", java.util.UUID.randomUUID().toString)

-            webHook.ctype match {
-              case WebHookContentType.FORM => {
-            	  val params: java.util.List[NameValuePair] = new java.util.ArrayList()
-                params.add(new BasicNameValuePair("payload", json))
-                def postContent = new UrlEncodedFormEntity(params, "UTF-8")
-                httpPost.setEntity(postContent)
-                if (webHook.token.exists(_.trim.nonEmpty)) {
-                  // TODO find a better way and see how to extract content from postContent
-                  val contentAsBytes = URLEncodedUtils.format(params, "UTF-8").getBytes("UTF-8")
-                  httpPost.addHeader("X-Hub-Signature", XHub.generateHeaderXHubToken(XHubConverter.HEXA_LOWERCASE, XHubDigest.SHA1, webHook.token.get, contentAsBytes))
-                }
-              }
-              case WebHookContentType.JSON => {
-            	  httpPost.setEntity(EntityBuilder.create().setContentType(ContentType.APPLICATION_JSON).setText(json).build())
-                if (webHook.token.exists(_.trim.nonEmpty)) {
-                  httpPost.addHeader("X-Hub-Signature", XHub.generateHeaderXHubToken(XHubConverter.HEXA_LOWERCASE, XHubDigest.SHA1, webHook.token.orNull, json.getBytes("UTF-8")))
-                }
-              }
+            val params: java.util.List[NameValuePair] = new java.util.ArrayList()
+            params.add(new BasicNameValuePair("payload", json))
+            def postContent = new UrlEncodedFormEntity(params, "UTF-8")
+            httpPost.setEntity(postContent)
+
+            if (!webHook.token.isEmpty) {
+              // TODO find a better way and see how to extract content from postContent
+              val contentAsBytes = URLEncodedUtils.format(params, "UTF-8").getBytes("UTF-8")
+              httpPost.addHeader("X-Hub-Signature", XHub.generateHeaderXHubToken(XHubConverter.HEXA_LOWERCASE, XHubDigest.SHA1, webHook.token.orNull, contentAsBytes))
            }

            val res = httpClient.execute(httpPost)
--- a/src/main/scala/gitbucket/core/servlet/AccessTokenAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/AccessTokenAuthenticationFilter.scala
@@ -4,14 +4,15 @@ import javax.servlet._
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}

 import gitbucket.core.model.Account
-import gitbucket.core.service.SystemSettingsService.SystemSettings
-import gitbucket.core.service.{AccessTokenService, AccountService, SystemSettingsService}
-import gitbucket.core.util.{AuthUtil, Keys}
+import gitbucket.core.service.AccessTokenService
+import gitbucket.core.util.Keys
+
 import org.scalatra.servlet.ServletApiImplicits._
 import org.scalatra._


-class ApiAuthenticationFilter extends Filter with AccessTokenService with AccountService with SystemSettingsService {
+class AccessTokenAuthenticationFilter extends Filter with AccessTokenService {
+  private val tokenHeaderPrefix = "token "

  override def init(filterConfig: FilterConfig): Unit = {}

@@ -22,9 +23,9 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun
    implicit val session = req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
    val response = res.asInstanceOf[HttpServletResponse]
    Option(request.getHeader("Authorization")).map{
-      case auth if auth.startsWith("token ") => AccessTokenService.getAccountByAccessToken(auth.substring(6).trim).toRight(())
-      case auth if auth.startsWith("Basic ") => doBasicAuth(auth, loadSystemSettings(), request).toRight(())
-      case _ => Left(())
+      case auth if auth.startsWith("token ") => AccessTokenService.getAccountByAccessToken(auth.substring(6).trim).toRight(Unit)
+      // TODO Basic Authentication Support
+      case _ => Left(Unit)
    }.orElse{
      Option(request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]).map(Right(_))
    } match {
@@ -39,10 +40,4 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun
      }
    }
  }
-
-  def doBasicAuth(auth: String, settings: SystemSettings, request: HttpServletRequest): Option[Account] = {
-    implicit val session = request.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
-    val Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2)
-    authenticate(settings, username, password)
-  }
 }
--- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
+++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
@@ -0,0 +1,186 @@
+package gitbucket.core.servlet
+
+import java.io.File
+import java.sql.{DriverManager, Connection}
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.service.SystemSettingsService
+import gitbucket.core.util._
+import org.apache.commons.io.FileUtils
+import javax.servlet.{ServletContextListener, ServletContextEvent}
+import org.slf4j.LoggerFactory
+import Directory._
+import ControlUtil._
+import JDBCUtil._
+import org.eclipse.jgit.api.Git
+import gitbucket.core.util.Versions
+import gitbucket.core.util.Directory
+
+object AutoUpdate {
+
+  /**
+   * The history of versions. A head of this sequence is the current GitBucket version.
+   */
+  val versions = Seq(
+    new Version(3, 13),
+    new Version(3, 12),
+    new Version(3, 11),
+    new Version(3, 10),
+    new Version(3, 9),
+    new Version(3, 8),
+    new Version(3, 7) with SystemSettingsService {
+      override def update(conn: Connection, cl: ClassLoader): Unit = {
+        super.update(conn, cl)
+        val settings = loadSystemSettings()
+        if(settings.notification){
+          saveSystemSettings(settings.copy(useSMTP = true))
+        }
+      }
+    },
+    new Version(3, 6),
+    new Version(3, 5),
+    new Version(3, 4),
+    new Version(3, 3),
+    new Version(3, 2),
+    new Version(3, 1),
+    new Version(3, 0),
+    new Version(2, 8),
+    new Version(2, 7) {
+      override def update(conn: Connection, cl: ClassLoader): Unit = {
+        super.update(conn, cl)
+        conn.select("SELECT * FROM REPOSITORY"){ rs =>
+          // Rename attached files directory from /issues to /comments
+          val userName = rs.getString("USER_NAME")
+          val repoName = rs.getString("REPOSITORY_NAME")
+          defining(Directory.getAttachedDir(userName, repoName)){ newDir =>
+            val oldDir = new File(newDir.getParentFile, "issues")
+            if(oldDir.exists && oldDir.isDirectory){
+              oldDir.renameTo(newDir)
+            }
+          }
+          // Update ORIGIN_USER_NAME and ORIGIN_REPOSITORY_NAME if it does not exist
+          val originalUserName = rs.getString("ORIGIN_USER_NAME")
+          val originalRepoName = rs.getString("ORIGIN_REPOSITORY_NAME")
+          if(originalUserName != null && originalRepoName != null){
+            if(conn.selectInt("SELECT COUNT(*) FROM REPOSITORY WHERE USER_NAME = ? AND REPOSITORY_NAME = ?",
+              originalUserName, originalRepoName) == 0){
+              conn.update("UPDATE REPOSITORY SET ORIGIN_USER_NAME = NULL, ORIGIN_REPOSITORY_NAME = NULL " +
+                "WHERE USER_NAME = ? AND REPOSITORY_NAME = ?", userName, repoName)
+            }
+          }
+          // Update PARENT_USER_NAME and PARENT_REPOSITORY_NAME if it does not exist
+          val parentUserName = rs.getString("PARENT_USER_NAME")
+          val parentRepoName = rs.getString("PARENT_REPOSITORY_NAME")
+          if(parentUserName != null && parentRepoName != null){
+            if(conn.selectInt("SELECT COUNT(*) FROM REPOSITORY WHERE USER_NAME = ? AND REPOSITORY_NAME = ?",
+              parentUserName, parentRepoName) == 0){
+              conn.update("UPDATE REPOSITORY SET PARENT_USER_NAME = NULL, PARENT_REPOSITORY_NAME = NULL " +
+                "WHERE USER_NAME = ? AND REPOSITORY_NAME = ?", userName, repoName)
+            }
+          }
+        }
+      }
+    },
+    new Version(2, 6),
+    new Version(2, 5),
+    new Version(2, 4),
+    new Version(2, 3) {
+      override def update(conn: Connection, cl: ClassLoader): Unit = {
+        super.update(conn, cl)
+        conn.select("SELECT ACTIVITY_ID, ADDITIONAL_INFO FROM ACTIVITY WHERE ACTIVITY_TYPE='push'"){ rs =>
+          val curInfo = rs.getString("ADDITIONAL_INFO")
+          val newInfo = curInfo.split("\n").filter(_ matches "^[0-9a-z]{40}:.*").mkString("\n")
+          if (curInfo != newInfo) {
+            conn.update("UPDATE ACTIVITY SET ADDITIONAL_INFO = ? WHERE ACTIVITY_ID = ?", newInfo, rs.getInt("ACTIVITY_ID"))
+          }
+        }
+        ignore {
+          FileUtils.deleteDirectory(Directory.getPluginCacheDir())
+          //FileUtils.deleteDirectory(new File(Directory.PluginHome))
+        }
+      }
+    },
+    new Version(2, 2),
+    new Version(2, 1),
+    new Version(2, 0){
+      override def update(conn: Connection, cl: ClassLoader): Unit = {
+        import eu.medsea.mimeutil.{MimeUtil2, MimeType}
+
+        val mimeUtil = new MimeUtil2()
+        mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector")
+
+        super.update(conn, cl)
+        conn.select("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY"){ rs =>
+          defining(Directory.getAttachedDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))){ dir =>
+            if(dir.exists && dir.isDirectory){
+              dir.listFiles.foreach { file =>
+                if(file.getName.indexOf('.') < 0){
+                  val mimeType = MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString
+                  if(mimeType.startsWith("image/")){
+                    file.renameTo(new File(file.getParent, file.getName + "." + mimeType.split("/")(1)))
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    Version(1, 13),
+    Version(1, 12),
+    Version(1, 11),
+    Version(1, 10),
+    Version(1, 9),
+    Version(1, 8),
+    Version(1, 7),
+    Version(1, 6),
+    Version(1, 5),
+    Version(1, 4),
+    new Version(1, 3){
+      override def update(conn: Connection, cl: ClassLoader): Unit = {
+        super.update(conn, cl)
+        // Fix wiki repository configuration
+        conn.select("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY"){ rs =>
+          using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
+            defining(git.getRepository.getConfig){ config =>
+              if(!config.getBoolean("http", "receivepack", false)){
+                config.setBoolean("http", null, "receivepack", true)
+                config.save
+              }
+            }
+          }
+        }
+      }
+    },
+    Version(1, 2),
+    Version(1, 1),
+    Version(1, 0),
+    Version(0, 0)
+  )
+
+  /**
+   * The head version of GitBucket.
+   */
+  val headVersion = versions.head
+
+  /**
+   * The version file (GITBUCKET_HOME/version).
+   */
+  lazy val versionFile = new File(GitBucketHome, "version")
+
+  /**
+   * Returns the current version from the version file.
+   */
+  def getCurrentVersion(): Version = {
+    if(versionFile.exists){
+      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
+        case Array(majorVersion, minorVersion) => {
+          versions.find { v =>
+            v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
+          }.getOrElse(Version(0, 0))
+        }
+        case _ => Version(0, 0)
+      }
+    } else Version(0, 0)
+  }
+
+}
--- a/src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
@@ -5,16 +5,16 @@ import javax.servlet.http._
 import gitbucket.core.plugin.{GitRepositoryFilter, GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.service.{RepositoryService, AccountService, SystemSettingsService}
-import gitbucket.core.util.{Keys, Implicits, AuthUtil}
+import gitbucket.core.util.{Keys, Implicits}
 import org.slf4j.LoggerFactory
 import Implicits._

 /**
 * Provides BASIC Authentication for [[GitRepositoryServlet]].
 */
-class GitAuthenticationFilter extends Filter with RepositoryService with AccountService with SystemSettingsService {
+class BasicAuthenticationFilter extends Filter with RepositoryService with AccountService with SystemSettingsService {

-  private val logger = LoggerFactory.getLogger(classOf[GitAuthenticationFilter])
+  private val logger = LoggerFactory.getLogger(classOf[BasicAuthenticationFilter])

  def init(config: FilterConfig) = {}
  
@@ -43,7 +43,7 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
    } catch {
      case ex: Exception => {
        logger.error("error", ex)
-        AuthUtil.requireAuth(response)
+        requireAuth(response)
      }
    }
  }
@@ -54,7 +54,7 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account

    val account = for {
      auth <- Option(request.getHeader("Authorization"))
-      Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2)
+      Array(username, password) = decodeAuthHeader(auth).split(":", 2)
      account <- authenticate(settings, username, password)
    } yield {
      request.setAttribute(Keys.Request.UserName, account.userName)
@@ -64,7 +64,7 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
    if(filter.filter(request.gitRepositoryPath, account.map(_.userName), settings, isUpdating)){
      chain.doFilter(request, response)
    } else {
-      AuthUtil.requireAuth(response)
+      requireAuth(response)
    }
  }

@@ -76,15 +76,15 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
      case Array(_, repositoryOwner, repositoryName, _*) =>
        getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", "")) match {
          case Some(repository) => {
-            if(!isUpdating && !repository.repository.isPrivate && settings.allowAnonymousAccess){
+            if(!isUpdating && !repository.repository.`private` && settings.allowAnonymousAccess){
              chain.doFilter(request, response)
            } else {
              val passed = for {
                auth <- Option(request.getHeader("Authorization"))
-                Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2)
+                Array(username, password) = decodeAuthHeader(auth).split(":", 2)
                account <- authenticate(settings, username, password)
-              } yield if(isUpdating || repository.repository.isPrivate){
-                  if(hasDeveloperRole(repository.owner, repository.name, Some(account))){
+              } yield if(isUpdating || repository.repository.`private`){
+                  if(hasWritePermission(repository.owner, repository.name, Some(account))){
                    request.setAttribute(Keys.Request.UserName, account.userName)
                    true
                  } else false
@@ -93,7 +93,7 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
              if(passed.getOrElse(false)){
                chain.doFilter(request, response)
              } else {
-                AuthUtil.requireAuth(response)
+                requireAuth(response)
              }
            }
          }
@@ -108,4 +108,17 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
      }
    }
  }
+
+  private def requireAuth(response: HttpServletResponse): Unit = {
+    response.setHeader("WWW-Authenticate", "BASIC realm=\"GitBucket\"")
+    response.sendError(HttpServletResponse.SC_UNAUTHORIZED)
+  }
+  
+  private def decodeAuthHeader(header: String): String = {
+    try {
+      new String(new sun.misc.BASE64Decoder().decodeBuffer(header.substring(6)))
+    } catch {
+      case _: Throwable => ""
+    }
+  }
 }
--- 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
				`@@ -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);`