Ready for 4.0 release

GitBucket 4.0 (MySQL and PostgreSQL support)

README.md

@@ -1,7 +1,10 @@
 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 GitHub clone powered by Scala which has easy installation and high extensibility.
+GitBucket is a Git platform powered by Scala offering:
+- easy installation
+- high extensibility by plugins
+- API compatibility with Github
 
 Features
 --------
@@ -56,10 +59,28 @@ 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 reproduce GitHub behavior, so we might reject if your request is against it.
+- First priority of GitBucket is easy installation and API compatibility with GitHub, so we might reject if your request is against it.
 
 Release Notes
 --------
+### 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)
+
+### 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

build.sbt

@@ -1,6 +1,6 @@
 val Organization = "gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "3.12.0"
+val GitBucketVersion = "4.0.0"
 val ScalatraVersion = "2.4.0"
 val JettyVersion = "9.3.6.v20151106"
 
@@ -10,14 +10,17 @@ sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.11.7"
+scalaVersion := "2.11.8"
 
 // dependency settings
 resolvers ++= Seq(
   Classpaths.typesafeReleases,
-  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
+  "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/"
 )
 libraryDependencies ++= Seq(
+  "org.scala-lang.modules"   %% "scala-java8-compat"           % "0.7.0",
   "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,
@@ -25,7 +28,8 @@ libraryDependencies ++= Seq(
   "org.json4s"               %% "json4s-jackson"               % "3.3.0",
   "io.github.gitbucket"      %% "scalatra-forms"               % "1.0.0",
   "commons-io"                % "commons-io"                   % "2.4",
-  "io.github.gitbucket"       % "markedj"                      % "1.0.7",
+  "io.github.gitbucket"       % "solidbase"                    % "1.0.0",
+  "io.github.gitbucket"       % "markedj"                      % "1.0.8",
   "org.apache.commons"        % "commons-compress"             % "1.10",
   "org.apache.commons"        % "commons-email"                % "1.4",
   "org.apache.httpcomponents" % "httpclient"                   % "4.5.1",
@@ -34,8 +38,10 @@ libraryDependencies ++= Seq(
   "com.typesafe.slick"       %% "slick"                        % "2.1.0",
   "com.novell.ldap"           % "jldap"                        % "2009-10-07",
   "com.h2database"            % "h2"                           % "1.4.190",
+  "mysql"                     % "mysql-connector-java"         % "5.1.38",
+  "org.postgresql"            % "postgresql"                   % "9.4.1208",
   "ch.qos.logback"            % "logback-classic"              % "1.1.1",
-  "com.mchange"               % "c3p0"                         % "0.9.5.2",
+  "com.zaxxer"                % "HikariCP"                     % "2.4.5",
   "com.typesafe"              % "config"                       % "1.3.0",
   "com.typesafe.akka"        %% "akka-actor"                   % "2.3.14",
   "fr.brouillard.oss.security.xhub" % "xhub4j-core"            % "1.0.0",
@@ -51,7 +57,7 @@ libraryDependencies ++= Seq(
 play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._"
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps")
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console")

doc/release.md

@@ -11,22 +11,24 @@ Note to update version number in files below:
 ```scala
 val Organization = "gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "3.12.0" // <---- update version!!
+val GitBucketVersion = "4.0.0" // <---- update version!!
 val ScalatraVersion = "2.4.0"
 val JettyVersion = "9.3.6.v20151106"
 ```
 
-### src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
+### src/main/scala/gitbucket/core/GitBucketCoreModule.scala
 
 ```scala
-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),
+object GitBucketCoreModule extends Module("gitbucket-core",
+  // add new version definition
+  new Version("4.1.0",
+    new LiquibaseMigration("update/gitbucket-core_4.1.xml")
+  ),
+  new Version("4.0.0",
+    new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
+    new SqlMigration("update/gitbucket-core_4.0.sql")
+  )
+)
 ```
 
 Generate release files

release/pom.xml

@@ -10,7 +10,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>1.0-beta-6</version>
+                <version>2.10</version>
             </extension>
         </extensions>
     </build>

src/main/java/org/postgresql/Driver2.java

@@ -0,0 +1,52 @@
+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);
+        }
+    }
+
+}
+

src/main/resources/database.conf

@@ -1,6 +0,0 @@
-db {
-  driver = "org.h2.Driver"
-  url = "jdbc:h2:${DatabaseHome};MVCC=true"
-  user = "sa"
-  password = "sa"
-}

src/main/resources/reference.conf

@@ -1,5 +0,0 @@
-c3p0 {
-  privilegeSpawnedThreads=true
-  contextClassLoaderSource=library
-}
-

src/main/resources/update/1_0.sql

@@ -1,135 +0,0 @@
-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
-);

src/main/resources/update/1_1.sql

@@ -1,8 +0,0 @@
--- 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);

src/main/resources/update/1_12.sql

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

src/main/resources/update/1_13.sql

@@ -1 +0,0 @@
-DROP TABLE COMMIT_LOG;

src/main/resources/update/1_2.sql

@@ -1,24 +0,0 @@
-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);
-

src/main/resources/update/1_3.sql

@@ -1,8 +0,0 @@
-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';

src/main/resources/update/1_4.sql

@@ -1,24 +0,0 @@
-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);

src/main/resources/update/1_5.sql

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

src/main/resources/update/1_6.sql

@@ -1,8 +0,0 @@
-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);

src/main/resources/update/1_7.sql

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

src/main/resources/update/1_8.sql

@@ -1 +0,0 @@
-ALTER TABLE ACCOUNT ADD COLUMN REMOVED BOOLEAN DEFAULT FALSE;

src/main/resources/update/2_3.sql

@@ -1,6 +0,0 @@
-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);

src/main/resources/update/2_7.sql

@@ -1,18 +0,0 @@
-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);

src/main/resources/update/2_8.sql

@@ -1 +0,0 @@
-ALTER TABLE COMMIT_COMMENT ALTER COLUMN FILE_NAME NVARCHAR(260);

src/main/resources/update/3_1.sql

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

src/main/resources/update/3_11.sql

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

src/main/resources/update/3_13.sql

@@ -1 +0,0 @@
-ALTER TABLE WEB_HOOK ADD COLUMN TOKEN VARCHAR(100);

src/main/resources/update/3_9.sql

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

src/main/resources/update/gitbucket-core_4.0.sql

@@ -0,0 +1,18 @@
+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);

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

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

src/main/scala/gitbucket/core/GitBucketCoreModule.scala

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

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

@@ -20,6 +20,16 @@ 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{

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

@@ -108,7 +108,9 @@ trait DashboardControllerBase extends ControllerBase {
         case _           => condition.copy(author    = Some(userName))
       },
       filter,
-      getGroupNames(userName))
+      getGroupNames(userName),
+      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true),
+      getUserRepositories(userName, withoutPhysicalInfo = true))
   }
 
   private def searchPullRequests(filter: String) = {
@@ -131,7 +133,9 @@ trait DashboardControllerBase extends ControllerBase {
         case _           => condition.copy(author    = Some(userName))
       },
       filter,
-      getGroupNames(userName))
+      getGroupNames(userName),
+      getVisibleRepositories(context.loginAccount, withoutPhysicalInfo = true),
+      getUserRepositories(userName, withoutPhysicalInfo = true))
   }
 
 

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

@@ -1,18 +1,26 @@
 package gitbucket.core.controller
 
-import gitbucket.core.util.{Keys, FileUtil}
+import gitbucket.core.model.Account
+import gitbucket.core.service.{AccountService, RepositoryService}
+import gitbucket.core.servlet.Database
+import gitbucket.core.util._
 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.FileUtils
+import org.apache.commons.io.{IOUtils, FileUtils}
 
 /**
  * Provides Ajax based file upload functionality.
  *
  * This servlet saves uploaded file.
  */
-class FileUploadController extends ScalatraServlet with FileUploadSupport {
+class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
 
   configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
 
@@ -31,6 +39,69 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport {
     }, 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.isImage)
+      }
+    } getOrElse BadRequest
+  }
+
+  post("/import") {
+    session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account if loginAccount.isAdmin =>
+      execute({ (file, fileId) =>
+        if(file.getName.endsWith(".xml")){
+          import JDBCUtil._
+          val conn = request2Session(request).conn
+          conn.importAsXML(file.getInputStream)
+        } else {
+          throw new RuntimeException("Import is available for only the XML file.")
+        }
+      }, _ => 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 =>

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

@@ -1,9 +1,8 @@
 package gitbucket.core.controller
 
-import gitbucket.core.api._
 import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
-import gitbucket.core.service.{RepositoryService, ActivityService, AccountService, RepositorySearchService, IssuesService}
+import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.{LDAPUtil, Keys, UsersAuthenticator, ReferrerAuthenticator, StringUtil}
@@ -138,13 +137,21 @@ trait IndexControllerBase extends ControllerBase {
 
       target.toLowerCase match {
         case "issue" => gitbucket.core.search.html.issues(
-          searchIssues(repository.owner, repository.name, query),
           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)
       }
     }

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

@@ -23,6 +23,7 @@ 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),
@@ -84,7 +85,11 @@ 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")
-      getLabel(owner, repository, value).map(_ => "Name has already been taken.")
+      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.")
+      }
     }
   }
 

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

@@ -178,7 +178,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           }
           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,
-                     "Merge branch '${alias}' into ${pullreq.requestBranch}") match {
+                     s"Merge branch '${alias}' into ${pullreq.requestBranch}") match {
             case None => // conflict
               flash += "error" -> s"Can't automatic merging branch '${alias}' into ${pullreq.requestBranch}."
             case Some(oldId) =>

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

@@ -15,6 +15,7 @@ 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
@@ -49,13 +50,16 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   )(CollaboratorForm.apply)
 
   // for web hook url addition
-  case class WebHookForm(url: String, events: Set[WebHook.Event], token: Option[String])
+  case class WebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, 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)))))
-  )(WebHookForm.apply)
+  )(
+    (url, events, ctype, token) => WebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+  )
 
   // for transfer ownership
   case class TransferOwnerShipForm(newOwner: String)
@@ -183,7 +187,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, "", None)
+    val webhook = WebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
     html.edithooks(webhook, Set(WebHook.Push), repository, flash.get("info"), true)
   })
 
@@ -191,7 +195,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.token)
+    addWebHook(repository.owner, repository.name, form.url, form.events, form.ctype, form.token)
     flash += "info" -> s"Webhook ${form.url} created"
     redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
   })
@@ -221,7 +225,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
 
       val url = params("url")
       val token = Some(params("token"))
-      val dummyWebHookInfo = WebHook(repository.owner, repository.name, url, token)
+      val ctype = WebHookContentType.valueOf(params("ctype"))
+      val dummyWebHookInfo = WebHook(repository.owner, repository.name, url, ctype, token)
       val dummyPayload = {
         val ownerAccount = getAccountByUserName(repository.owner).get
         val commits = if(repository.commitCount == 0) List.empty else git.log
@@ -280,7 +285,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * 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.token)
+    updateWebHook(repository.owner, repository.name, form.url, form.events, form.ctype, form.token)
     flash += "info" -> s"webhook ${form.url} updated"
     redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
   })

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

@@ -497,6 +497,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       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)
   })
 
@@ -507,13 +511,7 @@ 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,
-                  context.loginAccount match {
-                    case None => List()
-                    case account: Option[Account] => getGroupsByUserName(account.get.userName)
-                  })
+        html.find(ref, treeId, repository)
       } getOrElse NotFound
     }
   })
@@ -575,10 +573,6 @@ 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, hasWritePermission(repository.owner, repository.name, context.loginAccount),
               getPullRequestFromBranch(repository.owner, repository.name, revstr, repository.repository.defaultBranch),

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

@@ -1,5 +1,7 @@
 package gitbucket.core.controller
 
+import java.io.FileInputStream
+
 import gitbucket.core.admin.html
 import gitbucket.core.service.{AccountService, SystemSettingsService, RepositoryService}
 import gitbucket.core.util.AdminAuthenticator
@@ -11,7 +13,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
+import org.apache.commons.io.{IOUtils, FileUtils}
 import org.scalatra.i18n.Messages
 
 class SystemSettingsController extends SystemSettingsControllerBase
@@ -74,6 +76,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   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,
@@ -268,6 +271,32 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
     }
   })
 
+  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 session = request2Session(request)
+    val file = if(params("type") == "sql"){
+      session.conn.exportAsSQL(request.getParameterValues("tableNames").toSeq)
+    } else {
+      session.conn.exportAsXML(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 {

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

@@ -12,7 +12,8 @@ import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
 
 class WikiController extends WikiControllerBase 
-  with WikiService with RepositoryService with AccountService with ActivityService with CollaboratorsAuthenticator 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 CollaboratorsAuthenticator with ReferrerAuthenticator =>

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

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

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

@@ -1,5 +1,6 @@
 package gitbucket.core.model
 
+import gitbucket.core.util.DatabaseConfig
 
 trait Profile {
   val profile: slick.driver.JdbcProfile
@@ -28,7 +29,9 @@ trait Profile {
 }
 
 trait ProfileProvider { self: Profile =>
-  val profile = slick.driver.H2Driver
+
+  lazy val profile = DatabaseConfig.slickDriver
+
 }
 
 trait CoreProfile extends ProfileProvider with Profile
@@ -49,7 +52,6 @@ trait CoreProfile extends ProfileProvider with Profile
   with SshKeyComponent
   with WebHookComponent
   with WebHookEventComponent
-  with PluginComponent
   with ProtectedBranchComponent
 
 object Profile extends CoreProfile

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

@@ -3,21 +3,42 @@ 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)
-    def * = (userName, repositoryName, url, token) <> ((WebHook.apply _).tupled, WebHook.unapply)
+    val ctype = column[WebHookContentType]("CTYPE", O.NotNull)
+    def * = (userName, repositoryName, url, ctype, 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]
 )
 

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

@@ -1,16 +1,18 @@
 package gitbucket.core.plugin
 
 import javax.servlet.ServletContext
-import gitbucket.core.controller.ControllerBase
+import gitbucket.core.controller.{Context, ControllerBase}
+import gitbucket.core.model.Account
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.ControlUtil._
-import gitbucket.core.util.Version
+import io.github.gitbucket.solidbase.model.Version
 
 /**
  * Trait for define plugin interface.
- * To provide plugin, put Plugin class which mixed in this trait into the package root.
+ * To provide a plugin, put a Plugin class which extends this class into the package root.
  */
-trait Plugin {
+abstract class Plugin {
 
   val pluginId: String
   val pluginName: String
@@ -77,6 +79,76 @@ trait 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
+
   /**
    * This method is invoked in initialization of plugin system.
    * Register plugin functionality to PluginRegistry.
@@ -100,6 +172,27 @@ trait 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)
+    }
   }
 
   /**

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

@@ -3,16 +3,18 @@ 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 gitbucket.core.util.JDBCUtil._
-import gitbucket.core.util.{Version, Versions}
+import io.github.gitbucket.solidbase.Solidbase
+import io.github.gitbucket.solidbase.model.Module
+import liquibase.database.core.H2Database
 import org.apache.commons.codec.binary.{Base64, StringUtils}
 import org.slf4j.LoggerFactory
 
@@ -33,6 +35,14 @@ 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]]
+
   def addPlugin(pluginInfo: PluginInfo): Unit = {
     plugins += pluginInfo
   }
@@ -107,17 +117,47 @@ class PluginRegistry {
 
   def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq
 
-  private case class GlobalAction(
-    method: String,
-    path: String,
-    function: (HttpServletRequest, HttpServletResponse, Context) => Any
-  )
+  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = {
+    globalMenus += globalMenu
+  }
 
-  private case class RepositoryAction(
-    method: String,
-    path: String,
-    function: (HttpServletRequest, HttpServletResponse, Context, RepositoryInfo) => Any
-  )
+  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq
+
+  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = {
+    repositoryMenus += repositoryMenu
+  }
+
+  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.toSeq
+
+  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = {
+    repositorySettingTabs += repositorySettingTab
+  }
+
+  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.toSeq
+
+  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = {
+    profileTabs += profileTab
+  }
+
+  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.toSeq
+
+  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = {
+    systemSettingMenus += systemSettingMenu
+  }
+
+  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.toSeq
+
+  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = {
+    accountSettingMenus += accountSettingMenu
+  }
+
+  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.toSeq
+
+  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = {
+    dashboardTabs += dashboardTab
+  }
+
+  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.toSeq
 
 }
 
@@ -149,30 +189,15 @@ object PluginRegistry {
           val plugin = classLoader.loadClass("Plugin").newInstance().asInstanceOf[Plugin]
 
           // Migration
-          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)
-          }
-
-          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)
-            }
-          }
+          val solidbase = new Solidbase()
+          solidbase.migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*))
 
           // Initialize
           plugin.initialize(instance, context, settings)
           instance.addPlugin(PluginInfo(
             pluginId    = plugin.pluginId,
             pluginName  = plugin.pluginName,
-            version     = plugin.versions.head.versionString,
+            version     = plugin.versions.head.getVersion,
             description = plugin.description,
             pluginClass = plugin
           ))
@@ -201,6 +226,8 @@ object PluginRegistry {
 
 }
 
+case class Link(id: String, label: String, path: String, icon: Option[String] = None)
+
 case class PluginInfo(
   pluginId: String,
   pluginName: String,

src/main/scala/gitbucket/core/service/IssuesService.scala

@@ -108,25 +108,41 @@ 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
-         , SUM(CS.STATE='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,
+            CSS.CS_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
-         WHERE $issueIdQuery
-         GROUP BY PR.USER_NAME, PR.REPOSITORY_NAME, PR.ISSUE_ID) as SUMM
+            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
         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

src/main/scala/gitbucket/core/service/PluginService.scala

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

src/main/scala/gitbucket/core/service/RepositorySearchService.scala

@@ -53,7 +53,30 @@ trait RepositorySearchService { self: IssuesService =>
       }
     }
 
-  private def searchRepositoryFiles(git: Git, query: String): List[(String, String)] = {
+  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)] = {
     val revWalk   = new RevWalk(git.getRepository)
     val objectId  = git.getRepository.resolve("HEAD")
     val revCommit = revWalk.parseCommit(objectId)

src/main/scala/gitbucket/core/service/WebHookService.scala

@@ -1,7 +1,6 @@
 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._
@@ -12,7 +11,6 @@ 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
@@ -22,6 +20,8 @@ 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
 
 
 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], token: Option[String])(implicit s: Session): Unit = {
-    WebHooks insert WebHook(owner, repository, url, token)
+  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)
     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], token: Option[String])(implicit s: Session): Unit = {
-    WebHooks.filter(_.byPrimaryKey(owner, repository, url)).map(w => w.token).update(token)
+  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))
     WebHookEvents.filter(_.byWebHook(owner, repository, url)).delete
     events.toSet.map{ event: WebHook.Event =>
       WebHookEvents insert WebHookEvent(owner, repository, url, event)
@@ -100,19 +100,29 @@ trait WebHookService {
             val httpClient = HttpClientBuilder.create.addInterceptorLast(itcp).build
             logger.debug(s"start web hook invocation for ${webHook.url}")
             val httpPost = new HttpPost(webHook.url)
-            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded")
+            logger.info(s"Content-Type: ${webHook.ctype.ctype}")
+            httpPost.addHeader("Content-Type", webHook.ctype.ctype)
             httpPost.addHeader("X-Github-Event", event.name)
             httpPost.addHeader("X-Github-Delivery", java.util.UUID.randomUUID().toString)
 
-            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))
+            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().setText(json).build())
+                if (!webHook.token.isEmpty) {
+                  httpPost.addHeader("X-Hub-Signature", XHub.generateHeaderXHubToken(XHubConverter.HEXA_LOWERCASE, XHubDigest.SHA1, webHook.token.orNull, json.getBytes("UTF-8")))
+                }
+              }
             }
 
             val res = httpClient.execute(httpPost)

src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

@@ -1,186 +0,0 @@
-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)
-  }
-
-}

src/main/scala/gitbucket/core/servlet/InitializeListener.scala

@@ -1,16 +1,22 @@
 package gitbucket.core.servlet
 
+import java.io.File
+
 import akka.event.Logging
 import com.typesafe.config.ConfigFactory
+import gitbucket.core.GitBucketCoreModule
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.{ActivityService, SystemSettingsService}
-import org.apache.commons.io.FileUtils
+import gitbucket.core.util.DatabaseConfig
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.JDBCUtil._
+import io.github.gitbucket.solidbase.Solidbase
+import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import javax.servlet.{ServletContextListener, ServletContextEvent}
+import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
-import gitbucket.core.util.Versions
 import akka.actor.{Actor, Props, ActorSystem}
 import com.typesafe.akka.extension.quartz.QuartzSchedulerExtension
-import AutoUpdate._
 
 /**
  * Initialize GitBucket system.
@@ -30,14 +36,49 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
     Database() withTransaction { session =>
       val conn = session.conn
 
-      // Migration
-      logger.debug("Start schema update")
-      Versions.update(conn, headVersion, getCurrentVersion(), versions, Thread.currentThread.getContextClassLoader){ conn =>
-        FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
+      // Check version
+      val versionFile = new File(GitBucketHome, "version")
+
+      if(versionFile.exists()){
+        val version = FileUtils.readFileToString(versionFile, "UTF-8")
+        if(version == "3.14"){
+          // Initialization for GitBucket 3.14
+          logger.info("Migration to GitBucket 4.x start")
+
+          // Backup current data
+          val dataMvFile = new File(GitBucketHome, "data.mv.db")
+          if(dataMvFile.exists) {
+            FileUtils.copyFile(dataMvFile, new File(GitBucketHome, "data.mv.db_3.14"))
+          }
+          val dataTraceFile = new File(GitBucketHome, "data.trace.db")
+          if(dataTraceFile.exists) {
+            FileUtils.copyFile(dataTraceFile, new File(GitBucketHome, "data.trace.db_3.14"))
+          }
+
+          // Change form
+          val manager = new JDBCVersionManager(conn)
+          manager.initialize()
+          manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0")
+          conn.select("SELECT PLUGIN_ID, VERSION FROM PLUGIN"){ rs =>
+            manager.updateVersion(rs.getString("PLUGIN_ID"), rs.getString("VERSION"))
+          }
+          conn.update("DROP TABLE PLUGIN")
+          versionFile.delete()
+
+          logger.info("Migration to GitBucket 4.x completed")
+
+        } else {
+          throw new Exception("GitBucket can't migrate from this version. Please update to 3.14 at first.")
+        }
       }
 
+      // Run normal migration
+      logger.info("Start schema update")
+      val solidbase = new Solidbase()
+      solidbase.migrate(conn, Thread.currentThread.getContextClassLoader, DatabaseConfig.liquiDriver, GitBucketCoreModule)
+
       // Load plugins
-      logger.debug("Initialize plugins")
+      logger.info("Initialize plugins")
       PluginRegistry.initialize(event.getServletContext, loadSystemSettings(), conn)
     }
 

src/main/scala/gitbucket/core/servlet/TransactionFilter.scala

@@ -2,7 +2,7 @@ package gitbucket.core.servlet
 
 import javax.servlet._
 import javax.servlet.http.HttpServletRequest
-import com.mchange.v2.c3p0.ComboPooledDataSource
+import com.zaxxer.hikari._
 import gitbucket.core.util.DatabaseConfig
 import org.scalatra.ScalatraBase
 import org.slf4j.LoggerFactory
@@ -46,14 +46,14 @@ object Database {
 
   private val logger = LoggerFactory.getLogger(Database.getClass)
 
-  private val dataSource: ComboPooledDataSource = {
-    val ds = new ComboPooledDataSource
-    ds.setDriverClass(DatabaseConfig.driver)
-    ds.setJdbcUrl(DatabaseConfig.url)
-    ds.setUser(DatabaseConfig.user)
-    ds.setPassword(DatabaseConfig.password)
+  private val dataSource: HikariDataSource = {
+    val config = new HikariConfig()
+    config.setDriverClassName(DatabaseConfig.jdbcDriver)
+    config.setJdbcUrl(DatabaseConfig.url)
+    config.setUsername(DatabaseConfig.user)
+    config.setPassword(DatabaseConfig.password)
     logger.debug("load database connection pool")
-    ds
+    new HikariDataSource(config)
   }
 
   private val db: SlickDatabase = {

src/main/scala/gitbucket/core/util/DatabaseConfig.scala

@@ -1,19 +1,83 @@
 package gitbucket.core.util
 
 import com.typesafe.config.ConfigFactory
-import Directory.DatabaseHome
+import java.io.File
+import Directory._
+import liquibase.database.AbstractJdbcDatabase
+import liquibase.database.core.{PostgresDatabase, MySQLDatabase, H2Database}
+import org.apache.commons.io.FileUtils
 
 object DatabaseConfig {
 
-  private val config = ConfigFactory.load("database")
-  private val dbUrl = config.getString("db.url")
+  private lazy val config = {
+    val file = new File(GitBucketHome, "database.conf")
+    if(!file.exists){
+      FileUtils.write(file,
+        """db {
+          |  url = "jdbc:h2:${DatabaseHome};MVCC=true"
+          |  user = "sa"
+          |  password = "sa"
+          |}
+          |""".stripMargin, "UTF-8")
+    }
+    ConfigFactory.parseFile(file)
+  }
+
+  private lazy val dbUrl = config.getString("db.url")
 
   def url(directory: Option[String]): String =
     dbUrl.replace("${DatabaseHome}", directory.getOrElse(DatabaseHome))
 
-  val url: String = url(None)
-  val user: String = config.getString("db.user")
-  val password: String = config.getString("db.password")
-  val driver: String = config.getString("db.driver")
+  lazy val url: String = url(None)
+  lazy val user: String = config.getString("db.user")
+  lazy val password: String = config.getString("db.password")
+  lazy val jdbcDriver: String = DatabaseType(url).jdbcDriver
+  lazy val slickDriver: slick.driver.JdbcProfile = DatabaseType(url).slickDriver
+  lazy val liquiDriver: AbstractJdbcDatabase = DatabaseType(url).liquiDriver
 
 }
+
+sealed trait DatabaseType {
+  val jdbcDriver: String
+  val slickDriver: slick.driver.JdbcProfile
+  val liquiDriver: AbstractJdbcDatabase
+}
+
+object DatabaseType {
+
+  def apply(url: String): DatabaseType = {
+    if(url.startsWith("jdbc:h2:")){
+      H2
+    } else if(url.startsWith("jdbc:mysql:")){
+      MySQL
+    } else if(url.startsWith("jdbc:postgresql:")){
+      PostgreSQL
+    } else {
+      throw new IllegalArgumentException(s"${url} is not supported.")
+    }
+  }
+
+  object H2 extends DatabaseType {
+    val jdbcDriver = "org.h2.Driver"
+    val slickDriver = slick.driver.H2Driver
+    val liquiDriver = new H2Database()
+  }
+
+  object MySQL extends DatabaseType {
+    val jdbcDriver = "com.mysql.jdbc.Driver"
+    val slickDriver = slick.driver.MySQLDriver
+    val liquiDriver = new MySQLDatabase()
+  }
+
+  object PostgreSQL extends DatabaseType {
+    val jdbcDriver = "org.postgresql.Driver2"
+    val slickDriver = new slick.driver.PostgresDriver {
+      override def quoteIdentifier(id: String): String = {
+        val s = new StringBuilder(id.length + 4) append '"'
+        for(c <- id) if(c == '"') s append "\"\"" else s append c.toLower
+        (s append '"').toString
+      }
+    }
+    val liquiDriver = new PostgresDatabase()
+  }
+}

src/main/scala/gitbucket/core/util/JDBCUtil.scala

@@ -1,7 +1,13 @@
 package gitbucket.core.util
 
+import java.io._
 import java.sql._
+import java.text.SimpleDateFormat
+import javax.xml.stream.{XMLStreamConstants, XMLInputFactory, XMLOutputFactory}
 import ControlUtil._
+import scala.StringBuilder
+import scala.annotation.tailrec
+import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 
 /**
@@ -58,6 +64,265 @@ object JDBCUtil {
       }
     }
 
+    def importAsXML(in: InputStream): Unit = {
+      conn.setAutoCommit(false)
+      try {
+        val factory = XMLInputFactory.newInstance()
+        using(factory.createXMLStreamReader(in, "UTF-8")){ reader =>
+          // stateful objects
+          var elementName   = ""
+          var insertTable   = ""
+          var insertColumns = Map.empty[String, (String, String)]
+
+          while(reader.hasNext){
+            reader.next()
+
+            reader.getEventType match {
+              case XMLStreamConstants.START_ELEMENT =>
+                elementName = reader.getName.getLocalPart
+                if(elementName == "insert"){
+                  insertTable = reader.getAttributeValue(null, "table")
+                } else if(elementName == "delete"){
+                  val tableName = reader.getAttributeValue(null, "table")
+                  conn.update(s"DELETE FROM ${tableName}")
+                } else if(elementName == "column"){
+                  val columnName  = reader.getAttributeValue(null, "name")
+                  val columnType  = reader.getAttributeValue(null, "type")
+                  val columnValue = reader.getElementText
+                  insertColumns = insertColumns + (columnName -> (columnType, columnValue))
+                }
+              case XMLStreamConstants.END_ELEMENT =>
+                // Execute insert statement
+                reader.getName.getLocalPart match {
+                  case "insert" => {
+                    val sb = new StringBuilder()
+                    sb.append(s"INSERT INTO ${insertTable} (")
+                    sb.append(insertColumns.map { case (columnName, _) => columnName }.mkString(", "))
+                    sb.append(") VALUES (")
+                    sb.append(insertColumns.map { case (_, (columnType, columnValue)) =>
+                      if(columnType == null || columnValue == null){
+                        "NULL"
+                      } else if(columnType == "string"){
+                        "'" + columnValue.replace("'", "''") + "'"
+                      } else if(columnType == "timestamp"){
+                        "'" + columnValue + "'"
+                      } else {
+                        columnValue.toString
+                      }
+                    }.mkString(", "))
+                    sb.append(")")
+
+                    conn.update(sb.toString)
+
+                    insertColumns = Map.empty[String, (String, String)] // Clear column information
+                  }
+                  case _ => // Nothing to do
+                }
+              case _ => // Nothing to do
+            }
+          }
+        }
+
+        conn.commit()
+
+      } catch {
+        case e: Exception => {
+          conn.rollback()
+          throw e
+        }
+      }
+    }
+
+    def exportAsXML(targetTables: Seq[String]): File = {
+      val dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")
+      val file = File.createTempFile("gitbucket-export-", ".xml")
+
+      val factory = XMLOutputFactory.newInstance()
+      using(factory.createXMLStreamWriter(new FileOutputStream(file), "UTF-8")){ writer =>
+        val dbMeta = conn.getMetaData
+        val allTablesInDatabase = allTablesOrderByDependencies(dbMeta)
+
+        writer.writeStartDocument("UTF-8", "1.0")
+        writer.writeStartElement("tables")
+
+        println(allTablesInDatabase.mkString(", "))
+
+        allTablesInDatabase.reverse.foreach { tableName =>
+          if (targetTables.contains(tableName)) {
+            writer.writeStartElement("delete")
+            writer.writeAttribute("table", tableName)
+            writer.writeEndElement()
+          }
+        }
+
+        allTablesInDatabase.foreach { tableName =>
+          if (targetTables.contains(tableName)) {
+            select(s"SELECT * FROM ${tableName}") { rs =>
+              writer.writeStartElement("insert")
+              writer.writeAttribute("table", tableName)
+              val rsMeta = rs.getMetaData
+              (1 to rsMeta.getColumnCount).foreach { i =>
+                val columnName = rsMeta.getColumnName(i)
+                val (columnType, columnValue) = if(rs.getObject(columnName) == null){
+                  (null, null)
+                } else {
+                  rsMeta.getColumnType(i) match {
+                    case Types.BOOLEAN | Types.BIT => ("boolean", rs.getBoolean(columnName))
+                    case Types.VARCHAR | Types.CLOB | Types.CHAR | Types.LONGVARCHAR => ("string", rs.getString(columnName))
+                    case Types.INTEGER => ("int", rs.getInt(columnName))
+                    case Types.TIMESTAMP => ("timestamp", dateFormat.format(rs.getTimestamp(columnName)))
+                  }
+                }
+                writer.writeStartElement("column")
+                writer.writeAttribute("name", columnName)
+                if(columnType != null){
+                  writer.writeAttribute("type", columnType)
+                }
+                if(columnValue != null){
+                  writer.writeCharacters(columnValue.toString)
+                }
+                writer.writeEndElement()
+              }
+              writer.writeEndElement()
+            }
+          }
+        }
+
+        writer.writeEndElement()
+        writer.writeEndDocument()
+      }
+
+      file
+    }
+
+    def exportAsSQL(targetTables: Seq[String]): File = {
+      val dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")
+      val file = File.createTempFile("gitbucket-export-", ".sql")
+
+      using(new FileOutputStream(file)) { out =>
+        val dbMeta = conn.getMetaData
+        val allTablesInDatabase = allTablesOrderByDependencies(dbMeta)
+
+        allTablesInDatabase.reverse.foreach { tableName =>
+          if (targetTables.contains(tableName)) {
+            out.write(s"DELETE FROM ${tableName};\n".getBytes("UTF-8"))
+          }
+        }
+
+        allTablesInDatabase.foreach { tableName =>
+          if (targetTables.contains(tableName)) {
+            val sb = new StringBuilder()
+            select(s"SELECT * FROM ${tableName}") { rs =>
+              sb.append(s"INSERT INTO ${tableName} (")
+
+              val rsMeta = rs.getMetaData
+              val columns = (1 to rsMeta.getColumnCount).map { i =>
+                (rsMeta.getColumnName(i), rsMeta.getColumnType(i))
+              }
+              sb.append(columns.map(_._1).mkString(", "))
+              sb.append(") VALUES (")
+
+              val values = columns.map { case (columnName, columnType) =>
+                if(rs.getObject(columnName) == null){
+                  null
+                } else {
+                  columnType match {
+                    case Types.BOOLEAN | Types.BIT => rs.getBoolean(columnName)
+                    case Types.VARCHAR | Types.CLOB | Types.CHAR | Types.LONGVARCHAR => rs.getString(columnName)
+                    case Types.INTEGER   => rs.getInt(columnName)
+                    case Types.TIMESTAMP => rs.getTimestamp(columnName)
+                  }
+                }
+              }
+
+              val columnValues = values.map { value =>
+                value match {
+                  case x: String    => "'" + x.replace("'", "''") + "'"
+                  case x: Timestamp => "'" + dateFormat.format(x) + "'"
+                  case null         => "NULL"
+                  case x            => x
+                }
+              }
+              sb.append(columnValues.mkString(", "))
+              sb.append(");\n")
+            }
+
+            out.write(sb.toString.getBytes("UTF-8"))
+          }
+        }
+      }
+
+      file
+    }
+
+    def allTableNames(): Seq[String] = {
+      using(conn.getMetaData.getTables(null, null, "%", Seq("TABLE").toArray)) { rs =>
+        val tableNames = new ListBuffer[String]
+        while (rs.next) {
+          val name = rs.getString("TABLE_NAME").toUpperCase
+          if (name != "VERSIONS" && name != "PLUGIN") {
+            tableNames += name
+          }
+        }
+        tableNames.toSeq
+      }
+    }
+
+    private def childTables(meta: DatabaseMetaData, tableName: String): Seq[String] = {
+      val normalizedTableName =
+        if(meta.getDatabaseProductName == "PostgreSQL"){
+          tableName.toLowerCase
+        } else {
+          tableName
+        }
+
+      using(meta.getExportedKeys(null, null, normalizedTableName)) { rs =>
+        val children = new ListBuffer[String]
+        while (rs.next) {
+          val childTableName = rs.getString("FKTABLE_NAME").toUpperCase
+          if(!children.contains(childTableName)){
+            children += childTableName
+            children ++= childTables(meta, childTableName)
+          }
+        }
+        children.distinct.toSeq
+      }
+    }
+
+
+    private def allTablesOrderByDependencies(meta: DatabaseMetaData): Seq[String] = {
+      val tables = allTableNames.map { tableName =>
+        val result = TableDependency(tableName, childTables(meta, tableName))
+        result
+      }
+
+      val edges = tables.flatMap { table =>
+        table.children.map { child => (table.tableName, child) }
+      }
+
+      tsort(edges).toSeq
+    }
+
+    case class TableDependency(tableName: String, children: Seq[String])
+
+
+    def tsort[A](edges: Traversable[(A, A)]): Iterable[A] = {
+      @tailrec
+      def tsort(toPreds: Map[A, Set[A]], done: Iterable[A]): Iterable[A] = {
+        val (noPreds, hasPreds) = toPreds.partition { _._2.isEmpty }
+        if (noPreds.isEmpty) {
+          if (hasPreds.isEmpty) done else sys.error(hasPreds.toString)
+        } else {
+          val found = noPreds.map { _._1 }
+          tsort(hasPreds.mapValues { _ -- found }, done ++ found)
+        }
+      }
+
+      val toPred = edges.foldLeft(Map[A, Set[A]]()) { (acc, e) =>
+        acc + (e._1 -> acc.getOrElse(e._1, Set())) + (e._2 -> (acc.getOrElse(e._2, Set()) + e._1))
+      }
+      tsort(toPred, Seq())
+    }
   }
 
 }

src/main/scala/gitbucket/core/util/Version.scala

@@ -1,67 +0,0 @@
-package gitbucket.core.util
-
-import java.sql.Connection
-
-import org.apache.commons.io.IOUtils
-import org.slf4j.LoggerFactory
-import ControlUtil._
-
-case class Version(majorVersion: Int, minorVersion: Int) {
-
-  private val logger = LoggerFactory.getLogger(classOf[Version])
-
-  /**
-   * Execute update/MAJOR_MINOR.sql to update schema to this version.
-   * If corresponding SQL file does not exist, this method do nothing.
-   */
-  def update(conn: Connection, cl: ClassLoader): Unit = {
-    val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
-
-    using(cl.getResourceAsStream(sqlPath)){ in =>
-      if(in != null){
-        val sql = IOUtils.toString(in, "UTF-8")
-        using(conn.createStatement()){ stmt =>
-          logger.debug(sqlPath + "=" + sql)
-          stmt.executeUpdate(sql)
-        }
-      }
-    }
-  }
-
-
-  /**
-   * MAJOR.MINOR
-   */
-  val versionString = s"${majorVersion}.${minorVersion}"
-
-}
-
-object Versions {
-
-  private val logger = LoggerFactory.getLogger(Versions.getClass)
-
-  def update(conn: Connection, headVersion: Version, currentVersion: Version, versions: Seq[Version], cl: ClassLoader)
-            (save: Connection => Unit): Unit = {
-    logger.debug("Start schema update")
-    try {
-      if(currentVersion == headVersion){
-        logger.debug("No update")
-      } else if(currentVersion.versionString != "0.0" && !versions.contains(currentVersion)){
-        logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.")
-      } else {
-        versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn, cl))
-        save(conn)
-        logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
-      }
-    } catch {
-      case ex: Throwable => {
-        logger.error("Failed to schema update", ex)
-        ex.printStackTrace()
-        conn.rollback()
-      }
-    }
-    logger.debug("End schema update")
-  }
-
-}
-

src/main/twirl/gitbucket/core/account/application.scala.html

@@ -5,56 +5,51 @@
 @import gitbucket.core.view.helpers._
 @html.main("Applications"){
 <div class="container body">
-  <div class="row">
-    <div class="col-md-3">
-      @menu("application", settings.ssh)
-    </div>
-    <div class="col-md-9">
-      <div class="panel panel-default">
-        <div class="panel-heading strong">Personal access tokens</div>
-        <div class="panel-body">
-          @if(personalTokens.isEmpty && gneratedToken.isEmpty){
-            No tokens.
-          } else {
-            Tokens you have generated that can be used to access the GitBucket API.
-            <hr style="margin-top: 10px;">
-          }
-          @gneratedToken.map{ case (token, tokenString) =>
-            <div class="alert alert-info">
-              Make sure to copy your new personal access token now. You won't be able to see it again!
-            </div>
-            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
-            <div style="width: 50%;">
-              @helper.html.copy("generated-token-copy", tokenString){
-                <input type="text" value="@tokenString" class="form-control input-sm" readonly>
-              }
-            </div>
-            <hr style="margin-top: 10px;">
-          }
-          @personalTokens.zipWithIndex.map { case (token, i) =>
-            @if(i != 0){
-              <hr style="margin-top: 10px;">
+  @menu("application", settings.ssh){
+    <div class="panel panel-default">
+      <div class="panel-heading strong">Personal access tokens</div>
+      <div class="panel-body">
+        @if(personalTokens.isEmpty && gneratedToken.isEmpty){
+          No tokens.
+        } else {
+          Tokens you have generated that can be used to access the GitBucket API.
+          <hr style="margin-top: 10px;">
+        }
+        @gneratedToken.map{ case (token, tokenString) =>
+          <div class="alert alert-info">
+            Make sure to copy your new personal access token now. You won't be able to see it again!
+          </div>
+          <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
+          <div style="width: 50%;">
+            @helper.html.copy("generated-token-copy", tokenString){
+              <input type="text" value="@tokenString" class="form-control input-sm" readonly>
             }
-            <strong>@token.note</strong>
-            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
+          </div>
+          <hr style="margin-top: 10px;">
+        }
+        @personalTokens.zipWithIndex.map { case (token, i) =>
+          @if(i != 0){
+            <hr>
           }
+          <strong style="line-height: 30px;">@token.note</strong>
+          <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
+        }
+      </div>
+    </div>
+    <form method="POST" action="@path/@account.userName/_personalToken" validate="true">
+      <div class="panel panel-default">
+        <div class="panel-heading strong">Generate new token</div>
+        <div class="panel-body">
+          <fieldset>
+            <label for="note" class="strong">Token description</label>
+            <div><span id="error-note" class="error"></span></div>
+            <input type="text" name="note" id="note" class="form-control"/>
+            <p class="muted">What's this token for?</p>
+          </fieldset>
+          <input type="submit" class="btn btn-success" value="Generate token"/>
         </div>
       </div>
-      <form method="POST" action="@path/@account.userName/_personalToken" validate="true">
-        <div class="panel panel-default">
-          <div class="panel-heading strong">Generate new token</div>
-          <div class="panel-body">
-            <fieldset>
-              <label for="note" class="strong">Token description</label>
-              <div><span id="error-note" class="error"></span></div>
-              <input type="text" name="note" id="note" class="form-control"/>
-              <p class="muted">What's this token for?</p>
-            </fieldset>
-            <input type="submit" class="btn btn-success" value="Generate token"/>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
+    </form>
+  }
 </div>
 }

src/main/twirl/gitbucket/core/account/edit.scala.html

@@ -4,14 +4,10 @@
 @import gitbucket.core.view.helpers._
 @html.main("Edit your profile"){
 <div class="container body">
-  <div class="row">
-    <div class="col-md-3">
-      @menu("profile", settings.ssh)
-    </div>
-    <div class="col-md-9">
-      @helper.html.information(info)
-      @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
-      <form action="@url(account.userName)/_edit" method="POST" validate="true">
+  @menu("profile", settings.ssh){
+    @helper.html.information(info)
+    @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
+    <form action="@url(account.userName)/_edit" method="POST" validate="true">
       <div class="panel panel-default">
         <div class="panel-heading strong">Profile</div>
         <div class="panel-body">
@@ -49,17 +45,17 @@
               </fieldset>
             </div>
           </div>
-          <div style="margin-top: 20px;">
-            <div class="pull-right">
-              <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
-            </div>
-            <input type="submit" class="btn btn-success" value="Save"/>
-            @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn btn-default">Cancel</a>}
-          </div>
         </div>
       </div>
+      <div>
+        <div class="pull-right">
+          <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+        </div>
+        <input type="submit" class="btn btn-success" value="Save"/>
+        @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn btn-default">Cancel</a>}
+      </div>
     </form>
-  </div>
+  }
 </div>
 }
 <script>

src/main/twirl/gitbucket/core/account/group.scala.html

@@ -2,7 +2,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div class="container body">
+<div class="body main-center">
   <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
       <div class="row">
         <div class="col-md-5">
@@ -42,12 +42,12 @@
       <fieldset class="margin">
         @if(account.isDefined){
           <div class="pull-right">
-            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger btn-lg">Delete Group</a>
+            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
           </div>
         }
-        <input type="submit" class="btn btn-success btn-lg" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
         @if(account.isDefined){
-          <a href="@url(account.get.userName)" class="btn btn-default btn-lg">Cancel</a>
+          <a href="@url(account.get.userName)" class="btn btn-default">Cancel</a>
         }
       </fieldset>
   </form>
@@ -107,18 +107,18 @@ $(function(){
   }
 
   function addMemberHTML(userName, isManager){
-    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').data('name', userName);
+    var memberButton = $('<label class="btn btn-default btn-mini"><input type="radio" value="false" name="' + userName + '">Member</label>');
     if(!isManager){
       memberButton.addClass('active');
     }
-    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').data('name', userName);
+    var managerButton = $('<label class="btn btn-default btn-mini"><input type="radio" value="true" name="' + userName + '">Manager</label>');
     if(isManager){
       managerButton.addClass('active');
     }
 
     $('#member-list').append($('<li>')
       .data('name', userName)
-      .append($('<div class="btn-group is_manager" data-toggle="buttons-radio">')
+      .append($('<div class="btn-group is_manager" data-toggle="buttons">')
         .append(memberButton)
         .append(managerButton))
       .append(' ')
@@ -130,9 +130,7 @@ $(function(){
   function updateMembers(){
     var members = $('#member-list li').map(function(i, e){
       var userName = $(e).data('name');
-      return userName + ':' + $('button.active').filter(function(i, e){
-        return $(e).data('name') == userName;
-      }).attr('value');
+      return userName + ':' + $(e).find('label.active input[type=radio]').attr('value');
     }).get().join(',');
     $('#members').val(members);
   }

src/main/twirl/gitbucket/core/account/main.scala.html

@@ -4,56 +4,56 @@
 @import gitbucket.core.view.helpers._
 @html.main(account.userName){
   <div class="container body">
-    <div class="container-fluid">
-      <div class="row">
-        <div class="col-md-4">
-          <div class="block">
-            <div class="account-image">@avatar(account.userName, 270)</div>
-            <div class="account-fullname">@account.fullName</div>
-            <div class="account-username">@account.userName</div>
-          </div>
-          <div class="block">
-            @if(account.url.isDefined){
-              <div><i class="octicon octicon-home"></i> <a href="@account.url">@account.url</a></div>
-            }
-            <div><i class="octicon octicon-clock"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
-          </div>
-          @if(groupNames.nonEmpty){
-            <div>
-              <div>Groups</div>
-              @groupNames.map { groupName =>
-                @avatarLink(groupName, 36, tooltip = true)
-              }
-            </div>
-          }
-
-        </div>
-        <div class="col-md-8">
-          <ul class="nav nav-tabs" style="margin-bottom: 5px;">
-            <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
-            @if(account.isGroupAccount){
-              <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
-            } else {
-              <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
-            }
-            @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
-              <li class="pull-right">
-                <div class="button-group">
-                  <a href="@url(account.userName)/_edit" class="btn btn-default">Edit Your Profile</a>
-                </div>
-              </li>
-            }
-            @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
-              <li class="pull-right">
-                <div class="button-group">
-                  <a href="@url(account.userName)/_editgroup" class="btn btn-default">Edit Group</a>
-                </div>
-              </li>
-            }
-          </ul>
-          @body
-        </div>
+    <div class="main-sidebar">
+      <div class="block">
+        <div class="account-image">@avatar(account.userName, 240)</div>
+        <div class="account-fullname">@account.fullName</div>
+        <div class="account-username">@account.userName</div>
       </div>
+      <div class="block">
+        @if(account.url.isDefined){
+          <div><i class="octicon octicon-home"></i> <a href="@account.url">@account.url</a></div>
+        }
+        <div><i class="octicon octicon-clock"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
+      </div>
+      @if(groupNames.nonEmpty){
+        <div>
+          <div>Groups</div>
+          @groupNames.map { groupName =>
+            @avatarLink(groupName, 36, tooltip = true)
+          }
+        </div>
+      }
+    </div>
+    <div class="main-content">
+      <ul class="nav nav-tabs" style="margin-bottom: 5px;">
+        <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
+        @if(account.isGroupAccount){
+          <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
+        } else {
+          <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
+        }
+        @gitbucket.core.plugin.PluginRegistry().getProfileTabs.map { tab =>
+          @tab(account, context).map { link =>
+            <li@if(active == link.id){ class="active"}><a href="@path/@link.path">@link.label</a></li>
+          }
+        }
+        @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
+          <li class="pull-right">
+            <div class="button-group">
+              <a href="@url(account.userName)/_edit" class="btn btn-default">Edit Your Profile</a>
+            </div>
+          </li>
+        }
+        @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
+          <li class="pull-right">
+            <div class="button-group">
+              <a href="@url(account.userName)/_editgroup" class="btn btn-default">Edit Group</a>
+            </div>
+          </li>
+        }
+      </ul>
+      @body
     </div>
   </div>
 }

src/main/twirl/gitbucket/core/account/menu.scala.html

@@ -1,7 +1,7 @@
-@(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context)
+@(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
-<div class="box">
-  <ul class="nav nav-tabs nav-stacked side-menu">
+<div class="main-sidebar">
+  <ul class="nav nav-pills nav-stacked">
     <li@if(active=="profile"){ class="active"}>
       <a href="@path/@loginAccount.get.userName/_edit">Profile</a>
     </li>
@@ -13,5 +13,15 @@
     <li@if(active=="application"){ class="active"}>
       <a href="@path/@loginAccount.get.userName/_application">Applications</a>
     </li>
+    @gitbucket.core.plugin.PluginRegistry().getAccountSettingMenus.map { menu =>
+      @menu(context).map { link =>
+        <li@if(active==link.id){ class="active"}>
+          <a href="@path/@link.path">@link.label</a>
+        </li>
+      }
+    }
   </ul>
 </div>
+<div class="main-content">
+  @body
+</div>

src/main/twirl/gitbucket/core/account/newrepo.scala.html

@@ -3,7 +3,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main("Create a New Repository"){
-<div class="body" style="width: 600px; margin: 10px auto;">
+<div class="body main-center">
   <h2>Create a new repository</h2>
   <p class="muted">
     A repository contains all the files for your project, including the revision history.
@@ -67,7 +67,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
       </label>
     </fieldset>
     <fieldset class="margin form-actions">
-      <input type="submit" class="btn btn-success btn-lg" value="Create repository"/>
+      <input type="submit" class="btn btn-success" value="Create repository"/>
     </fieldset>
   </form>
 </div>

src/main/twirl/gitbucket/core/account/ssh.scala.html

@@ -4,45 +4,40 @@
 @import gitbucket.core.view.helpers._
 @html.main("SSH Keys"){
 <div class="container body">
-  <div class="row">
-    <div class="col-md-3">
-      @menu("ssh", settings.ssh)
+  @menu("ssh", settings.ssh){
+    <div class="panel panel-default">
+      <div class="panel-heading strong">SSH Keys</div>
+      <div class="panel-body">
+        @if(sshKeys.isEmpty){
+          No keys
+        }
+        @sshKeys.zipWithIndex.map { case (key, i) =>
+          @if(i != 0){
+            <hr>
+          }
+          <strong style="line-height: 30px;">@key.title</strong> (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
+          <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-sm btn-danger pull-right">Delete</a>
+        }
+      </div>
     </div>
-    <div class="col-md-9">
+    <form method="POST" action="@path/@account.userName/_ssh" validate="true">
       <div class="panel panel-default">
-        <div class="panel-heading strong">SSH Keys</div>
+        <div class="panel-heading strong">Add an SSH Key</div>
         <div class="panel-body">
-          @if(sshKeys.isEmpty){
-            No keys
-          }
-          @sshKeys.zipWithIndex.map { case (key, i) =>
-            @if(i != 0){
-              <hr style="margin-top: 10px;">
-            }
-            <strong>@key.title</strong> (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
-            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-sm btn-danger pull-right">Delete</a>
-          }
+          <fieldset class="form-group">
+            <label for="title" class="strong">Title</label>
+            <div><span id="error-title" class="error"></span></div>
+            <input type="text" name="title" id="title" class="form-control"/>
+          </fieldset>
+          <fieldset class="form-group">
+            <label for="publicKey" class="strong">Key</label>
+            <div><span id="error-publicKey" class="error"></span></div>
+            <textarea name="publicKey" id="publicKey" class="form-control" style="height: 250px;"></textarea>
+          </fieldset>
+          <input type="submit" class="btn btn-success" value="Add"/>
         </div>
       </div>
-      <form method="POST" action="@path/@account.userName/_ssh" validate="true">
-        <div class="panel panel-default">
-          <div class="panel-heading strong">Add an SSH Key</div>
-          <div class="panel-body">
-            <fieldset class="form-group">
-              <label for="title" class="strong">Title</label>
-              <div><span id="error-title" class="error"></span></div>
-              <input type="text" name="title" id="title" class="form-control"/>
-            </fieldset>
-            <fieldset class="form-group">
-              <label for="publicKey" class="strong">Key</label>
-              <div><span id="error-publicKey" class="error"></span></div>
-              <textarea name="publicKey" id="publicKey" class="form-control" style="height: 250px;"></textarea>
-            </fieldset>
-            <input type="submit" class="btn btn-success" value="Add"/>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
+    </form>
+  }
 </div>
 }

src/main/twirl/gitbucket/core/admin/data.scala.html

@@ -0,0 +1,56 @@
+@(tableNames: Seq[String])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Data export / import"){
+  @admin.html.menu("data") {
+    <div class="panel panel-default">
+      <div class="panel-heading strong">Export</div>
+      <div class="panel-body">
+        <form class="form form-horizontal" action="@path/admin/export" method="POST">
+          @tableNames.map { tableName =>
+            <div class="checkbox">
+              <label>
+                <input type="checkbox" name="tableNames" id="@tableName" value="@tableName" checked/> @tableName
+              </label>
+            </div>
+          }
+          <input type="submit" class="btn btn-success pull-right" value="Export">
+          <div class="radio pull-right" style="margin-right: 10px;">
+            <label>
+              <input type="radio" name="type" value="sql">SQL
+            </label>
+          </div>
+          <div class="radio pull-right" style="margin-right: 10px;">
+            <label>
+              <input type="radio" name="type" value="xml" checked>XML
+            </label>
+          </div>
+        </form>
+      </div>
+    </div>
+
+    <div class="panel panel-default">
+      <div class="panel-heading strong">Import (only XML)</div>
+      <div class="panel-body">
+        <form class="form form-horizontal" action="@path/upload/import" method="POST" enctype="multipart/form-data" id="import-form">
+          <input type="file" name="file" id="file">
+          <input type="submit" class="btn btn-success pull-right" value="Import" id="import">
+        </form>
+      </div>
+    </div>
+  }
+}
+<script>
+$(function(){
+  $('#import-form').submit(function(){
+    if($('#file').val() == ''){
+      alert('Choose an import XML file.');
+      return false;
+    } else if(!$('#file').val().endsWith(".xml")){
+      alert('Import is available for only the XML file.');
+      return false;
+    }
+    return confirm('All existing data is deleted before importing.\nAre you sure?');
+  })
+})
+</script>

src/main/twirl/gitbucket/core/admin/menu.scala.html

@@ -1,25 +1,33 @@
 @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
 <div class="container body">
-  <div class="row">
-    <div class="col-md-3">
-      <ul class="nav nav-tabs nav-stacked side-menu" id="system-admin-menu-container">
-        <li@if(active=="users"){ class="active"}>
-          <a href="@path/admin/users">User Management</a>
-        </li>
-        <li@if(active=="system"){ class="active"}>
-          <a href="@path/admin/system">System Settings</a>
-        </li>
-        <li@if(active=="plugins"){ class="active"}>
-          <a href="@path/admin/plugins">Plugins</a>
-        </li>
-        <li>
-          <a href="@path/console/login.jsp">H2 Console</a>
-        </li>
-     </ul>
-    </div>
-    <div class="col-md-9">
-      @body
-    </div>
+  <div class="main-sidebar">
+    <ul class="nav nav-pills nav-stacked" id="system-admin-menu-container">
+      <li@if(active=="users"){ class="active"}>
+        <a href="@path/admin/users">User Management</a>
+      </li>
+      <li@if(active=="system"){ class="active"}>
+        <a href="@path/admin/system">System Settings</a>
+      </li>
+      <li@if(active=="plugins"){ class="active"}>
+        <a href="@path/admin/plugins">Plugins</a>
+      </li>
+      <li@if(active=="data"){ class="active"}>
+      <a href="@path/admin/data">Data export / import</a>
+      </li>
+      <li>
+        <a href="@path/console/login.jsp">H2 Console</a>
+      </li>
+      @gitbucket.core.plugin.PluginRegistry().getSystemSettingMenus.map { menu =>
+        @menu(context).map { link =>
+          <li@if(active==link.id){ class="active"}>
+            <a href="@path/@link.path">@link.label</a>
+          </li>
+        }
+      }
+   </ul>
+  </div>
+  <div class="main-content">
+    @body
   </div>
 </div>

src/main/twirl/gitbucket/core/admin/system.scala.html

@@ -9,11 +9,23 @@
       <div class="panel panel-default">
         <div class="panel-heading strong">System Settings</div>
         <div class="panel-body">
-          <!--====================================================================-->
-          <!-- GITBUCKET_HOME -->
-          <!--====================================================================-->
-          <label class="strong">GITBUCKET_HOME</label>
-          @GitBucketHome
+            <!--====================================================================-->
+            <!-- System properties -->
+            <!--====================================================================-->
+          <table class="table table-bordered">
+            <tr>
+              <th>Property</th>
+              <th>Value</th>
+            </tr>
+            <tr>
+              <td>GITBUCKET_HOME</td>
+              <td>@GitBucketHome</td>
+            </tr>
+            <tr>
+              <td>DATBASE_URL</td>
+              <td>@gitbucket.core.util.DatabaseConfig.url</td>
+            </tr>
+          </table>
           <!--====================================================================-->
           <!-- Base URL -->
           <!--====================================================================-->

src/main/twirl/gitbucket/core/dashboard/header.scala.html

@@ -4,18 +4,8 @@
   groups: List[String])(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<span class="small">
-  <a class="button-link@if(condition.state == "open"){ selected}" href="@condition.copy(state = "open").toURL">
-    <i class="octicon octicon-issue-opened @(if(condition.state == "open"){"active"})"></i>
-    @openCount Open
-  </a>&nbsp;&nbsp;
-  <a class="button-link@if(condition.state == "closed"){ selected}" href="@condition.copy(state = "closed").toURL">
-    <i class="octicon octicon-check @(if(condition.state == "closed"){"active"})"></i>
-    @closedCount Closed
-  </a>
-</span>
-<div class="pull-right" id="table-issues-control">
-  @helper.html.dropdown("Visibility", flat = true){
+<div id="table-issues-control">
+  @helper.html.dropdown("Visibility"){
     <li>
       <a href="@(condition.copy(visibility = (if(condition.visibility == Some("private")) None else Some("private"))).toURL)">
         @helper.html.checkicon(condition.visibility == Some("private"))
@@ -29,7 +19,7 @@
       </a>
     </li>
   }
-  @helper.html.dropdown("Organization", flat = true){
+  @helper.html.dropdown("Organization"){
     @groups.map { group =>
       <li>
         <a href="@((if(condition.groups.contains(group)) condition.copy(groups = condition.groups - group) else condition.copy(groups = condition.groups + group)).toURL)">
@@ -39,7 +29,7 @@
       </li>
     }
   }
-  @helper.html.dropdown("Sort", flat = true){
+  @helper.html.dropdown("Sort"){
     <li>
       <a href="@condition.copy(sort="created",  direction="desc").toURL">
         @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest

src/main/twirl/gitbucket/core/dashboard/issues.scala.html

@@ -4,15 +4,17 @@
   closedCount: Int,
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
   filter: String,
-  groups: List[String])(implicit context: gitbucket.core.controller.Context)
+  groups: List[String],
+  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main("Issues"){
-  <div class="body">
+  @sidebar(recentRepositories, userRepositories){
     @dashboard.html.tab("issues")
     <div class="container">
-      @issuesnavi(filter, "issues", condition)
+      @issuesnavi(filter, openCount, closedCount, condition)
       @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
     </div>
-  </div>
+  }
 }

src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html

@@ -21,11 +21,6 @@
     @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
       <tr>
         <td style="padding-top: 12px; padding-bottom: 12px;">
-          @if(issue.isPullRequest){
-            <i class="octicon octicon-git-pull-request @(if(issue.closed) "closed" else "open")"></i>
-          } else {
-            <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")"></i>
-          }
           <a href="@path/@issue.userName/@issue.repositoryName">@issue.userName/@issue.repositoryName</a>&nbsp;&#xFF65;
           @if(issue.isPullRequest){
             <a href="@path/@issue.userName/@issue.repositoryName/pull/@issue.issueId" class="issue-title">@issue.title</a>
@@ -50,7 +45,7 @@
               </a>
             }
           </span>
-          <div class="small muted" style="margin-left: 20px; margin-top: 2px;">
+          <div class="small muted" style="margin-top: 2px;">
             #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
             @milestone.map { milestone =>
               <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> @milestone</a></span>

src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html

@@ -1,9 +1,17 @@
 @(filter: String,
-  active: String,
+  openCount: Int,
+  closedCount: Int,
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<ul class="nav nav-pills pull-left" style="line-height: 14px;">
+<ul class="nav nav-pills pull-left" style="line-height: 14px; margin-bottom: 10px;">
+  <li class="@(if(condition.state == "open"){"active"})">
+    <a href="@condition.copy(state = "open").toURL">Open <span class="badge">@openCount</span></a>
+  </li>
+  <li class="@(if(condition.state == "closed"){"active"})">
+    <a href="@condition.copy(state = "closed").toURL">Closed <span class="badge">@closedCount</span></a>
+  </li>
+  @*
   <li class="@if(filter == "created_by"){active}">
     <a href="@path/dashboard/@active/created_by@condition.copy(author = None, assigned = None).toURL">Created</a>
   </li>
@@ -13,8 +21,5 @@
   <li class="@if(filter == "mentioned"){active}">
     <a href="@path/dashboard/@active/mentioned@condition.copy(author = None, assigned = None).toURL">Mentioned</a>
   </li>
+  *@
 </ul>
-<form method="GET" id="search-filter-form" action="@path/dashboard/@active" class="pull-right">
-  <input type="text" id="search-filter-box" class="form-control input-lg" name="q" style="width: 400px;"
-         value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
-</form>

src/main/twirl/gitbucket/core/dashboard/pulls.scala.html

@@ -4,15 +4,17 @@
   closedCount: Int,
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
   filter: String,
-  groups: List[String])(implicit context: gitbucket.core.controller.Context)
+  groups: List[String],
+  recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main("Pull Requests"){
-  <div class="body">
+  @sidebar(recentRepositories, userRepositories){
     @dashboard.html.tab("pulls")
     <div class="container">
-      @issuesnavi(filter, "pulls", condition)
+      @issuesnavi(filter, openCount, closedCount, condition)
       @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
     </div>
-  </div>
+  }
 }

src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html

@@ -0,0 +1,73 @@
+@(recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+  userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+<div class="container body">
+  <div class="dashboard-sidebar">
+    @if(loginAccount.isEmpty){
+      <div id="dashboard-signin-form">@html.signinform(settings)</div>
+    } else {
+      <div class="panel panel-default">
+        <div class="panel-heading strong">
+          Your repositories <span class="badge">@userRepositories.size</span>
+        </div>
+        <ul class="list-group list-group-flush">
+        @if(userRepositories.isEmpty){
+          <li class="list-group-item">No repositories</li>
+        } else {
+          @defining(20){ max =>
+            @userRepositories.zipWithIndex.map { case (repository, i) =>
+            <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
+              @helper.html.repositoryicon(repository, false)
+              @if(repository.owner == loginAccount.get.userName){
+                <a href="@url(repository)"><span class="strong">@repository.name</span></a>
+              } else {
+                <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+              }
+              </li>
+            }
+            @if(userRepositories.size > max){
+              <li class="list-group-item show-more">
+                <a href="javascript:void(0);" id="show-more-repos">Show @{userRepositories.size - max} more repositories...</a>
+              </li>
+            }
+          }
+        }
+        </ul>
+      </div>
+    }
+    <div class="panel panel-default">
+      <div class="panel-heading strong">Recent updated repositories</div>
+      <ul class="list-group list-group-flush">
+      @if(recentRepositories.isEmpty){
+        <li class="list-group-item">No repositories</li>
+      } else {
+        @defining(20){ max =>
+          @recentRepositories.zipWithIndex.map { case (repository, i) =>
+          <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
+            @helper.html.repositoryicon(repository, false)
+          <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+            </li>
+          }
+          @if(recentRepositories.size > max){
+            <li class="list-group-item show-more">
+              <a href="javascript:void(0);" id="show-more-recent-repos">Show @{recentRepositories.size - max} more repositories...</a>
+            </li>
+          }
+        }
+      }
+      </ul>
+    </div>
+  </div>
+  <div class="dashboard-content">
+    @body
+  </div>
+</div>
+<script>
+$(function(){
+  $('#show-more-repos, #show-more-recent-repos').click(function(e){
+    $(e.target).parents('ul.list-group').find('li.repo-link').show();
+    $(e.target).parents('li.show-more').remove();
+  });
+});
+</script>

src/main/twirl/gitbucket/core/dashboard/tab.scala.html

@@ -1,52 +1,15 @@
 @(active: String = "")(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<div class="dashboard-nav">
-  <div class="container">
-    <a href="@path/" @if(active == ""){ class="active"}>
-      <i class="octicon octicon-rss"></i> News Feed
-    </a>
-    @if(loginAccount.isDefined){
-      <a href="@path/dashboard/pulls" @if(active == "pulls" ){ class="active"}>
-        <i class="octicon octicon-git-pull-request"></i> Pull Requests
-      </a>
-      <a href="@path/dashboard/issues" @if(active == "issues"){ class="active"}>
-        <i class="octicon octicon-issue-opened"></i> Issues
-      </a>
+<ul class="nav nav-tabs" style="margin-bottom: 20px;">
+  <li @if(active == ""){ class="active"}><a href="@path/">News Feed</a></li>
+  @if(loginAccount.isDefined){
+    <li @if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls">Pull Requests</a></li>
+    <li @if(active == "issues"){ class="active"}><a href="@path/dashboard/issues">Issues</a></li>
+    @gitbucket.core.plugin.PluginRegistry().getDashboardTabs.map { tab =>
+      @tab(context).map { link =>
+        <li @if(active == link.id){ class="active"}><a href="@path/@link.path">@link.label</a></li>
+      }
     }
-  </div>
-</div>
-<style type="text/css">
-div.dashboard-nav {
-  border-bottom: 1px solid #ddd;
-  text-align: right;
-  height: 32px;
-  margin-bottom: 20px;
-}
-
-div.dashboard-nav a  {
-  line-height: 10px;
-  margin-left: 20px;
-  padding-bottom: 13px;
-  padding-left: 4px;
-  padding-right: 4px;
-  color: #888;
-}
-
-div.dashboard-nav .octicon{
-    width: 16px;
-    height: 16px;
-    font-size: 16px;
-    color: #888;
-}
-
-div.dashboard-nav a:hover,div.dashboard-nav a:hover .octicon  {
-  text-decoration: none;
-  color: #333;
-}
-
-div.dashboard-nav a.active {
-  border-bottom: 2px solid #bb4444;
-  color: #333;
-}
-</style>
+  }
+</ul>

src/main/twirl/gitbucket/core/helper/activities.scala.html

@@ -61,8 +61,10 @@
 }
 
 @detailActivity(activity: gitbucket.core.model.Activity, image: String) = {
+  @*
   <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
-  <div class="activity-content">
+  *@
+  <div>
     <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
       @avatar(activity.activityUserName, 16)
@@ -75,8 +77,10 @@
 }
 
 @customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = {
+  @*
   <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
-  <div class="activity-content">
+  *@
+  <div>
     <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
       @avatar(activity.activityUserName, 16)
@@ -87,12 +91,14 @@
 }
 
 @simpleActivity(activity: gitbucket.core.model.Activity, image: String) = {
+  @*
   <div class="activity-icon-small"><i class="octicon octicon-@image"></i></div>
-  <div class="activity-content">
+  *@
+  <div>
+    <span class="muted small">@helper.html.datetimeago(activity.activityDate)</span>
     <div>
       @avatar(activity.activityUserName, 16)
       @activityMessage(activity.message)
-      <span class="muted small">@helper.html.datetimeago(activity.activityDate)</span>
     </div>
   </div>
 }

src/main/twirl/gitbucket/core/helper/copy.scala.html

@@ -3,12 +3,12 @@
   <div class="input-group" style="margin-bottom: 0px;">
     @html
     <span class="input-group-btn">
-      <span id="@id" class="btn btn-sm btn-default" @if(style.nonEmpty){style="@style"}
+      <span id="@id" class="btn btn-default" @if(style.nonEmpty){style="@style"}
         data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="octicon octicon-clippy"></i></span>
     </span>
   </div>
 } else {
-  <span id="@id" class="btn btn-sm btn-default" @if(style.nonEmpty){style="@style"}
+  <span id="@id" class="btn btn-default" @if(style.nonEmpty){style="@style"}
     data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="octicon octicon-clippy"></i></span>
 }
 <script>

src/main/twirl/gitbucket/core/helper/diff.scala.html

@@ -49,8 +49,8 @@
         @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
           @if(newCommitId.isDefined){
             <div class="pull-right align-right">
-              <label class="checkbox no-margin" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
-              <label class="checkbox no-margin" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
+              <label class="no-margin"><input type="checkbox" class="ignore-whitespace" value="1"/> Ignore Space</label>
+              <label class="no-margin"><input type="checkbox" class="toggle-notes" checked> Show notes</label>
               <a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-default btn-sm" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
             </div>
           }
@@ -60,8 +60,8 @@
         @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
           @if(newCommitId.isDefined){
             <div class="pull-right align-right">
-              <label class="checkbox no-margin" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
-              <label class="checkbox no-margin" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
+              <label class="no-margin"><input type="checkbox" class="ignore-whitespace" value="1"/> Ignore Space</label>
+              <label class="no-margin"><input type="checkbox" class="toggle-notes" checked> Show notes</label>
               <a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-default btn-sm" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
             </div>
           }
@@ -77,7 +77,7 @@
         @if(diff.changeType == ChangeType.DELETE){
           @if(oldCommitId.isDefined){
             <div class="pull-right align-right">
-              <label class="checkbox no-margin" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
+              <label class="no-margin"><input type="checkbox" class="toggle-notes" checked> Show notes</label>
               <a href="@url(repository)/blob/@oldCommitId.get/@diff.oldPath" class="btn btn-default btn-sm" title="View the whole file at version @oldCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
             </div>
           }

src/main/twirl/gitbucket/core/helper/dropdown.scala.html

@@ -1,12 +1,10 @@
 @(value : String  = "",
   prefix: String  = "",
   style : String  = "",
-  right : Boolean = false,
-  flat  : Boolean = false)(body: Html)
+  right : Boolean = false)(body: Html)
 <div class="btn-group" @if(style.nonEmpty){style="@style"}>
   <button
-      @if(flat){style="border: none; background-color: #eee;"}
-      class="dropdown-toggle @if(!flat){btn btn-default} else {flat} btn-sm" data-toggle="dropdown">
+      class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
     @if(value.isEmpty){
       <i class="octicon octicon-gear"></i>
     } else {

src/main/twirl/gitbucket/core/helper/preview.scala.html

@@ -15,7 +15,7 @@
 @import gitbucket.core._
 @import gitbucket.core.view.helpers._
 <div class="tabbable">
-  <ul class="nav nav-tabs fill-width" style="margin-top: 12px; margin-bottom: 10px;">
+  <ul class="nav nav-tabs fill-width" style="margin-bottom: 10px;">
     <li class="active"><a href="#tab@uid" data-toggle="tab">Write</a></li>
     <li><a href="#tab@(uid+1)" data-toggle="tab" id="preview@uid">Preview</a></li>
   </ul>

src/main/twirl/gitbucket/core/index.scala.html

@@ -4,91 +4,19 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @main("GitBucket"){
-  <div class="body">
+  @dashboard.html.sidebar(recentRepositories, userRepositories){
+    @settings.information.map { information =>
+      <div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;">
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        @Html(information)
+      </div>
+    }
     @dashboard.html.tab()
     <div class="container">
-      <div class="row">
-        <div class="col-md-8">
-          <div class="pull-right">
-            <a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
-          </div>
-          @helper.html.activities(activities)
-        </div>
-
-        <div class="col-md-4">
-          @settings.information.map { information =>
-            <div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;">
-              <button type="button" class="close" data-dismiss="alert">&times;</button>
-              @Html(information)
-            </div>
-          }
-          @if(loginAccount.isEmpty){
-            <div id="dashboard-signin-form">@signinform(settings)</div>
-          } else {
-            <div class="panel panel-default">
-              <div class="panel-heading strong">
-                <div class="pull-right">
-                  <a href="@path/new" class="btn btn-success btn-sm">New repository</a>
-                </div>
-                Your repositories <span class="badge">@userRepositories.size</span>
-              </div>
-              <ul class="list-group list-group-flush">
-                @if(userRepositories.isEmpty){
-                  <li class="list-group-item">No repositories</li>
-                } else {
-                  @defining(20){ max =>
-                    @userRepositories.zipWithIndex.map { case (repository, i) =>
-                      <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
-                        @helper.html.repositoryicon(repository, false)
-                        @if(repository.owner == loginAccount.get.userName){
-                          <a href="@url(repository)"><span class="strong">@repository.name</span></a>
-                        } else {
-                          <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-                        }
-                      </li>
-                    }
-                    @if(userRepositories.size > max){
-                      <li class="list-group-item show-more">
-                        <a href="javascript:void(0);" id="show-more-repos">Show @{userRepositories.size - max} more repositories...</a>
-                      </li>
-                    }
-                  }
-                }
-              </ul>
-            </div>
-          }
-          <div class="panel panel-default">
-            <div class="panel-heading strong">Recent updated repositories</div>
-            <ul class="list-group list-group-flush">
-            @if(recentRepositories.isEmpty){
-              <li class="list-group-item">No repositories</li>
-            } else {
-              @defining(20){ max =>
-                @recentRepositories.zipWithIndex.map { case (repository, i) =>
-                  <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
-                    @helper.html.repositoryicon(repository, false)
-                    <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-                  </li>
-                }
-                @if(recentRepositories.size > max){
-                  <li class="list-group-item show-more">
-                    <a href="javascript:void(0);" id="show-more-recent-repos">Show @{recentRepositories.size - max} more repositories...</a>
-                  </li>
-                }
-              }
-            }
-            </ul>
-          </div>
-        </div>
+      <div class="pull-right">
+        <a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
       </div>
+      @helper.html.activities(activities)
     </div>
-  </div>
+  }
 }
-<script>
-$(function(){
-  $('#show-more-repos, #show-more-recent-repos').click(function(e){
-    $(e.target).parents('ul.list-group').find('li.repo-link').show();
-    $(e.target).parents('li.show-more').remove();
-  });
-});
-</script>

src/main/twirl/gitbucket/core/issues/commentform.scala.html

@@ -25,9 +25,9 @@
         <div class="text-right">
           <input type="hidden" name="issueId" value="@issue.issueId"/>
           @if((reopenable || !issue.closed) && (hasWritePermission || issue.openedUserName == loginAccount.get.userName)){
-            <input type="submit" class="btn btn-lg btn-default" tabindex="3" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
+            <input type="submit" class="btn btn-default" tabindex="3" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
           }
-          <input type="submit" class="btn btn-lg btn-success" tabindex="2" formaction="@url(repository)/issue_comments/new" value="Comment"/>
+          <input type="submit" class="btn btn-success" tabindex="2" formaction="@url(repository)/issue_comments/new" value="Comment"/>
         </div>
       </div>
     </div>

src/main/twirl/gitbucket/core/issues/create.scala.html

@@ -8,31 +8,26 @@
 @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("issues", repository){
     <form action="@url(repository)/issues/new" method="POST" validate="true" class="form-group">
-      <div class="row">
-        <div class="col-md-10">
-          <div class="issue-avatar-image">@avatarLink(loginAccount.get.userName, 48)</div>
-          <div class="panel panel-default issue-box">
-            <div class="panel-body">
-              <span id="error-title" class="error"></span>
-              <input type="text" id="issue-title" name="title" class="form-control input-lg" value="" placeholder="Title" autofocus/>
-              @helper.html.preview(
-                repository         = repository,
-                content            = "",
-                enableWikiLink     = false,
-                enableRefsLink     = true,
-                enableLineBreaks   = true,
-                enableTaskList     = true,
-                hasWritePermission = hasWritePermission,
-                style              = "height: 200px; max-height: 250px;",
-                elastic            = true
-              )
-              <div class="align-right">
-                <input type="submit" class="btn btn-lg btn-success" value="Submit new issue"/>
-              </div>
-            </div>
+      <div class="row-fluid">
+        <div class="col-md-9">
+          <span id="error-title" class="error"></span>
+          <input type="text" id="issue-title" name="title" class="form-control" value="" placeholder="Title" style="margin-bottom: 6px;" autofocus/>
+          @helper.html.preview(
+            repository         = repository,
+            content            = "",
+            enableWikiLink     = false,
+            enableRefsLink     = true,
+            enableLineBreaks   = true,
+            enableTaskList     = true,
+            hasWritePermission = hasWritePermission,
+            style              = "height: 200px; max-height: 250px;",
+            elastic            = true
+          )
+          <div class="align-right">
+            <input type="submit" class="btn btn-success" value="Submit new issue"/>
           </div>
         </div>
-        <div class="col-md-2">
+        <div class="col-md-3">
           @issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), labels, hasWritePermission, repository)
         </div>
       </div>

src/main/twirl/gitbucket/core/issues/editcomment.scala.html

@@ -5,8 +5,8 @@
   <textarea id="edit-content-@commentId" class="form-control">@content</textarea>
 }
 <div>
-  <input type="button" id="cancel-comment-@commentId" class="btn btn-lg btn-danger" value="Cancel"/>
-  <input type="button" id="update-comment-@commentId" class="btn btn-lg btn-default pull-right" value="Update comment"/>
+  <input type="button" id="cancel-comment-@commentId" class="btn btn-danger" value="Cancel"/>
+  <input type="button" id="update-comment-@commentId" class="btn btn-default pull-right" value="Update comment"/>
 </div>
 <script>
 $(function(){

src/main/twirl/gitbucket/core/issues/editissue.scala.html

@@ -4,8 +4,8 @@
   <textarea id="edit-content" class="form-control">@content.getOrElse("")</textarea>
 }
 <div>
-  <input type="button" id="cancel-issue" class="btn btn-lg btn-danger" value="Cancel"/>
-  <input type="button" id="update-issue" class="btn btn-lg btn-default pull-right" value="Update comment"/>
+  <input type="button" id="cancel-issue" class="btn btn-danger" value="Cancel"/>
+  <input type="button" id="update-issue" class="btn btn-default pull-right" value="Update comment"/>
 </div>
 <script>
 $(function(){

src/main/twirl/gitbucket/core/issues/issue.scala.html

@@ -18,7 +18,7 @@
         <a class="btn btn-success" href="@url(repository)/issues/new">New issue</a>
       </div>
       <div class="edit-title pull-right" style="display: none;">
-        <a class="btn btn-default" href="#" id="update">Save</a>  <a href="#" id="cancel">Cancel</a>
+        <a class="btn btn-success" href="#" id="update">Save</a>  <a class="btn btn-default" href="#" id="cancel">Cancel</a>
       </div>
       <h1>
         <span class="show-title">
@@ -46,12 +46,12 @@
       </span>
     </div>
     <hr>
-    <div class="row" style="margin-top: 15px;">
-      <div class="col-md-10">
+    <div class="row-fluid" style="margin-top: 15px;">
+      <div class="col-md-9">
         @commentlist(Some(issue), comments, hasWritePermission, repository)
         @commentform(issue, true, hasWritePermission, repository)
       </div>
-      <div class="col-md-2">
+      <div class="col-md-3">
         @issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
       </div>
     </div>

src/main/twirl/gitbucket/core/issues/issueinfo.scala.html

@@ -8,11 +8,11 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<div style="margin-bottom: 8px;">
+<div style="margin-bottom: 14px;">
   <span class="muted small strong">Labels</span>
   @if(hasWritePermission){
     <div class="pull-right">
-      @helper.html.dropdown(right = true) {
+      @helper.html.dropdown("Edit", right = true) {
         @labels.map { label =>
           <li>
             <a href="#" class="toggle-label" data-label-id="@label.labelId">
@@ -33,11 +33,11 @@
   @labellist(issueLabels)
 </ul>
 <hr/>
-<div style="margin-bottom: 8px;">
+<div style="margin-bottom: 14px;">
   <span class="muted small strong">Milestone</span>
   @if(hasWritePermission){
     <div class="pull-right">
-      @helper.html.dropdown(right = true) {
+      @helper.html.dropdown("Edit", right = true) {
         <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="octicon octicon-x"></i> Clear this milestone</a></li>
         @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
           <li>
@@ -85,11 +85,11 @@
   <input type="hidden" name="milestoneId" value=""/>
 }
 <hr/>
-<div style="margin-bottom: 8px;">
+<div style="margin-bottom: 14px;">
   <span class="muted small strong">Assignee</span>
   @if(hasWritePermission){
     <div class="pull-right">
-      @helper.html.dropdown(right = true) {
+      @helper.html.dropdown("Edit", right = true) {
         <li><a href="javascript:void(0);" class="assign" data-name=""><i class="octicon octicon-x"></i> Clear assignee</a></li>
         @collaborators.map { collaborator =>
           <li>
@@ -114,7 +114,7 @@
 }
 @issue.map { issue =>
   <hr/>
-  <div style="margin-bottom: 8px;">
+  <div style="margin-bottom: 14px;">
     @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
       <div class="muted small strong">@participants.size @plural(participants.size, "participant")</div>
     }

src/main/twirl/gitbucket/core/issues/labellist.scala.html

@@ -1,6 +1,6 @@
 @(issueLabels: List[gitbucket.core.model.Label])
 @if(issueLabels.isEmpty){
-  <li><span class="muted small">None yet</span></li>
+  <li><span class="muted">None yet</span></li>
 }
 @issueLabels.map { label =>
   <li><span class="issue-label" style="background-color: #@label.color; color: #@label.fontColor;">@label.labelName</span></li>

src/main/twirl/gitbucket/core/issues/labels/list.scala.html

@@ -5,9 +5,12 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"Labels - ${repository.owner}/${repository.name}"){
-  @html.menu("issues", repository){
-    @issues.html.navigation("labels", hasWritePermission, repository)
-    <br>
+  @html.menu("labels", repository){
+    @if(loginAccount.isDefined){
+      <div class="pull-right" style="margin-bottom: 10px;">
+        <a class="btn btn-success" href="javascript:void(0);" id="new-label-button">New label</a>
+      </div>
+    }
     <table class="table table-bordered table-hover table-issues" id="new-label-table" style="display: none;">
       <tr><td></td></tr>
     </table>

src/main/twirl/gitbucket/core/issues/list.scala.html

@@ -13,7 +13,24 @@
 @import gitbucket.core.view.helpers._
 @html.main((if(target == "issues") "Issues" else "Pull requests") + s" - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu(target, repository){
-    @navigation(target, true, repository, Some(condition))
+    <ul class="nav nav-pills pull-left" style="line-height: 14px; margin-bottom: 10px;">
+      <li class="@if(condition.state == "open"){active}">
+        <a href="@condition.copy(state = "open").toURL">Open <span class="badge">@openCount</span></a>
+      </li>
+      <li class="@if(condition.state == "closed"){active}">
+        <a href="@condition.copy(state = "closed").toURL">Closed <span class="badge">@closedCount</span></a>
+      </li>
+    </ul>
+    <form method="GET" id="search-filter-form" class="form-inline pull-right">
+    @if(loginAccount.isDefined){
+      @if(target == "issues"){
+        <a class="btn btn-success" href="@url(repository)/issues/new">New issue</a>
+      }
+      @if(target == "pulls"){
+        <a class="btn btn-success" href="@url(repository)/compare">New pull request</a>
+      }
+    }
+    </form>
     @listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
     @if(hasWritePermission){
       <form id="batcheditForm" method="POST">

src/main/twirl/gitbucket/core/issues/listparts.scala.html

@@ -12,6 +12,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @import gitbucket.core.service.IssuesService.IssueInfo
+@*
 @if(condition.nonEmpty){
   <div style="width: 100%; display: inline-block;">
     <a href="@gitbucket.core.service.IssuesService.IssueSearchCondition().toURL" class="header-link">
@@ -20,23 +21,14 @@
     </a>
   </div>
 }
+*@
 <table class="table table-bordered table-hover table-issues">
   <thead>
     <tr>
       <th style="background-color: #eee;">
         <input type="checkbox"/>
-        <span class="small">
-          <a class="button-link@if(condition.state == "open"){ selected}" href="@condition.copy(state = "open").toURL">
-            <i class="octicon octicon-issue-opened @(if(condition.state == "open"){"active"})"></i>
-            @openCount Open
-          </a>&nbsp;&nbsp;
-          <a class="button-link@if(condition.state == "closed"){ selected}" href="@condition.copy(state = "closed").toURL">
-            <i class="octicon octicon-check @(if(condition.state == "closed"){"active"})"></i>
-            @closedCount Closed
-          </a>
-        </span>
-        <div class="pull-right" id="table-issues-control">
-          @helper.html.dropdown("Author", flat = true) {
+        <span id="table-issues-control">
+          @helper.html.dropdown("Author") {
             @collaborators.map { collaborator =>
               <li>
                 <a href="@condition.copy(author = (if(condition.author == Some(collaborator)) None else Some(collaborator))).toURL">
@@ -46,7 +38,7 @@
               </li>
             }
           }
-          @helper.html.dropdown("Label", flat = true) {
+          @helper.html.dropdown("Label") {
             @labels.map { label =>
               <li>
                 <a href="@condition.copy(labels = (if(condition.labels.contains(label.labelName)) condition.labels - label.labelName else condition.labels + label.labelName)).toURL">
@@ -57,7 +49,7 @@
               </li>
             }
           }
-          @helper.html.dropdown("Milestone", flat = true) {
+          @helper.html.dropdown("Milestone") {
             <li>
               <a href="@condition.copy(milestone = Some(None)).toURL">
                 @helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone
@@ -71,7 +63,7 @@
               </li>
             }
           }
-          @helper.html.dropdown("Assignee", flat = true) {
+          @helper.html.dropdown("Assignee") {
             @collaborators.map { collaborator =>
               <li>
                 <a href="@condition.copy(assigned = Some(collaborator)).toURL">
@@ -81,7 +73,7 @@
               </li>
             }
           }
-          @helper.html.dropdown("Sort", flat = true){
+          @helper.html.dropdown("Sort"){
             <li>
               <a href="@condition.copy(sort="created",  direction="desc").toURL">
               @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
@@ -113,14 +105,14 @@
               </a>
             </li>
           }
-        </div>
+        </span>
         @if(hasWritePermission){
-          <div class="pull-right" id="table-issues-batchedit">
-            @helper.html.dropdown("Mark as", flat = true) {
+          <span id="table-issues-batchedit">
+            @helper.html.dropdown("Mark as") {
               <li><a href="javascript:void(0);" class="toggle-state" data-id="open">Open</a></li>
               <li><a href="javascript:void(0);" class="toggle-state" data-id="close">Close</a></li>
             }
-            @helper.html.dropdown("Label", flat = true) {
+            @helper.html.dropdown("Label") {
               @labels.map { label =>
                 <li>
                   <a href="javascript:void(0);" class="toggle-label" data-id="@label.labelId">
@@ -131,19 +123,19 @@
                 </li>
               }
             }
-            @helper.html.dropdown("Milestone", flat = true) {
+            @helper.html.dropdown("Milestone") {
               <li><a href="javascript:void(0);" class="toggle-milestone" data-id="">No milestone</a></li>
               @milestones.filter(_.closedDate.isEmpty).map { milestone =>
                 <li><a href="javascript:void(0);" class="toggle-milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
               }
             }
-            @helper.html.dropdown("Assignee", flat = true) {
+            @helper.html.dropdown("Assignee") {
               <li><a href="javascript:void(0);" class="toggle-assign" data-name=""><i class="octicon octicon-x"></i> Clear assignee</a></li>
               @collaborators.map { collaborator =>
                 <li><a href="javascript:void(0);" class="toggle-assign" data-name="@collaborator"><i class="octicon"></i>@avatar(collaborator, 20) @collaborator</a></li>
               }
             }
-          </div>
+          </span>
         }
       </th>
     </tr>
@@ -157,9 +149,11 @@
           } else {
             No pull requests to show.
           }
+          @*
           @if(condition.labels.nonEmpty || condition.milestone.isDefined){
             <a href="@condition.copy(labels = Set.empty, milestone = None).toURL">Clear active filters.</a>
           } else {
+          *@
             @if(repository.isDefined){
               @if(target == "issues"){
                 <a href="@url(repository.get)/issues/new">Create a new issue.</a>
@@ -167,7 +161,9 @@
                 <a href="@url(repository.get)/compare">Create a new pull request.</a>
               }
             }
+          @*
           }
+          *@
         </td>
       </tr>
     }
@@ -177,7 +173,9 @@
           @if(hasWritePermission){
             <input type="checkbox" value="@issue.issueId"/>
           }
+          @*
           <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")" style="margin-right: 3px;"></i>
+          *@
           @if(repository.isEmpty){
             <a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a>&nbsp;&#xFF65;
           }
@@ -204,7 +202,7 @@
               </a>
             }
           </span>
-          <div class="small muted" style="margin-left: 40px; margin-top: 2px;">
+          <div class="small muted" style="margin-left: 12px; margin-top: 2px;">
             #@issue.issueId opened  @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
             @milestone.map { milestone =>
               <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> @milestone</a></span>

src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html

@@ -3,13 +3,10 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
-  @html.menu("issues", repository){
+  @html.menu("milestones", repository){
     @if(milestone.isEmpty){
       <h4>New milestone</h4>
       <div class="muted">Create a new milestone to help organize your issues and pull requests.</div>
-    } else {
-      @issues.html.navigation("milestones", false, repository)
-      <br><br>
     }
     <hr style="margin-top: 12px; margin-bottom: 18px;" class="fill-width"/>
     <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
@@ -30,7 +27,7 @@
       <hr>
       <div class="pull-right">
         @if(milestone.isEmpty){
-          <input type="submit" class="btn btn-default" value="Create milestone"/>
+          <input type="submit" class="btn btn-success" value="Create milestone"/>
         } else {
           @if(milestone.get.closedDate.isDefined){
             <input type="button" class="btn btn-default" value="Open" id="open"
@@ -39,7 +36,7 @@
             <input type="button" class="btn btn-default" value="Close" id="close"
                    onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/open';"/>
           }
-          <input type="submit" class="btn btn-default" value="Update milestone"/>
+          <input type="submit" class="btn btn-success" value="Update milestone"/>
         }
       </div>
     </form>

src/main/twirl/gitbucket/core/issues/milestones/list.scala.html

@@ -5,20 +5,21 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
-  @html.menu("issues", repository){
-    @issues.html.navigation("milestones", hasWritePermission, repository)
-    <br>
+  @html.menu("milestones", repository){
+    @if(loginAccount.isDefined){
+      <div class="pull-right" style="margin-bottom: 10px;">
+        <a class="btn btn-success" href="@url(repository)/issues/milestones/new">New milestone</a>
+      </div>
+    }
     <table class="table table-bordered table-hover table-issues">
       <thead>
         <tr>
           <th style="background-color: #eee;">
             <span class="small">
               <a class="button-link@if(state == "open"){ selected}" href="?state=open">
-                <i class="octicon octicon-milestone @(if(state == "open"){"active"})"></i>
                 @milestones.count(_._1.closedDate.isEmpty) Open
               </a>&nbsp;&nbsp;
               <a class="button-link@if(state == "closed"){ selected}" href="?state=closed">
-                <i class="octicon octicon-milestone @(if(state == "closed"){"active"})"></i>
                 @milestones.count(_._1.closedDate.isDefined) Closed
               </a>
             </span>

src/main/twirl/gitbucket/core/issues/navigation.scala.html

@@ -1,56 +0,0 @@
-@(active: String,
-  newButton: Boolean,
-  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  condition: Option[gitbucket.core.service.IssuesService.IssueSearchCondition] = None)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-<ul class="nav nav-pills pull-left" style="line-height: 14px;">
-  <li class="@if(active == "issues"    ){active}"><a href="@url(repository)/issues">Issues</a></li>
-  <li class="@if(active == "pulls"     ){active}"><a href="@url(repository)/pulls">Pull requests</a></li>
-  <li class="@if(active == "labels"    ){active}"><a href="@url(repository)/issues/labels">Labels</a></li>
-  <li class="@if(active == "milestones"){active}"><a href="@url(repository)/issues/milestones">Milestones</a></li>
-</ul>
-<form method="GET" id="search-filter-form" style="margin-bottom: 0px;" class="form-inline pull-right">
-  @condition.map { condition =>
-    @if(loginAccount.isDefined){
-      <div class="form-group" style="width: 300px">
-        <div class="input-group" style="margin-bottom: 0px;">
-          <div class="input-group-btn">
-            <button type="button" class="btn btn-default btn-lg dropdown-toggle" data-toggle="dropdown">
-              Filter
-              <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu">
-              <li><a href="?q=is:open">Open issues and pull requests</a></li>
-              <li><a href="?q=is:open+is:issue+author:@urlEncode(loginAccount.get.userName)">Your issues</a></li>
-              <li><a href="?q=is:open+is:pr+author:@urlEncode(loginAccount.get.userName)">Your pull requests</a></li>
-              <li><a href="?q=is:open+assignee:@urlEncode(loginAccount.get.userName)">Everything assigned to you</a></li>
-              @*
-              <li><a href="?q=is:open+mentions:@urlEncode(loginAccount.get.userName)">Everything mentioning you</a></li>
-              *@
-            </ul>
-          </div>
-          <input type="text" id="search-filter-box" class="form-control input-lg" size="40" name="q" value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
-        </div>
-      </div>
-    } else {
-      <input type="text" id="search-filter-box" class="form-control input-lg" size="40" name="q" value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
-    }
-  }
-  @if(loginAccount.isDefined){
-    @if(newButton){
-      @if(active == "issues"){
-        <a class="btn btn-success btn-lg" href="@url(repository)/issues/new">New issue</a>
-      }
-      @if(active == "pulls"){
-        <a class="btn btn-success btn-lg" href="@url(repository)/compare">New pull request</a>
-      }
-      @if(active == "labels"){
-        <a class="btn btn-success btn-lg" href="javascript:void(0);" id="new-label-button">New label</a>
-      }
-      @if(active == "milestones"){
-        <a class="btn btn-success btn-lg" href="@url(repository)/issues/milestones/new">New milestone</a>
-      }
-    }
-  }
-</form>

src/main/twirl/gitbucket/core/main.scala.html

@@ -1,6 +1,5 @@
 @(title: String, repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.plugin.PluginRegistry
-@import gitbucket.core.servlet.AutoUpdate
 @import context._
 @import gitbucket.core.view.helpers._
 <!DOCTYPE html>
@@ -11,10 +10,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <link rel="icon" href="@assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="@assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap.css" rel="stylesheet">
-    @*
-    <link href="@assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap-responsive.css" rel="stylesheet">
-    *@
+    <link href="@assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css" rel="stylesheet">
     <link href="@assets/vendors/octicons/octicons.css" rel="stylesheet">
     <link href="@assets/vendors/datepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
     <link href="@assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet">
@@ -25,7 +21,7 @@
     <script src="@assets/vendors/dropzone/dropzone.js"></script>
     <script src="@assets/common/js/validation.js"></script>
     <script src="@assets/common/js/gitbucket.js"></script>
-    <script src="@assets/vendors/bootstrap-theme-github-3.1.1/js/bootstrap.js"></script>
+    <script src="@assets/vendors/bootstrap-3.3.6/js/bootstrap.js"></script>
     <script src="@assets/vendors/bootstrap3-typeahead/bootstrap3-typeahead.js"></script>
     <script src="@assets/vendors/datepicker/js/moment.js"></script>
     <script src="@assets/vendors/datepicker/js/bootstrap-datetimepicker.min.js"></script>
@@ -44,7 +40,7 @@
   <body>
     <form id="search" action="@path/search" method="POST" class="form-inline">
       <nav class="navbar navbar-default">
-        <div class="container" style="width: 980px;">
+        <div class="container">
           @* TODO: for plugi-ins?
           <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
@@ -53,14 +49,12 @@
           </button>
           *@
           <a class="navbar-brand" href="@path/">
-            <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px;"/>GitBucket
-            @defining(AutoUpdate.getCurrentVersion){ version =>
-              <span class="header-version">@version.majorVersion.@version.minorVersion</span>
-            }
+            <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px; display: inline;"/>GitBucket
+            <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.get(0).getVersion</span>
           </a>
           @if(loginAccount.isDefined){
             @repository.map { repository =>
-              <input type="text" name="query" class="form-control" style="width: 200px; margin-bottom: 0px;" placeholder="Search this repository"/>
+              <input type="text" name="query" class="form-control" style="width: 400px; margin-top: 3px; margin-bottom: 3px;" placeholder="Search this repository"/>
               <input type="hidden" name="owner" value="@repository.owner"/>
               <input type="hidden" name="repository" value="@repository.name"/>
             }
@@ -69,11 +63,16 @@
           } else {
             @* TODO: merge with below *@
             @repository.map { repository =>
-              <input type="text" name="query" class="form-control" style="width: 200px; margin-top: 6px; margin-bottom: 0px;" placeholder="Search this repository"/>
+              <input type="text" name="query" class="form-control" style="width: 400px; margin-top: 3px; margin-bottom: 3px;" placeholder="Search this repository"/>
               <input type="hidden" name="owner" value="@repository.owner"/>
               <input type="hidden" name="repository" value="@repository.name"/>
             }
           }
+          @gitbucket.core.plugin.PluginRegistry().getGlobalMenus.map { menu =>
+            @menu(context).map { link =>
+              <a href="@path/@link.path" class="global-header-menu">@link.label</a>
+            }
+          }
           @if(loginAccount.isDefined){
             <div class="pull-right" style="margin-top: 6px;">
               <div class="btn-group" style="margin-right: 8px;">
@@ -100,7 +99,7 @@
               </div>
             </div>
           } else {
-            <a href="@path/signin?redirect=@urlEncode(currentPath)" class="btn btn-default pull-right" style="margin-top: 6px;" id="signin">Sign in</a>
+            <a href="@path/signin?redirect=@urlEncode(currentPath)" class="btn btn-default pull-right" style="margin-top: 3px; margin-bottom: 3px;" id="signin">Sign in</a>
           }
         </div>
       </nav>

src/main/twirl/gitbucket/core/menu.scala.html

@@ -1,20 +1,21 @@
 @(active: String,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   id: Option[String] = None,
-  isRepoTop: Boolean = false,
-  isNoGroup: Boolean = true,
   info: Option[Any] = None,
   error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
 
-@menuitem(path: String, name: String, icon: String, label: String, count: Int = 0) = {
+@menuitem(path: String, name: String, label: String, icon: String, count: Int = 0) = {
   <li @if(active == name){class="active"}>
     <a href="@url(repository)@path">
-      <i class="menu-icon @if(active == name){menu-icon-active} octicon octicon-@{icon} "></i> <span class="pc">@label</span>
-      @if(count > 0){
-        <span class="badge">@count</span>
-      }
+      <i class="menu-icon octicon octicon-@icon"></i>
+      <span class="pc">
+        @label
+        @if(count > 0){
+          <span class="badge">@count</span>
+        }
+      </span>
     </a>
   </li>
 }
@@ -24,29 +25,6 @@
     @helper.html.information(info)
     @helper.html.error(error)
     <div class="head">
-      @if(repository.commitCount > 0){
-        <div class="input-group pull-right">
-          <span class="fork">
-            <span class="input-group-btn">
-            @if(loginAccount.isEmpty){
-              <a title="You must be signed in to fork a repository" href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-default">Fork</a>
-            } else {
-              @if(isNoGroup) {
-                <a id="fork-link" href="javascript:void(0);" class="btn btn-default">Fork</a>
-              } else {
-                <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-default" rel="facebox">Fork</a>
-              }
-            }
-            </span>
-            <span class="count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
-          </span>
-        </div>
-        @if(loginAccount.isDefined && isNoGroup){
-          <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;">
-            <input type="hidden" name="account" value="@loginAccount.get.userName"/>
-          </form>
-        }
-      }
       @helper.html.repositoryicon(repository, true)
       <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
 
@@ -56,92 +34,39 @@
             forked from <a href="@path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
           </div>
         }
+        @x.description.map { description =>
+          <div class="normal muted" style="margin-left: 36px; font-size: 80%;">@detectAndRenderLinks(description)</div>
+        }
       }
     </div>
-    <ul class="headmenu">
-      @menuitem(""       , "code"   , "code" , "Code")
-      @menuitem("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount)
-      @menuitem("/pulls" , "pulls"  , "git-pull-request" , "Pull Requests", repository.pullCount)
-      @menuitem("/wiki"  , "wiki"   , "book"  , "Wiki")
-      @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-        @menuitem("/settings" , "settings" , "tools", "Settings")
-      }
-    </ul>
   </div>
 </div>
 <div class="container body">
-  @if(isRepoTop){
-    @repository.repository.description.map { description =>
-      <p class="description">@detectAndRenderLinks(description)</p>
-    }
-    <div style="margin-bottom: 10px; padding: 4px;" class="panel panel-default">
-      <table class="fill-width">
-        <tr>
-          <td style="width: 33%; text-align: center;">
-            <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(""))" class="header-link">
-              <i class="octicon octicon-history"></i>
-              @if(repository.commitCount > 10000){
-                <strong>10000+</strong> commits
-              } else {
-                <strong>@repository.commitCount</strong> commits
-              }
-            </a>
-          </td>
-          <td style="width: 33%; text-align: center;">
-            <a href="@url(repository)/branches" class="header-link" class="header-link">
-              <i class="octicon octicon-git-branch"></i>
-              <strong>@repository.branchList.length</strong> branches
-            </a>
-          </td>
-          <td style="width: 33%; text-align: center;">
-            <a href="@url(repository)/tags" class="header-link" class="header-link">
-              <i class="octicon octicon-tag"></i>
-              <strong>@repository.tags.length</strong> releases
-            </a>
-          </td>
-        </tr>
-      </table>
-    </div>
-  }
-  @body
+  <div class="main-sidebar">
+    <ul class="nav nav-pills nav-stacked">
+      @menuitem(""                   ,"files"      ,"Files", "code")
+      @if(repository.commitCount != 0) {
+        @menuitem("/branches"        ,"branches"   ,"Branches", "git-branch", repository.branchList.length)
+        @menuitem("/tags"            ,"tags"       ,"Tags", "tag", repository.tags.length)
+      }
+      @menuitem("/issues"            ,"issues"     ,"Issues", "issue-opened", repository.issueCount)
+      @menuitem("/pulls"             ,"pulls"      ,"Pull Requests", "git-pull-request", repository.pullCount)
+      @menuitem("/issues/labels"     ,"labels"     ,"Labels", "tag")
+      @menuitem("/issues/milestones" ,"milestones" ,"Milestones", "milestone")
+      @menuitem("/wiki"              ,"wiki"       ,"Wiki", "book")
+      @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
+      @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
+        @menuitem("/settings" , "settings" , "Settings", "tools")
+      }
+      @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu =>
+        @menu(repository, context).map { link =>
+          @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby"))
+        }
+      }
+    </ul>
+  </div>
+  <div class="main-content">
+    @body
+  </div>
 </div>
-<script>
-$(function(){
 
-  $('ul.sidemenu a').mouseover(function(e){
-    var target = e.target;
-    if(e.target.tagName == "I"){
-      target = e.target.parentElement;
-    }
-    $(target).prev('div.gradient').css('border-left', '1px solid silver');
-  });
-
-  $('ul.sidemenu a').mouseout(function(e){
-    var target = e.target;
-    if(e.target.tagName == "I"){
-      target = e.target.parentElement;
-    }
-    $(target).prev('div.gradient').css('border-left', '1px solid #eee');
-  });
-
-  $('a[rel*=facebox]').facebox({
-    'loadingImage': '@assets/vendors/facebox/loading.gif',
-    'closeImage': '@assets/vendors/facebox/closelabel.png'
-  });
-
-  $(document).on("click", ".js-fork-owner-select-target", function() {
-    if (!$(this).hasClass("disabled")) {
-      var account = $(this).text().replace("@@", "");
-      $("#account").val(account);
-      $("#fork").submit();
-    }
-  });
-
-  @if(loginAccount.isDefined){
-    $(document).on("click", "a#fork-link", function(e) {
-      e.preventDefault();
-      $('#fork-form').submit();
-    });
-  }
-});
-</script>

src/main/twirl/gitbucket/core/pulls/commits.scala.html

@@ -4,42 +4,41 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @import gitbucket.core.model._
-<div class="commit-list">
-  @commits.map { day =>
-    <div class="muted" style="background-color: white;">
-      <i class="octicon octicon-git-commit"></i> Commits on @date(day.head.commitTime)
-    </div>
-    <div class="list-group box-commits">
-      @day.map { commit =>
-        <div class="list-group-item">
-          <ul class="nav nav-pills pull-right">
-            <li><a href="@url(repository)/commit/@commit.id" class="link monospace" style="line-height: 16px;">@commit.id.substring(0, 7)</a></li>
-            <li><a href="@url(repository)/tree/@commit.id" style="line-height: 16px;"><i class="octicon octicon-code link"></i></a></li>
-          </ul>
+<table class="table table-bordered">
+@commits.map { day =>
+  <tr>
+    <th rowspan="@day.size" width="100">@date(day.head.commitTime)</th>
+    @day.zipWithIndex.map { case (commit, i) =>
+      @if(i != 0){ <tr> }
+      <td>
+        <div class="pull-right text-right">
+          <a href="@url(repository)/commit/@commit.id" class="monospace commit-message strong"><i class="octicon octicon-diff" style="color: black;"></i>@commit.id.substring(0, 7)</a><br>
+          <a href="@url(repository)/tree/@commit.id" class="button-link">Browse files »</a>
+        </div>
+        <div>
+          <div class="commit-avatar-image">@avatarLink(commit, 40)</div>
           <div>
-            <div class="commit-avatar-image">@avatarLink(commit, 40)</div>
+            <a href="@url(repository)/commit/@commit.id" class="commit-message strong">@link(commit.summary, repository)</a>
+            @if(commit.description.isDefined){
+              <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
+            }
+            <br>
+            @if(commit.description.isDefined){
+              <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
+            }
             <div>
-              <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
-              @if(commit.description.isDefined){
-                <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
+              @user(commit.authorName, commit.authorEmailAddress, "username")
+              <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
+              @if(commit.isDifferentFromAuthor) {
+                <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
+                @user(commit.committerName, commit.committerEmailAddress, "username")
+                <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
               }
-              <br>
-              @if(commit.description.isDefined){
-                <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
-              }
-              <div style="margin-top: 2px;">
-                @user(commit.authorName, commit.authorEmailAddress, "username")
-                <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
-                @if(commit.isDifferentFromAuthor) {
-                  <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
-                  @user(commit.committerName, commit.committerEmailAddress, "username")
-                  <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
-                }
-              </div>
             </div>
           </div>
         </div>
-      }
-    </div>
-  }
-</div>
+      </td>
+      </tr>
+    }
+}
+</table>

src/main/twirl/gitbucket/core/pulls/compare.scala.html

@@ -54,36 +54,31 @@
       <div id="pull-request-form" @*class="box"*@ style="display: none; margin-bottom: 20px;">
         <form method="POST" action="@path/@originRepository.owner/@originRepository.name/pulls/new" validate="true">
           <div class="row">
-            <div class="col-md-10">
-              <div class="issue-avatar-image">@avatarLink(loginAccount.get.userName, 48)</div>
-              <div class="panel panel-default issue-box">
-                <div class="panel-body">
-                  <span class="error" id="error-title"></span>
-                  <input type="text" name="title" class="form-control input-lg" placeholder="Title"/>
-                  @helper.html.preview(
-                    repository         = repository,
-                    content            = "",
-                    enableWikiLink     = false,
-                    enableRefsLink     = true,
-                    enableLineBreaks   = true,
-                    enableTaskList     = true,
-                    hasWritePermission = true,
-                    style              = "height: 200px;"
-                  )
-                  <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
-                  <input type="hidden" name="targetBranch" value="@originId"/>
-                  <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
-                  <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
-                  <input type="hidden" name="requestBranch" value="@forkedId"/>
-                  <input type="hidden" name="commitIdFrom" value="@sourceId"/>
-                  <input type="hidden" name="commitIdTo" value="@commitId"/>
-                  <div class="align-right">
-                    <input type="submit" class="btn btn-lg btn-success" value="Create pull request"/>
-                  </div>
-                </div>
+            <div class="col-md-9">
+              <span class="error" id="error-title"></span>
+              <input type="text" name="title" class="form-control" style="margin-bottom: 6px;" placeholder="Title"/>
+              @helper.html.preview(
+                repository         = repository,
+                content            = "",
+                enableWikiLink     = false,
+                enableRefsLink     = true,
+                enableLineBreaks   = true,
+                enableTaskList     = true,
+                hasWritePermission = true,
+                style              = "height: 200px;"
+              )
+              <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
+              <input type="hidden" name="targetBranch" value="@originId"/>
+              <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
+              <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
+              <input type="hidden" name="requestBranch" value="@forkedId"/>
+              <input type="hidden" name="commitIdFrom" value="@sourceId"/>
+              <input type="hidden" name="commitIdTo" value="@commitId"/>
+              <div class="align-right">
+                <input type="submit" class="btn btn-success" value="Create pull request"/>
               </div>
             </div>
-            <div class="col-md-2">
+            <div class="col-md-3">
               @issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), labels, hasOriginWritePermission, repository)
             </div>
           </div>

src/main/twirl/gitbucket/core/pulls/conversation.scala.html

@@ -12,7 +12,7 @@
 @import gitbucket.core.model._
 
 <div class="row">
-  <div class="col-md-10">
+  <div class="col-md-9">
     <div id="comment-list">
       @issues.html.commentlist(Some(issue), comments, hasWritePermission, repository, Some(pullreq))
     </div>
@@ -44,7 +44,7 @@
       @issues.html.commentform(issue, !merged, hasWritePermission, repository)
     }
   </div>
-  <div class="col-md-2">
+  <div class="col-md-3">
     @issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
   </div>
 </div>

src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html

@@ -51,7 +51,7 @@
             <div class="pull-right">
               <form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/update_branch">
                 <input type="hidden" name="expected_head_oid" value="@pullreq.commitIdFrom">
-                <button class="btn"@if(!status.canUpdate){ disabled="true"} id="update-branch-button">Update branch</button>
+                <button class="btn btn-default"@if(!status.canUpdate){ disabled="true"} id="update-branch-button">Update branch</button>
               </form>
             </div>
           }
@@ -83,7 +83,7 @@
       </div>
       @if(status.hasMergePermission){
         <div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa">
-          <input type="button" class="btn btn-lg @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/>
+          <input type="button" class="btn @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/>
           &nbsp;&nbsp;You can also merge branches on the <a href="#" class="show-command-line">command line</a>.
           <div id="command-line" style="display: none;margin-top: 15px;">
             <hr />

src/main/twirl/gitbucket/core/pulls/pullreq.scala.html

@@ -26,7 +26,7 @@
           }
         </div>
         <div class="edit-title pull-right" style="display: none;">
-          <a class="btn" href="#" id="update">Save</a>  <a href="#" id="cancel">Cancel</a>
+          <a class="btn btn-success" href="#" id="update">Save</a>  <a class="btn btn-default" href="#" id="cancel">Cancel</a>
         </div>
         <h1>
           <span class="show-title">
@@ -35,7 +35,7 @@
           </span>
           <span class="edit-title" style="display: none;">
             <span id="error-edit-title" class="error"></span>
-            <input type="text" style="width: 700px;" id="edit-title" value="@issue.title"/>
+            <input type="text" class="form-control" style="width: 700px;" id="edit-title" value="@issue.title"/>
           </span>
         </h1>
       </div>
@@ -66,7 +66,7 @@
           </span>
         }
       </div>
-      <ul class="nav nav-tabs fill-width pull-left" id="pullreq-tab">
+      <ul class="nav nav-tabs fill-width" id="pullreq-tab">
         <li><a href="#conversation">Conversation <span class="badge">@comments.flatMap @{
           case comment: IssueComment => Some(comment)
           case _: CommitComment => None
@@ -74,7 +74,7 @@
         <li><a href="#commits">Commits <span class="badge">@commits.size</span></a></li>
         <li><a href="#files">Files Changed <span class="badge">@diffs.size</span></a></li>
       </ul>
-      <div class="tab-content fill-width pull-left">
+      <div class="tab-content fill-width" style="padding-top: 20px;">
         <div class="tab-pane" id="conversation">
           @flash.get("error").map{ error =>
             <div class="alert alert-error">@error</div>

src/main/twirl/gitbucket/core/repo/blob.scala.html

@@ -8,7 +8,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     <div class="head">
       <div class="pull-right hide-if-blame"><div class="btn-group">
         <a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t">Find file</a>
@@ -48,7 +48,7 @@
       }
     </div>
     <div class="box-header">
-      @avatar(latestCommit, 20)
+      @avatar(latestCommit, 28)
       @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
       <span class="muted">@helper.html.datetimeago(latestCommit.commitTime)</span>
       <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>

src/main/twirl/gitbucket/core/repo/branches.scala.html

@@ -4,9 +4,8 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
-    <h1>Branches</h1>
-    <table class="table table-bordered table-hover table-issues branches">
+  @html.menu("branches", repository){
+    <table class="table table-bordered table-hover branches">
       <thead>
         <tr>
           <th style="background: #f5f5f5;color: #666;">All branches</th>

src/main/twirl/gitbucket/core/repo/commit.scala.html

@@ -11,7 +11,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(commit.shortMessage, Some(repository)){
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     <table class="table table-bordered">
       <tr>
         <th class="box-header">

src/main/twirl/gitbucket/core/repo/commits.scala.html

@@ -8,7 +8,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     <div class="head">
       @if(pathList.isEmpty){
         @helper.html.branchcontrol(
@@ -33,47 +33,47 @@
         }
       }
     </div>
-    <div class="commit-list">
-      @commits.map { day =>
-        <div class="muted" style="background-color: white;">
-          <i class="octicon octicon-git-commit"></i> Commits on @date(day.head.commitTime)
-        </div>
-        <div class="list-group box-commits">
-          @day.map { commit =>
-            <div class="list-group-item">
-              <ul class="nav nav-pills pull-right">
-                <li><a href="@url(repository)/commit/@commit.id" class="link monospace" style="line-height: 16px;">@commit.id.substring(0, 7)</a></li>
-                <li><a href="@url(repository)/tree/@commit.id" style="line-height: 16px;"><i class="octicon octicon-code link"></i></a></li>
-              </ul>
+
+    <table class="table table-bordered">
+    @commits.map { day =>
+      <tr>
+        <th rowspan="@day.size" width="100">@date(day.head.commitTime)</th>
+        @day.zipWithIndex.map { case (commit, i) =>
+          @if(i != 0){ <tr> }
+          <td>
+            <div class="pull-right text-right">
+              <a href="@url(repository)/commit/@commit.id" class="monospace commit-message strong"><i class="octicon octicon-diff" style="color: black;"></i>@commit.id.substring(0, 7)</a><br>
+              <a href="@url(repository)/tree/@commit.id" class="button-link">Browse files »</a>
+            </div>
+            <div>
+              <div class="commit-avatar-image">@avatarLink(commit, 40)</div>
               <div>
-                <div class="commit-avatar-image">@avatarLink(commit, 40)</div>
+                <a href="@url(repository)/commit/@commit.id" class="commit-message strong">@link(commit.summary, repository)</a>
+                @if(commit.description.isDefined){
+                  <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
+                }
+                <br>
+                @if(commit.description.isDefined){
+                  <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
+                }
                 <div>
-                  <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
-                  @if(commit.description.isDefined){
-                    <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
+                  @user(commit.authorName, commit.authorEmailAddress, "username")
+                  <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
+                  @if(commit.isDifferentFromAuthor) {
+                    <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
+                    @user(commit.committerName, commit.committerEmailAddress, "username")
+                    <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
                   }
-                  <br>
-                  @if(commit.description.isDefined){
-                    <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
-                  }
-                  <div style="margin-top: 2px;">
-                    @user(commit.authorName, commit.authorEmailAddress, "username")
-                    <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
-                    @if(commit.isDifferentFromAuthor) {
-                      <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
-                      @user(commit.committerName, commit.committerEmailAddress, "username")
-                      <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
-                    }
-                  </div>
                 </div>
               </div>
             </div>
-          }
-        </div>
-      }
-    </div>
+          </td>
+          </tr>
+        }
+    }
+    </table>
 
-    <nav style="text-align: center; margin-top: 30px">
+    <nav style="text-align: center; margin-top: 20px">
       <ul class="pagination">
         @if(page <= 1){
           <li class="disabled"><span>Newer</span></li>