Release 4.14

Make all settings configurable by system property or environment variable

.gitignore

@@ -16,6 +16,8 @@ project/plugins/project/
 .classpath
 .project
 .cache
+.cache-main
+.cache-tests
 .settings
 
 # IntelliJ specific

.travis.yml

@@ -2,12 +2,10 @@ language: scala
 sudo: true
 script:
   - sbt test
-jdk:
-  - oraclejdk8
 before_script:
-  - sudo apt-get install libaio1
   - sudo /etc/init.d/mysql stop
   - sudo /etc/init.d/postgresql stop
+  - sudo chmod +x /usr/local/bin/sbt
 cache:
   directories:
     - $HOME/.ivy2/cache
@@ -18,10 +16,20 @@ cache:
     - $HOME/.embedpostgresql
 matrix:
   include:
+  - jdk: oraclejdk8
+    addons:
+      apt:
+        packages:
+        - libaio1
   - dist: trusty
     group: edge
     sudo: required
     jdk: oraclejdk9
+    addons:
+      apt:
+        packages:
+        - libaio1
+        - oracle-java9-installer
     script:
     # https://github.com/sbt/sbt/pull/2951
     - git clone https://github.com/retronym/java9-rt-export
@@ -30,9 +38,9 @@ matrix:
     - jdk_switcher use oraclejdk8
     - sbt package
     - jdk_switcher use oraclejdk9
+    - java -version
     - mkdir -p $HOME/.sbt/0.13/java9-rt-ext; java -jar target/java9-rt-export-*.jar $HOME/.sbt/0.13/java9-rt-ext/rt.jar
     - jar tf $HOME/.sbt/0.13/java9-rt-ext/rt.jar | grep java/lang/Object
     - cd ..
-    - echo "sbt.version=0.13.14-RC1" > project/build.properties
     - wget https://raw.githubusercontent.com/paulp/sbt-extras/9ade5fa54914ca8aded44105bf4b9a60966f3ccd/sbt && chmod +x ./sbt
     - ./sbt -Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext test

README.md

@@ -1,4 +1,4 @@
-0;95;0cGitBucket [![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 [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket)
 =========
 
 GitBucket is a Git web platform powered by Scala offering:
@@ -38,9 +38,12 @@ You can specify following options:
 - `--host=[HOSTNAME]`
 - `--gitbucket.home=[DATA_DIR]`
 - `--temp_dir=[TEMP_DIR]`
+- `--max_file_size=[MAX_FILE_SIZE]`
 
 `TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home.
 
+`MAX_FILE_SIZE` is the max file size for upload files.
+
 You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
 
 For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
@@ -68,8 +71,22 @@ Support
 
 Release Notes
 -------------
+### 4.14 - 1 Jul 2017
+
+- Support priority in issues and pull requests
+- Show icons when the sidebar is collapsed
+- Support gollumn events in web hook
+- Support account (user / group) level web hook
+- Add `--max_file_size` option
+- Configuration by system property or environment variable
+
+### 4.13 - 29 May 2017
+- Uploading files into the repository
+- HTML is available in Markdown
+- Added filter box to dropdown menus
+
 ### 4.12 - 30 Apr 2017
-- Gist plug-in provides JavaScript to embed snippet
+- [Gist plug-in](https://github.com/gitbucket/gitbucket-gist-plugin) provides JavaScript to embed snippet
 - Dropdown menu filter in the branch comparing page
 - Caution for the embedded H2 database
 

build.sbt

@@ -1,8 +1,8 @@
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.12.0"
+val GitBucketVersion = "4.14.0"
 val ScalatraVersion = "2.5.0"
-val JettyVersion = "9.3.9.v20160517"
+val JettyVersion = "9.3.19.v20170502"
 
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)
 
@@ -25,26 +25,26 @@ libraryDependencies ++= Seq(
   "org.eclipse.jgit"                %  "org.eclipse.jgit.archive"     % "4.7.0.201704051617-r",
   "org.scalatra"                    %% "scalatra"                     % ScalatraVersion,
   "org.scalatra"                    %% "scalatra-json"                % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"               % "3.5.0",
+  "org.json4s"                      %% "json4s-jackson"               % "3.5.1",
   "io.github.gitbucket"             %% "scalatra-forms"               % "1.1.0",
-  "commons-io"                      %  "commons-io"                   % "2.4",
-  "io.github.gitbucket"             %  "solidbase"                    % "1.0.0",
-  "io.github.gitbucket"             %  "markedj"                      % "1.0.10",
-  "org.apache.commons"              %  "commons-compress"             % "1.11",
+  "commons-io"                      %  "commons-io"                   % "2.5",
+  "io.github.gitbucket"             %  "solidbase"                    % "1.0.2",
+  "io.github.gitbucket"             %  "markedj"                      % "1.0.12",
+  "org.apache.commons"              %  "commons-compress"             % "1.13",
   "org.apache.commons"              %  "commons-email"                % "1.4",
-  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.1",
-  "org.apache.sshd"                 %  "apache-sshd"                  % "1.2.0",
-  "org.apache.tika"                 %  "tika-core"                    % "1.13",
+  "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.3",
+  "org.apache.sshd"                 %  "apache-sshd"                  % "1.4.0" exclude("org.slf4j","slf4j-jdk14"),
+  "org.apache.tika"                 %  "tika-core"                    % "1.14",
   "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.8",
-  "joda-time"                       %  "joda-time"                    % "2.9.6",
+  "joda-time"                       %  "joda-time"                    % "2.9.9",
   "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
-  "com.h2database"                  %  "h2"                           % "1.4.192",
-  "mysql"                           %  "mysql-connector-java"         % "5.1.39",
-  "org.postgresql"                  %  "postgresql"                   % "9.4.1208",
-  "ch.qos.logback"                  %  "logback-classic"              % "1.1.7",
-  "com.zaxxer"                      %  "HikariCP"                     % "2.4.6",
-  "com.typesafe"                    %  "config"                       % "1.3.0",
-  "com.typesafe.akka"               %% "akka-actor"                   % "2.4.12",
+  "com.h2database"                  %  "h2"                           % "1.4.195",
+  "mysql"                           %  "mysql-connector-java"         % "6.0.6",
+  "org.postgresql"                  %  "postgresql"                   % "42.0.0",
+  "ch.qos.logback"                  %  "logback-classic"              % "1.2.3",
+  "com.zaxxer"                      %  "HikariCP"                     % "2.6.1",
+  "com.typesafe"                    %  "config"                       % "1.3.1",
+  "com.typesafe.akka"               %% "akka-actor"                   % "2.5.0",
   "fr.brouillard.oss.security.xhub" %  "xhub4j-core"                  % "1.0.0",
   "com.github.bkromhout"            %  "java-diff-utils"              % "2.1.1",
   "org.cache2k"                     %  "cache2k-all"                  % "1.0.0.CR1",
@@ -54,13 +54,13 @@ libraryDependencies ++= Seq(
   "javax.servlet"                   %  "javax.servlet-api"            % "3.1.0"          % "provided",
   "junit"                           %  "junit"                        % "4.12"           % "test",
   "org.scalatra"                    %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.mockito"                     %  "mockito-core"                 % "2.7.16"         % "test",
+  "org.mockito"                     %  "mockito-core"                 % "2.7.22"         % "test",
   "com.wix"                         %  "wix-embedded-mysql"           % "2.1.4"          % "test",
-  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "1.14"           % "test"
+  "ru.yandex.qatools.embed"         %  "postgresql-embedded"          % "2.0"            % "test"
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps")
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
 javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 

doc/how_to_run.md

@@ -1,6 +1,12 @@
 How to run from the source tree
 ========
 
+Install [sbt](http://www.scala-sbt.org/index.html) at first.
+
+```
+$ brew install sbt
+```
+
 Run for Development
 --------
 

doc/notification.md

@@ -17,6 +17,7 @@ When the ```CLOSED``` column value is updated, GitBucket does the notification.
 Notified users are as follows:
 
 * individual repository's owner
+* group members of group repository
 * collaborators
 * participants
 

doc/release.md

@@ -34,8 +34,6 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 Generate release files
 --------
 
-Note: Release operation requires [Ant](http://ant.apache.org/) and [Maven](https://maven.apache.org/).
-
 ### Make release war file
 
 Run `sbt executable`. The release war file and fingerprint are generated into `target/executable/gitbucket.war`.
@@ -52,4 +50,12 @@ For plug-in development, we have to publish the GitBucket jar file to the Maven
 $ sbt publish-signed
 ```
 
-Then operate release sequence at https://oss.sonatype.org/.
+Then logged-in https://oss.sonatype.org/ and delete following files from the staging repository:
+
+- gitbucket_2.12-x.x.x.war
+- gitbucket_2.12-x.x.x.war.asc
+- gitbucket_2.12-x.x.x.war.asc.md5
+- gitbucket_2.12-x.x.x.war.asc.sha1
+- gitbucket_2.12-x.x.x.war.md5
+
+At last, close and release the repository.

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.15

sbt.bat

@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.12.jar" %*

sbt.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.12.jar "$@"

src/main/java/JettyLauncher.java

@@ -1,4 +1,9 @@
+import org.eclipse.jetty.server.ConnectionFactory;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.StatisticsHandler;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
@@ -34,6 +39,9 @@ public class JettyLauncher {
                                 contextPath = "/" + contextPath;
                             }
                             break;
+                        case "--max_file_size":
+                            System.setProperty("gitbucket.maxFileSize", dim[2]);
+                            break;
                         case "--gitbucket.home":
                             System.setProperty("gitbucket.home", dim[1]);
                             break;
@@ -62,6 +70,15 @@ public class JettyLauncher {
 //        connector.setPort(port);
 //        server.addConnector(connector);
 
+        // Disabling Server header
+        for (Connector connector : server.getConnectors()) {
+            for (ConnectionFactory factory : connector.getConnectionFactories()) {
+                if (factory instanceof HttpConnectionFactory) {
+                    ((HttpConnectionFactory) factory).getHttpConfiguration().setSendServerVersion(false);
+                }
+            }
+        }
+
         WebAppContext context = new WebAppContext();
 
         File tmpDir;
@@ -82,6 +99,9 @@ public class JettyLauncher {
         }
         context.setTempDirectory(tmpDir);
 
+        // Disabling the directory listing feature.
+        context.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
+
         ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
         URL location = domain.getCodeSource().getLocation();
 
@@ -93,7 +113,9 @@ public class JettyLauncher {
             context.setInitParameter("org.scalatra.ForceHttps", "true");
         }
 
-        server.setHandler(context);
+        Handler handler = addStatisticsHandler(context);
+
+        server.setHandler(handler);
         server.setStopAtShutdown(true);
         server.setStopTimeout(7_000);
         server.start();
@@ -112,14 +134,11 @@ public class JettyLauncher {
         return new File(System.getProperty("user.home"), ".gitbucket");
     }
 
-    private static void deleteDirectory(File dir){
-        for(File file: dir.listFiles()){
-            if(file.isFile()){
-                file.delete();
-            } else if(file.isDirectory()){
-                deleteDirectory(file);
-            }
-        }
-        dir.delete();
+    private static Handler addStatisticsHandler(Handler handler) {
+        // The graceful shutdown is implemented via the statistics handler.
+        // See the following: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420142
+        final StatisticsHandler statisticsHandler = new StatisticsHandler();
+        statisticsHandler.setHandler(handler);
+        return statisticsHandler;
     }
 }

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

@@ -0,0 +1,26 @@
+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,
+   COALESCE(D.ORDERING, 9999) AS PRIORITY
+
+ 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)
+
+ LEFT OUTER JOIN PRIORITY D
+ ON (A.PRIORITY_ID = D.PRIORITY_ID);

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="PRIORITY">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="PRIORITY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="PRIORITY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="DESCRIPTION" type="varchar(255)" nullable="true"/>
+    <column name="ORDERING" type="int" nullable="false"/>
+    <column name="IS_DEFAULT" type="boolean" nullable="false"/>
+    <column name="COLOR" type="char(6)" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_PRIORITY_PK" tableName="PRIORITY" columnNames="USER_NAME, REPOSITORY_NAME, PRIORITY_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_PRIORITY_FK0" baseTableName="PRIORITY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+
+  <addColumn tableName="ISSUE">
+    <column name="PRIORITY_ID" type="int" nullable="true" />
+  </addColumn>
+
+  <addForeignKeyConstraint constraintName="IDX_ISSUE_FK3" baseTableName="ISSUE" baseColumnNames="PRIORITY_ID" referencedTableName="PRIORITY" referencedColumnNames="PRIORITY_ID"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK">
+    <column name="USER_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_ACCOUNT_WEB_HOOK_PK" tableName="ACCOUNT_WEB_HOOK" columnNames="USER_NAME, URL"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_WEB_HOOK_FK0" baseTableName="ACCOUNT_WEB_HOOK" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK_EVENT">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="EVENT" type="varchar(30)" nullable="false"/>
+  </createTable>
+</changeSet>

src/main/scala/ScalatraBootstrap.scala

@@ -44,6 +44,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     context.mount(new RepositoryViewerController, "/*")
     context.mount(new WikiController, "/*")
     context.mount(new LabelsController, "/*")
+    context.mount(new PrioritiesController, "/*")
     context.mount(new MilestonesController, "/*")
     context.mount(new IssuesController, "/*")
     context.mount(new PullRequestsController, "/*")

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

@@ -32,5 +32,11 @@ object GitBucketCoreModule extends Module("gitbucket-core",
   new Version("4.11.0",
     new LiquibaseMigration("update/gitbucket-core_4.11.xml")
   ),
-  new Version("4.12.0")
+  new Version("4.12.0"),
+  new Version("4.12.1"),
+  new Version("4.13.0"),
+  new Version("4.14.0",
+    new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
+    new SqlMigration("update/gitbucket-core_4.14.sql")
+  )
 )

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

@@ -37,7 +37,7 @@ object ApiRepository{
       name           = repository.repositoryName,
       full_name      = s"${repository.userName}/${repository.repositoryName}",
       description    = repository.description.getOrElse(""),
-      watchers       = 0,
+      watchers       = watchers,
       forks          = forkedCount,
       `private`      = repository.isPrivate,
       default_branch = repository.defaultBranch,
@@ -53,4 +53,14 @@ object ApiRepository{
   def forPushPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
     ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount, urlIsHtmlUrl=true)
 
+  def forDummyPayload(owner: ApiUser): ApiRepository =
+    ApiRepository(
+      name="dummy",
+      full_name=s"${owner.login}/dummy",
+      description="",
+      watchers=0,
+      forks=0,
+      `private`=false,
+      default_branch="master",
+      owner=owner)(true)
 }

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

@@ -2,9 +2,10 @@ package gitbucket.core.controller
 
 import gitbucket.core.account.html
 import gitbucket.core.helper
-import gitbucket.core.model.{GroupMember, Role}
+import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, RepositoryWebHookEvent, Role, WebHook, WebHookContentType}
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service._
+import gitbucket.core.service.WebHookService._
 import gitbucket.core.ssh.SshUtil
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
@@ -16,17 +17,16 @@ import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.scalatra.BadRequest
 
-
 class AccountController extends AccountControllerBase
   with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
   with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-  with AccessTokenService with WebHookService with RepositoryCreationService
+  with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService
 
 
 trait AccountControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
     with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
-    with AccessTokenService with WebHookService with RepositoryCreationService =>
+    with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService =>
 
   case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
                             description: Option[String], url: Option[String], fileId: Option[String])
@@ -40,7 +40,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   val newForm = mapping(
     "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
+    "password"    -> trim(label("Password"     , text(required, maxlength(20), password))),
     "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
     "description" -> trim(label("bio"          , optional(text()))),
@@ -49,7 +49,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   )(AccountNewForm.apply)
 
   val editForm = mapping(
-    "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
+    "password"    -> trim(label("Password"     , optional(text(maxlength(20), password)))),
     "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
     "description" -> trim(label("bio"          , optional(text()))),
@@ -109,6 +109,47 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "account" -> trim(label("Group/User name", text(required, validAccountName)))
   )(AccountForm.apply)
 
+  // for account web hook url addition.
+  case class AccountWebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
+
+  def accountWebHookForm(update:Boolean) = mapping(
+    "url"    -> trim(label("url", text(required, accountWebHook(update)))),
+    "events" -> accountWebhookEvents,
+    "ctype" -> label("ctype", text()),
+    "token" -> optional(trim(label("token", text(maxlength(100)))))
+  )(
+    (url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+  )
+  /**
+    * Provides duplication check for web hook url. duplicated from RepositorySettingsController.scala
+    */
+  private def accountWebHook(needExists: Boolean): Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(getAccountWebHook(params("userName"), value).isDefined != needExists){
+        Some(if(needExists){
+          "URL had not been registered yet."
+        } else {
+          "URL had been registered already."
+        })
+      } else {
+        None
+      }
+  }
+
+  private def accountWebhookEvents = new ValueType[Set[WebHook.Event]]{
+    def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
+      WebHook.Event.values.flatMap { t =>
+        params.get(name + "." + t.name).map(_ => t)
+      }.toSet
+    }
+    def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+      Seq(name -> messages("error.required").format(name))
+    } else {
+      Nil
+    }
+  }
+
+
   /**
    * Displays user information.
    */
@@ -206,9 +247,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
 //        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
 //      }
-//      // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+        // Remove from GROUP_MEMBER and COLLABORATOR
         removeUserRelatedData(userName)
         updateAccount(account.copy(isRemoved = true))
+
+        // call hooks
+        PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
         session.invalidate
         redirect("/")
       }
@@ -269,6 +314,113 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     redirect(s"/${userName}/_application")
   })
 
+  get("/:userName/_hooks")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { account =>
+      gitbucket.core.account.html.hooks(account, getAccountWebHooks(account.userName), flash.get("info"))
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Display the account web hook edit page.
+   */
+  get("/:userName/_hooks/new")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { account =>
+      val webhook = AccountWebHook(userName, "", WebHookContentType.FORM, None)
+      html.edithook(webhook, Set(WebHook.Push), account, true)
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Add the account web hook URL.
+   */
+  post("/:userName/_hooks/new", accountWebHookForm(false))(oneselfOnly { form =>
+    val userName = params("userName")
+    addAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
+    flash += "info" -> s"Webhook ${form.url} created"
+    redirect(s"/${userName}/_hooks")
+  })
+
+  /**
+   * Delete the account web hook URL.
+   */
+  get("/:userName/_hooks/delete")(oneselfOnly {
+    val userName = params("userName")
+    deleteAccountWebHook(userName, params("url"))
+    flash += "info" -> s"Webhook ${params("url")} deleted"
+    redirect(s"/${userName}/_hooks")
+  })
+
+  /**
+   * Display the account web hook edit page.
+   */
+  get("/:userName/_hooks/edit")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).flatMap { account =>
+      getAccountWebHook(userName, params("url")).map { case (webhook, events) =>
+        html.edithook(webhook, events, account, false)
+      }
+    } getOrElse NotFound()
+  })
+
+  /**
+   * Update account web hook settings.
+   */
+  post("/:userName/_hooks/edit", accountWebHookForm(true))(oneselfOnly { form =>
+    val userName = params("userName")
+    updateAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
+    flash += "info" -> s"webhook ${form.url} updated"
+    redirect(s"/${userName}/_hooks")
+  })
+
+  /**
+   * Send the test request to registered account web hook URLs.
+   */
+  ajaxPost("/:userName/_hooks/test")(oneselfOnly {
+    // TODO Is it possible to merge with [[RepositorySettingsController.ajaxPost]]?
+    import scala.concurrent.duration._
+    import scala.concurrent._
+    import scala.util.control.NonFatal
+    import org.apache.http.util.EntityUtils
+    import scala.concurrent.ExecutionContext.Implicits.global
+
+    def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h => Array(h.getName, h.getValue) }
+
+    val userName = params("userName")
+    val url = params("url")
+    val token = Some(params("token"))
+    val ctype = WebHookContentType.valueOf(params("ctype"))
+    val dummyWebHookInfo = RepositoryWebHook(userName, "dummy", url, ctype, token)
+    val dummyPayload = {
+      val ownerAccount = getAccountByUserName(userName).get
+      WebHookPushPayload.createDummyPayload(ownerAccount)
+    }
+
+    val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
+
+    val toErrorMap: PartialFunction[Throwable, Map[String,String]] = {
+      case e: java.net.UnknownHostException => Map("error"-> ("Unknown host " + e.getMessage))
+      case e: java.lang.IllegalArgumentException => Map("error"-> ("invalid url"))
+      case e: org.apache.http.client.ClientProtocolException => Map("error"-> ("invalid url"))
+      case NonFatal(e) => Map("error"-> (e.getClass + " "+ e.getMessage))
+    }
+
+    contentType = formats("json")
+    org.json4s.jackson.Serialization.write(Map(
+      "url" -> url,
+      "request" -> Await.result(reqFuture.map(req => Map(
+        "headers" -> _headers(req.getAllHeaders),
+        "payload" -> json
+      )).recover(toErrorMap), 20 seconds),
+      "response" -> Await.result(resFuture.map(res => Map(
+        "status"  -> res.getStatusLine(),
+        "body"    -> EntityUtils.toString(res.getEntity()),
+        "headers" -> _headers(res.getAllHeaders())
+      )).recover(toErrorMap), 20 seconds)
+    ))
+  })
+
   get("/register"){
     if(context.settings.allowAccountRegistration){
       if(context.loginAccount.isDefined){
@@ -288,7 +440,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   }
 
   get("/groups/new")(usersOnly {
-    html.group(None, List(GroupMember("", context.loginAccount.get.userName, true)))
+    html.creategroup(List(GroupMember("", context.loginAccount.get.userName, true)))
   })
 
   post("/groups/new", newGroupForm)(usersOnly { form =>
@@ -304,7 +456,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 
   get("/:groupName/_editgroup")(managersOnly {
     defining(params("groupName")){ groupName =>
-      html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+      // TODO Don't use Option.get
+      getAccountByUserName(groupName, true).map { account =>
+        html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
+      } getOrElse NotFound()
     }
   })
 
@@ -312,13 +467,17 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     defining(params("groupName")){ groupName =>
       // Remove from GROUP_MEMBER
       updateGroupMembers(groupName, Nil)
-      // Remove repositories
-      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
-        deleteRepository(groupName, repositoryName)
-        FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
-        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
-        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+      // Disable group
+      getAccountByUserName(groupName, false).foreach { account =>
+        updateGroup(groupName, account.description, account.url, true)
       }
+//      // Remove repositories
+//      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
+//        deleteRepository(groupName, repositoryName)
+//        FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+//        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+//        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+//      }
     }
     redirect("/")
   })
@@ -343,7 +502,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        }
 
         updateImage(form.groupName, form.fileId, form.clearImage)
-        redirect(s"/${form.groupName}")
+
+        flash += "info" -> "Account information has been updated."
+        redirect(s"/${groupName}/_editgroup")
 
       } getOrElse NotFound()
     }
@@ -444,6 +605,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             getWikiRepositoryDir(repository.owner, repository.name),
             getWikiRepositoryDir(accountName, repository.name))
 
+          // Copy files
+          FileUtils.copyDirectory(
+            Directory.getRepositoryFilesDir(repository.owner, repository.name),
+            Directory.getRepositoryFilesDir(accountName, repository.name)
+          )
+
           // Record activity
           recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
 

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

@@ -33,6 +33,7 @@ class ApiController extends ApiControllerBase
   with WebHookIssueCommentService
   with WikiService
   with ActivityService
+  with PrioritiesService
   with OwnerAuthenticator
   with UsersAuthenticator
   with GroupManagerAuthenticator
@@ -52,6 +53,7 @@ trait ApiControllerBase extends ControllerBase {
     with RepositoryCreationService
     with IssueCreationService
     with HandleCommentService
+    with PrioritiesService
     with OwnerAuthenticator
     with UsersAuthenticator
     with GroupManagerAuthenticator
@@ -365,6 +367,7 @@ trait ApiControllerBase extends ControllerBase {
           data.body,
           data.assignees.headOption,
           milestone.map(_.milestoneId),
+          None,
           data.labels,
           loginAccount)
         JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(loginAccount)))

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

@@ -147,6 +147,13 @@ abstract class ControllerBase extends ScalatraFilter
       }
     }
 
+  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
+                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
+                   absolutize: Boolean = true, withSessionId: Boolean = true)
+                  (implicit request: HttpServletRequest, response: HttpServletResponse): String =
+    if (path.startsWith("http")) path
+    else baseUrl + super.url(path, params, false, false, false)
+
   /**
    * Extends scalatra-form's trim rule to eliminate CR and LF.
    */

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

@@ -22,7 +22,12 @@ import org.apache.commons.io.{FileUtils, IOUtils}
  */
 class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
 
-  configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
+  val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
+    System.getProperty("gitbucket.maxFileSize").toLong
+  else
+    3 * 1024 * 1024
+
+  configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize)))
 
   post("/image"){
     execute({ (file, fileId) =>
@@ -31,6 +36,13 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
     }, FileUtil.isImage)
   }
 
+  post("/tmp"){
+    execute({ (file, fileId) =>
+      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+      session += Keys.Session.Upload(fileId) -> file.name
+    }, _ => true)
+  }
+
   post("/file/:owner/:repository"){
     execute({ (file, fileId) =>
       FileUtils.writeByteArrayToFile(new java.io.File(

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

@@ -27,6 +27,7 @@ class IssuesController extends IssuesControllerBase
   with PullRequestService
   with WebHookIssueCommentService
   with CommitsService
+  with PrioritiesService
 
 trait IssuesControllerBase extends ControllerBase {
   self: IssuesService
@@ -41,10 +42,11 @@ trait IssuesControllerBase extends ControllerBase {
     with ReferrerAuthenticator
     with WritableUsersAuthenticator
     with PullRequestService
-    with WebHookIssueCommentService =>
+    with WebHookIssueCommentService
+    with PrioritiesService =>
 
   case class IssueCreateForm(title: String, content: Option[String],
-    assignedUserName: Option[String], milestoneId: Option[Int], labelNames: Option[String])
+    assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Option[String])
   case class CommentForm(issueId: Int, content: String)
   case class IssueStateForm(issueId: Int, content: Option[String])
 
@@ -53,6 +55,7 @@ trait IssuesControllerBase extends ControllerBase {
       "content"          -> trim(optional(text())),
       "assignedUserName" -> trim(optional(text())),
       "milestoneId"      -> trim(optional(number())),
+      "priorityId"       -> trim(optional(number())),
       "labelNames"       -> trim(optional(text()))
     )(IssueCreateForm.apply)
 
@@ -76,7 +79,7 @@ trait IssuesControllerBase extends ControllerBase {
   get("/:owner/:repository/issues")(referrersOnly { repository =>
     val q = request.getParameter("q")
     if(Option(q).exists(_.contains("is:pr"))){
-      redirect(s"/${repository.owner}/${repository.name}/pulls?q=" + StringUtil.urlEncode(q))
+      redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
     } else {
       searchIssues(repository)
     }
@@ -84,17 +87,22 @@ trait IssuesControllerBase extends ControllerBase {
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
     defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
-      getIssue(owner, name, issueId) map {
+      getIssue(owner, name, issueId) map { issue =>
+        if(issue.isPullRequest){
+          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        } else {
           html.issue(
-          _,
+            issue,
             getComments(owner, name, issueId.toInt),
             getIssueLabels(owner, name, issueId.toInt),
             getAssignableUserNames(owner, name),
             getMilestonesWithIssueCount(owner, name),
+            getPriorities(owner, name),
             getLabels(owner, name),
             isIssueEditable(repository),
             isIssueManageable(repository),
             repository)
+        }
       } getOrElse NotFound()
     }
   })
@@ -105,6 +113,8 @@ trait IssuesControllerBase extends ControllerBase {
         html.create(
           getAssignableUserNames(owner, name),
           getMilestones(owner, name),
+          getPriorities(owner, name),
+          getDefaultPriority(owner, name),
           getLabels(owner, name),
           isIssueManageable(repository),
           getContentTemplate(repository, "ISSUE_TEMPLATE"),
@@ -121,6 +131,7 @@ trait IssuesControllerBase extends ControllerBase {
         form.content,
         form.assignedUserName,
         form.milestoneId,
+        form.priorityId,
         form.labelNames.toArray.flatMap(_.split(",")),
         context.loginAccount.get)
 
@@ -287,6 +298,11 @@ trait IssuesControllerBase extends ControllerBase {
     } getOrElse Ok()
   })
 
+  ajaxPost("/:owner/:repository/issues/:id/priority")(writableUsersOnly { repository =>
+    updatePriorityId(repository.owner, repository.name, params("id").toInt, priorityId("priorityId"))
+    Ok("updated")
+  })
+
   post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
     defining(params.get("value")){ action =>
       action match {
@@ -331,6 +347,14 @@ trait IssuesControllerBase extends ControllerBase {
     }
   })
 
+  post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
+    defining(priorityId("value")){ value =>
+      executeBatch(repository) {
+        updatePriorityId(repository.owner, repository.name, _, value)
+      }
+    }
+  })
+
   get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
     (Directory.getAttachedDir(repository.owner, repository.name) match {
       case dir if(dir.exists && dir.isDirectory) =>
@@ -344,6 +368,7 @@ trait IssuesControllerBase extends ControllerBase {
 
   val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
   val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+  val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
   private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
     params("checked").split(',') map(_.toInt) foreach execute
@@ -366,6 +391,7 @@ trait IssuesControllerBase extends ControllerBase {
           page,
           getAssignableUserNames(owner, repoName),
           getMilestones(owner, repoName),
+          getPriorities(owner, repoName),
           getLabels(owner, repoName),
           countIssue(condition.copy(state = "open"  ), false, owner -> repoName),
           countIssue(condition.copy(state = "closed"), false, owner -> repoName),

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

@@ -0,0 +1,111 @@
+package gitbucket.core.controller
+
+import gitbucket.core.issues.priorities.html
+import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, PrioritiesService}
+import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.util.Implicits._
+import io.github.gitbucket.scalatra.forms._
+import org.scalatra.i18n.Messages
+import org.scalatra.Ok
+
+class PrioritiesController extends PrioritiesControllerBase
+  with PrioritiesService with IssuesService with RepositoryService with AccountService
+with ReferrerAuthenticator with WritableUsersAuthenticator
+
+trait PrioritiesControllerBase extends ControllerBase {
+  self: PrioritiesService with IssuesService with RepositoryService
+    with ReferrerAuthenticator with WritableUsersAuthenticator =>
+
+  case class PriorityForm(priorityName: String, description: Option[String], color: String)
+
+  val priorityForm = mapping(
+    "priorityName"  -> trim(label("Priority name", text(required, priorityName, uniquePriorityName, maxlength(100)))),
+    "description"   -> trim(label("Description", optional(text(maxlength(255))))),
+    "priorityColor" -> trim(label("Color", text(required, color)))
+  )(PriorityForm.apply)
+
+
+  get("/:owner/:repository/issues/priorities")(referrersOnly { repository =>
+    html.list(
+      getPriorities(repository.owner, repository.name),
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      repository,
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+  })
+
+  ajaxGet("/:owner/:repository/issues/priorities/new")(writableUsersOnly { repository =>
+    html.edit(None, repository)
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/new", priorityForm)(writableUsersOnly { (form, repository) =>
+    val priorityId = createPriority(repository.owner, repository.name, form.priorityName, form.description, form.color.substring(1))
+    html.priority(
+      getPriority(repository.owner, repository.name, priorityId).get,
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      repository,
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+  })
+
+  ajaxGet("/:owner/:repository/issues/priorities/:priorityId/edit")(writableUsersOnly { repository =>
+    getPriority(repository.owner, repository.name, params("priorityId").toInt).map { priority =>
+      html.edit(Some(priority), repository)
+    } getOrElse NotFound()
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/:priorityId/edit", priorityForm)(writableUsersOnly { (form, repository) =>
+    updatePriority(repository.owner, repository.name, params("priorityId").toInt, form.priorityName, form.description, form.color.substring(1))
+    html.priority(
+      getPriority(repository.owner, repository.name, params("priorityId").toInt).get,
+      countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+      repository,
+      hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/reorder")(writableUsersOnly { (repository) =>
+    reorderPriorities(repository.owner, repository.name, params("order")
+      .split(",")
+      .map(id => id.toInt)
+      .zipWithIndex
+      .toMap)
+
+    Ok()
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/default")(writableUsersOnly { (repository) =>
+    setDefaultPriority(repository.owner, repository.name, priorityId("priorityId"))
+    Ok()
+  })
+
+  ajaxPost("/:owner/:repository/issues/priorities/:priorityId/delete")(writableUsersOnly { repository =>
+    deletePriority(repository.owner, repository.name, params("priorityId").toInt)
+    Ok()
+  })
+
+  val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+
+  /**
+   * Constraint for the identifier such as user name, repository name or page name.
+   */
+  private def priorityName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(value.contains(',')){
+        Some(s"${name} contains invalid character.")
+      } else if(value.startsWith("_") || value.startsWith("-")){
+        Some(s"${name} starts with invalid character.")
+      } else {
+        None
+      }
+  }
+
+  private def uniquePriorityName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+      val owner = params("owner")
+      val repository = params("repository")
+      params.get("priorityId").map { priorityId =>
+        getPriority(owner, repository, value).filter(_.priorityId != priorityId.toInt).map(_ => "Name has already been taken.")
+      }.getOrElse {
+        getPriority(owner, repository, value).map(_ => "Name has already been taken.")
+      }
+    }
+  }
+}

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

@@ -1,6 +1,7 @@
 package gitbucket.core.controller
 
 import gitbucket.core.model.WebHook
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.MergeService
@@ -23,14 +24,14 @@ class PullRequestsController extends PullRequestsControllerBase
   with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
   with CommitsService with ActivityService with WebHookPullRequestService
   with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
-  with CommitStatusService with MergeService with ProtectedBranchService
+  with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService
 
 
 trait PullRequestsControllerBase extends ControllerBase {
   self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
     with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService
     with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
-    with CommitStatusService with MergeService with ProtectedBranchService =>
+    with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService =>
 
   val pullRequestForm = mapping(
     "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
@@ -44,6 +45,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     "commitIdTo"            -> trim(text(required, maxlength(40))),
     "assignedUserName"      -> trim(optional(text())),
     "milestoneId"           -> trim(optional(number())),
+    "priorityId"            -> trim(optional(number())),
     "labelNames"            -> trim(optional(text()))
   )(PullRequestForm.apply)
 
@@ -63,6 +65,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     commitIdTo: String,
     assignedUserName: Option[String],
     milestoneId: Option[Int],
+    priorityId: Option[Int],
     labelNames: Option[String]
   )
 
@@ -92,12 +95,15 @@ trait PullRequestsControllerBase extends ControllerBase {
             getIssueLabels(owner, name, issueId),
             getAssignableUserNames(owner, name),
             getMilestonesWithIssueCount(owner, name),
+            getPriorities(owner, name),
             getLabels(owner, name),
             commits,
             diffs,
             isEditable(repository),
             isManageable(repository),
+            hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
             repository,
+            getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
             flash.toMap.map(f => f._1 -> f._2.toString))
         }
       }
@@ -138,22 +144,36 @@ trait PullRequestsControllerBase extends ControllerBase {
     } getOrElse NotFound()
   })
 
-  get("/:owner/:repository/pull/:id/delete/*")(writableUsersOnly { repository =>
-    params("id").toIntOpt.map { issueId =>
-      val branchName = multiParams("splat").head
+  get("/:owner/:repository/pull/:id/delete_branch")(readableUsersOnly { baseRepository =>
+    (for {
+      issueId <- params("id").toIntOpt
+      loginAccount <- context.loginAccount
+      (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
+      owner = pullreq.requestUserName
+      name  = pullreq.requestRepositoryName
+      if hasDeveloperRole(owner, name, context.loginAccount)
+    } yield {
+      val repository = getRepository(owner, name).get
+      val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
+      if(branchProtection.enabled){
+        flash += "error" -> s"branch ${pullreq.requestBranch} is protected."
+      } else {
+        if(repository.repository.defaultBranch != pullreq.requestBranch){
           val userName = context.loginAccount.get.userName
-      if(repository.repository.defaultBranch != branchName){
           using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-          git.branchDelete().setForce(true).setBranchNames(branchName).call()
-          recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+            git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call()
+            recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch)
+          }
+          createComment(baseRepository.owner, baseRepository.name, userName, issueId, pullreq.requestBranch, "delete_branch")
+        } else {
+          flash += "error" -> s"""Can't delete the default branch "${pullreq.requestBranch}"."""
         }
       }
-      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-    } getOrElse NotFound()
+      redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
+    }) getOrElse NotFound()
   })
 
-  post("/:owner/:repository/pull/:id/update_branch")(writableUsersOnly { baseRepository =>
+  post("/:owner/:repository/pull/:id/update_branch")(readableUsersOnly { baseRepository =>
     (for {
       issueId <- params("id").toIntOpt
       loginAccount <- context.loginAccount
@@ -217,7 +237,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           }
         }
       }
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+      redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
 
     }) getOrElse NotFound()
   })
@@ -261,10 +281,8 @@ trait PullRequestsControllerBase extends ControllerBase {
             // call web hook
             callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
 
-            // notifications
-            Notifier().toNotify(repository, issue, "merge"){
-              Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
-            }
+            // call hooks
+            PluginRegistry().getPullRequestHooks.foreach(_.merged(issue, repository))
 
             redirect(s"/${owner}/${name}/pull/${issueId}")
           }
@@ -359,10 +377,10 @@ trait PullRequestsControllerBase extends ControllerBase {
               title,
               commits,
               diffs,
-              (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+              ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
                 case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
                 case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
-              },
+              }).filter { case (owner, name) => hasGuestRole(owner, name, context.loginAccount) },
               commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList,
               originId,
               forkedId,
@@ -375,6 +393,7 @@ trait PullRequestsControllerBase extends ControllerBase {
               hasDeveloperRole(originRepository.owner, originRepository.name, context.loginAccount),
               getAssignableUserNames(originRepository.owner, originRepository.name),
               getMilestones(originRepository.owner, originRepository.name),
+              getPriorities(originRepository.owner, originRepository.name),
               getLabels(originRepository.owner, originRepository.name)
             )
           }
@@ -430,6 +449,7 @@ trait PullRequestsControllerBase extends ControllerBase {
         content = form.content,
         assignedUserName = if (manageable) form.assignedUserName else None,
         milestoneId = if (manageable) form.milestoneId else None,
+        priorityId = if (manageable) form.priorityId else None,
         isPullRequest = true)
 
       createPullRequest(
@@ -468,10 +488,8 @@ trait PullRequestsControllerBase extends ControllerBase {
         // extract references and create refer comment
         createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)
 
-        // notifications
-        Notifier().toNotify(repository, issue, form.content.getOrElse("")) {
-          Notifier.msgPullRequest(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
-        }
+        // call hooks
+        PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
       }
 
       redirect(s"/${owner}/${name}/pull/${issueId}")
@@ -505,6 +523,7 @@ trait PullRequestsControllerBase extends ControllerBase {
         page,
         getAssignableUserNames(owner, repoName),
         getMilestones(owner, repoName),
+        getPriorities(owner, repoName),
         getLabels(owner, repoName),
         countIssue(condition.copy(state = "open"  ), true, owner -> repoName),
         countIssue(condition.copy(state = "closed"), true, owner -> repoName),

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

@@ -1,7 +1,7 @@
 package gitbucket.core.controller
 
 import gitbucket.core.settings.html
-import gitbucket.core.model.WebHook
+import gitbucket.core.model.{WebHook, RepositoryWebHook}
 import gitbucket.core.service._
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.util._
@@ -133,21 +133,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
           FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
         }
       }
-      // Move lfs directory
-      defining(getLfsDir(repository.owner, repository.name)){ dir =>
+      // Move files directory
+      defining(getRepositoryFilesDir(repository.owner, repository.name)){ dir =>
         if(dir.isDirectory) {
-          FileUtils.moveDirectory(dir, getLfsDir(repository.owner, form.repositoryName))
+          FileUtils.moveDirectory(dir, getRepositoryFilesDir(repository.owner, form.repositoryName))
         }
       }
-      // Move attached directory
-      defining(getAttachedDir(repository.owner, repository.name)){ dir =>
-        if(dir.isDirectory) {
-          FileUtils.moveDirectory(dir, getAttachedDir(repository.owner, form.repositoryName))
-        }
-      }
-      // Delete parent directory
-      FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
-
       // Call hooks
       PluginRegistry().getRepositoryHooks.foreach(_.renamed(repository.owner, repository.name, form.repositoryName))
     }
@@ -221,8 +212,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    * Display the web hook edit page.
    */
   get("/:owner/:repository/settings/hooks/new")(ownerOnly { repository =>
-    val webhook = WebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
-    html.edithooks(webhook, Set(WebHook.Push), repository, flash.get("info"), true)
+    val webhook = RepositoryWebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
+    html.edithook(webhook, Set(WebHook.Push), repository, true)
   })
 
   /**
@@ -260,7 +251,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
       val url = params("url")
       val token = Some(params("token"))
       val ctype = WebHookContentType.valueOf(params("ctype"))
-      val dummyWebHookInfo = WebHook(repository.owner, repository.name, url, ctype, token)
+      val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
       val dummyPayload = {
         val ownerAccount = getAccountByUserName(repository.owner).get
         val commits = if(JGitUtil.isEmpty(git)) List.empty else git.log
@@ -297,7 +288,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
           "headers" -> _headers(req.getAllHeaders),
           "payload" -> json
         )).recover(toErrorMap), 20 seconds),
-        "responce" -> Await.result(resFuture.map(res => Map(
+        "response" -> Await.result(resFuture.map(res => Map(
           "status"  -> res.getStatusLine(),
           "body"    -> EntityUtils.toString(res.getEntity()),
           "headers" -> _headers(res.getAllHeaders())
@@ -311,7 +302,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
     getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
-      html.edithooks(webhook, events, repository, flash.get("info"), false)
+      html.edithook(webhook, events, repository, false)
     } getOrElse NotFound()
   })
 

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

@@ -1,6 +1,6 @@
 package gitbucket.core.controller
 
-import java.io.FileInputStream
+import java.io.File
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 
 import gitbucket.core.plugin.PluginRegistry
@@ -18,15 +18,14 @@ import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers
 import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.io.IOUtils
+import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.{ArchiveCommand, Git}
 import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
-import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib._
-import org.eclipse.jgit.revwalk.RevCommit
-import org.eclipse.jgit.treewalk._
 import org.scalatra._
+import org.scalatra.i18n.Messages
 
 
 class RepositoryViewerController extends RepositoryViewerControllerBase
@@ -45,6 +44,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ArchiveCommand.registerFormat("zip", new ZipFormat)
   ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
 
+  case class UploadForm(
+    branch: String,
+    path: String,
+    uploadFiles: String,
+    message: Option[String]
+  )
+
   case class EditorForm(
     branch: String,
     path: String,
@@ -53,14 +59,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     charset: String,
     lineSeparator: String,
     newFileName: String,
-    oldFileName: Option[String]
+    oldFileName: Option[String],
+    commit: String
   )
 
   case class DeleteForm(
     branch: String,
     path: String,
     message: Option[String],
-    fileName: String
+    fileName: String,
+    commit: String
   )
 
   case class CommentForm(
@@ -71,6 +79,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     issueId: Option[Int]
   )
 
+  val uploadForm = mapping(
+    "branch"        -> trim(label("Branch", text(required))),
+    "path"          -> trim(label("Path", text())),
+    "uploadFiles"   -> trim(label("Upload files", text(required))),
+    "message"       -> trim(label("Message", optional(text()))),
+  )(UploadForm.apply)
+
   val editorForm = mapping(
     "branch"        -> trim(label("Branch", text(required))),
     "path"          -> trim(label("Path", text())),
@@ -79,14 +94,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "charset"       -> trim(label("Charset", text(required))),
     "lineSeparator" -> trim(label("Line Separator", text(required))),
     "newFileName"   -> trim(label("Filename", text(required))),
-    "oldFileName"   -> trim(label("Old filename", optional(text())))
+    "oldFileName"   -> trim(label("Old filename", optional(text()))),
+    "commit"        -> trim(label("Commit", text(required, conflict)))
   )(EditorForm.apply)
 
   val deleteForm = mapping(
     "branch"   -> trim(label("Branch", text(required))),
     "path"     -> trim(label("Path", text())),
     "message"  -> trim(label("Message", optional(text()))),
-    "fileName" -> trim(label("Filename", text(required)))
+    "fileName" -> trim(label("Filename", text(required))),
+    "commit"   -> trim(label("Commit", text(required, conflict)))
   )(DeleteForm.apply)
 
   val commentForm = mapping(
@@ -172,11 +189,50 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository/new/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
     val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
-    html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
-      None, JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
-      protectedBranch)
+
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      html.editor(
+        branch          = branch,
+        repository      = repository,
+        pathList        = if (path.length == 0) Nil else path.split("/").toList,
+        fileName        = None,
+        content         = JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
+        protectedBranch = protectedBranch,
+        commit          = revCommit.getName
+      )
+    }
   })
 
+  get("/:owner/:repository/upload/*")(writableUsersOnly { repository =>
+    val (branch, path) = repository.splitPath(multiParams("splat").head)
+    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
+    html.upload(branch, repository, if(path.length == 0) Nil else path.split("/").toList, protectedBranch)
+  })
+
+  post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
+    val files = form.uploadFiles.split("\n").map { line =>
+      val i = line.indexOf(":")
+      CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
+    }
+
+    commitFiles(
+      repository = repository,
+      branch     = form.branch,
+      path       = form.path,
+      files      = files,
+      message    = form.message.getOrElse(s"Add files via upload")
+    )
+
+    if(form.path.length == 0){
+      redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
+    } else {
+      redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
+    }
+  })
+
+
   get("/:owner/:repository/edit/*")(writableUsersOnly { repository =>
     val (branch, path) = repository.splitPath(multiParams("splat").head)
     val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
@@ -186,9 +242,15 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
       getPathObjectId(git, path, revCommit).map { objectId =>
         val paths = path.split("/")
-        html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
-          JGitUtil.getContentInfo(git, path, objectId),
-          protectedBranch)
+        html.editor(
+          branch          = branch,
+          repository      = repository,
+          pathList        = paths.take(paths.size - 1).toList,
+          fileName        = Some(paths.last),
+          content         = JGitUtil.getContentInfo(git, path, objectId),
+          protectedBranch = protectedBranch,
+          commit          = revCommit.getName
+        )
       } getOrElse NotFound()
     }
   })
@@ -200,8 +262,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
       getPathObjectId(git, path, revCommit).map { objectId =>
         val paths = path.split("/")
-        html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
-          JGitUtil.getContentInfo(git, path, objectId))
+        html.delete(
+          branch     = branch,
+          repository = repository,
+          pathList   = paths.take(paths.size - 1).toList,
+          fileName   = paths.last,
+          content    = JGitUtil.getContentInfo(git, path, objectId),
+          commit     = revCommit.getName
+        )
       } getOrElse NotFound()
     }
   })
@@ -215,7 +283,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       oldFileName = None,
       content     = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
       charset     = form.charset,
-      message     = form.message.getOrElse(s"Create ${form.newFileName}")
+      message     = form.message.getOrElse(s"Create ${form.newFileName}"),
+      commit      = form.commit
     )
 
     redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
@@ -232,21 +301,31 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       oldFileName = form.oldFileName,
       content     = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
       charset     = form.charset,
-      message     = if(form.oldFileName.contains(form.newFileName)){
+      message     = if (form.oldFileName.contains(form.newFileName)) {
         form.message.getOrElse(s"Update ${form.newFileName}")
       } else {
         form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
-      }
+      },
+      commit      = form.commit
     )
 
     redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
-      if(form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
+      if (form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
     }")
   })
 
   post("/:owner/:repository/remove", deleteForm)(writableUsersOnly { (form, repository) =>
-    commitFile(repository, form.branch, form.path, None, Some(form.fileName), "", "",
-      form.message.getOrElse(s"Delete ${form.fileName}"))
+    commitFile(
+      repository  = repository,
+      branch      = form.branch,
+      path        = form.path,
+      newFileName = None,
+      oldFileName = Some(form.fileName),
+      content     = "",
+      charset     = "",
+      message     = form.message.getOrElse(s"Delete ${form.fileName}"),
+      commit      = form.commit
+    )
 
     redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}${if(form.path.length == 0) "" else form.path}")
   })
@@ -275,12 +354,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           // Download (This route is left for backword compatibility)
           responseRawFile(git, objectId, path, repository)
         } else {
-          html.blob(id, repository, path.split("/").toList,
-            JGitUtil.getContentInfo(git, path, objectId),
-            new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
-            hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-            request.paths(2) == "blame",
-            isLfsFile(git, objectId))
+          html.blob(
+            branch             = id,
+            repository         = repository,
+            pathList           = path.split("/").toList,
+            content            = JGitUtil.getContentInfo(git, path, objectId),
+            latestCommit       = new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
+            hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+            isBlame            = request.paths(2) == "blame",
+            isLfsFile          = isLfsFile(git, objectId)
+          )
         }
       } getOrElse NotFound()
     }
@@ -547,6 +630,116 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   })
 
+  case class UploadFiles(branch: String, path: String, fileIds : Map[String,String], message: String) {
+    lazy val isValid: Boolean = fileIds.size > 0
+  }
+
+  case class CommitFile(id: String, name: String)
+
+  private def commitFiles(repository: RepositoryService.RepositoryInfo,
+                          files: Seq[CommitFile],
+                          branch: String, path: String, message: String) = {
+    // prepend path to the filename
+    val newFiles = files.map { file =>
+      file.copy(name = if(path.length == 0) file.name else s"${path}/${file.name}")
+    }
+
+    _commitFile(repository, branch, message) { case (git, headTip, builder, inserter) =>
+      JGitUtil.processTree(git, headTip) { (path, tree) =>
+        if(!newFiles.exists(_.name.contains(path))) {
+          builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+        }
+      }
+
+      newFiles.foreach { file =>
+        val bytes = FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), file.id))
+        builder.add(JGitUtil.createDirCacheEntry(file.name,
+          FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
+        builder.finish()
+      }
+    }
+  }
+
+  private def commitFile(repository: RepositoryService.RepositoryInfo,
+    branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
+    content: String, charset: String, message: String, commit: String) = {
+
+    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
+    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
+
+    _commitFile(repository, branch, message){ case (git, headTip, builder, inserter) =>
+      if(headTip.getName == commit){
+        val permission = JGitUtil.processTree(git, headTip) { (path, tree) =>
+          // Add all entries except the editing file
+          if (!newPath.contains(path) && !oldPath.contains(path)) {
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          }
+          // Retrieve permission if file exists to keep it
+          oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
+        }.flatten.headOption
+
+        newPath.foreach { newPath =>
+          builder.add(JGitUtil.createDirCacheEntry(newPath,
+            permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
+            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
+        }
+        builder.finish()
+      }
+    }
+  }
+
+  private def _commitFile(repository: RepositoryService.RepositoryInfo,
+    branch: String, message: String)(f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit) = {
+
+    LockUtil.lock(s"${repository.owner}/${repository.name}") {
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        val loginAccount = context.loginAccount.get
+        val builder = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headName = s"refs/heads/${branch}"
+        val headTip = git.getRepository.resolve(headName)
+
+        f(git, headTip, builder, inserter)
+
+        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+          headName, loginAccount.userName, loginAccount.mailAddress, message)
+
+        inserter.flush()
+        inserter.close()
+
+        // update refs
+        val refUpdate = git.getRepository.updateRef(headName)
+        refUpdate.setNewObjectId(commitId)
+        refUpdate.setForceUpdate(false)
+        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        refUpdate.update()
+
+        // update pull request
+        updatePullRequests(repository.owner, repository.name, branch)
+
+        // record activity
+        val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
+
+        // create issue comment by commit message
+        createIssueComment(repository.owner, repository.name, commitInfo)
+
+        // close issue by commit message
+        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+
+        //call web hook
+        callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
+        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        callWebHookOf(repository.owner, repository.name, WebHook.Push) {
+          getAccountByUserName(repository.owner).map{ ownerAccount =>
+            WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
+              oldId = headTip, newId = commitId)
+          }
+        }
+      }
+    }
+  }
+
   private val readmeFiles = PluginRegistry().renderableExtensions.map { extension =>
     s"readme.${extension}"
   } ++ Seq("readme.txt", "readme")
@@ -597,77 +790,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
 
-  private def commitFile(repository: RepositoryService.RepositoryInfo,
-                         branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
-                         content: String, charset: String, message: String) = {
-
-    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
-    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
-
-    LockUtil.lock(s"${repository.owner}/${repository.name}"){
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        val loginAccount = context.loginAccount.get
-        val builder  = DirCache.newInCore.builder()
-        val inserter = git.getRepository.newObjectInserter()
-        val headName = s"refs/heads/${branch}"
-        val headTip  = git.getRepository.resolve(headName)
-
-        val permission = JGitUtil.processTree(git, headTip){ (path, tree) =>
-          // Add all entries except the editing file
-          if(!newPath.contains(path) && !oldPath.contains(path)){
-            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-          }
-          // Retrieve permission if file exists to keep it
-          oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
-        }.flatten.headOption
-
-        newPath.foreach { newPath =>
-          builder.add(JGitUtil.createDirCacheEntry(newPath,
-            permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
-            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
-        }
-        builder.finish()
-
-        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
-          headName, loginAccount.fullName, loginAccount.mailAddress, message)
-
-        inserter.flush()
-        inserter.close()
-
-        // update refs
-        val refUpdate = git.getRepository.updateRef(headName)
-        refUpdate.setNewObjectId(commitId)
-        refUpdate.setForceUpdate(false)
-        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
-        //refUpdate.setRefLogMessage("merged", true)
-        refUpdate.update()
-
-        // update pull request
-        updatePullRequests(repository.owner, repository.name, branch)
-
-        // record activity
-        val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
-
-        // create issue comment by commit message
-        createIssueComment(repository.owner, repository.name, commitInfo)
-
-        // close issue by commit message
-        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
-
-        // call web hook
-        callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
-        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-        callWebHookOf(repository.owner, repository.name, WebHook.Push) {
-          getAccountByUserName(repository.owner).map{ ownerAccount =>
-            WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
-                               oldId = headTip, newId = commitId)
-          }
-        }
-      }
-    }
-  }
-
   private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = {
     val revision = name.stripSuffix(suffix)
 
@@ -694,6 +816,26 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 
+  private def conflict: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      val owner      = params("owner")
+      val repository = params("repository")
+      val branch     = params("branch")
+
+      LockUtil.lock(s"${owner}/${repository}") {
+        using(Git.open(getRepositoryDir(owner, repository))) { git =>
+          val headName = s"refs/heads/${branch}"
+          val headTip = git.getRepository.resolve(headName)
+          if(headTip.getName != value){
+            Some("Someone pushed new commits before you. Please reload this page and re-apply your changes.")
+          } else {
+            None
+          }
+        }
+      }
+    }
+  }
+
   override protected def renderUncaughtException(e: Throwable)(implicit request: HttpServletRequest, response: HttpServletResponse): Unit = {
     e.printStackTrace()
   }

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

@@ -106,7 +106,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   val newUserForm = mapping(
     "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
-    "password"    -> trim(label("Password"     ,text(required, maxlength(20)))),
+    "password"    -> trim(label("Password"     ,text(required, maxlength(20), password))),
     "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
     "isAdmin"     -> trim(label("User Type"    ,boolean())),
@@ -117,7 +117,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   val editUserForm = mapping(
     "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier))),
-    "password"    -> trim(label("Password"     ,optional(text(maxlength(20))))),
+    "password"    -> trim(label("Password"     ,optional(text(maxlength(20), password)))),
     "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
     "isAdmin"     -> trim(label("User Type"    ,boolean())),
@@ -225,7 +225,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
           //          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
           //          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
           //        }
-          // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+          // Remove from GROUP_MEMBER and COLLABORATOR
           removeUserRelatedData(userName)
         }
 
@@ -239,6 +239,10 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
           isRemoved    = form.isRemoved))
 
         updateImage(userName, form.fileId, form.clearImage)
+
+        // call hooks
+        if(form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
         redirect("/admin/users")
       }
     } getOrElse NotFound()
@@ -277,13 +281,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         if(form.isRemoved){
           // Remove from GROUP_MEMBER
           updateGroupMembers(form.groupName, Nil)
-          // Remove repositories
-          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-            deleteRepository(groupName, repositoryName)
-            FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
-            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
-            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
-          }
+//          // Remove repositories
+//          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+//            deleteRepository(groupName, repositoryName)
+//            FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+//            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+//            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+//          }
         } else {
           // Update GROUP_MEMBER
           updateGroupMembers(form.groupName, members)

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

@@ -1,8 +1,10 @@
 package gitbucket.core.controller
 
+import gitbucket.core.model.WebHook
 import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.service.WebHookService.WebHookGollumPayload
 import gitbucket.core.wiki.html
-import gitbucket.core.service.{AccountService, ActivityService, RepositoryService, WikiService}
+import gitbucket.core.service._
 import gitbucket.core.util._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
@@ -13,11 +15,12 @@ import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
 
 class WikiController extends WikiControllerBase
-  with WikiService with RepositoryService with AccountService with ActivityService
+  with WikiService with RepositoryService with AccountService with ActivityService with WebHookService
   with ReadableUsersAuthenticator with ReferrerAuthenticator
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with ActivityService with ReadableUsersAuthenticator with ReferrerAuthenticator =>
+  self: WikiService with RepositoryService with AccountService with ActivityService with WebHookService
+    with ReadableUsersAuthenticator with ReferrerAuthenticator =>
 
   case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
 
@@ -136,6 +139,11 @@ trait WikiControllerBase extends ControllerBase {
         ).map { commitId =>
           updateLastActivityDate(repository.owner, repository.name)
           recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+            getAccountByUserName(repository.owner).map { repositoryUser =>
+              WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
+            }
+          }
         }
         if(notReservedPageName(form.pageName)) {
           redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
@@ -155,11 +163,24 @@ trait WikiControllerBase extends ControllerBase {
   post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
     if(isEditable(repository)){
       defining(context.loginAccount.get){ loginAccount =>
-        saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
-          form.content, loginAccount, form.message.getOrElse(""), None)
-
+        saveWikiPage(
+          repository.owner,
+          repository.name,
+          form.currentPageName,
+          form.pageName,
+          form.content,
+          loginAccount,
+          form.message.getOrElse(""),
+          None
+        ).map { commitId =>
           updateLastActivityDate(repository.owner, repository.name)
           recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+          callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+            getAccountByUserName(repository.owner).map { repositoryUser =>
+              WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
+            }
+          }
+        }
 
         if(notReservedPageName(form.pageName)) {
           redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")

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

@@ -0,0 +1,25 @@
+package gitbucket.core.model
+
+trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  private implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+
+  lazy val AccountWebHooks = TableQuery[AccountWebHooks]
+
+  class AccountWebHooks(tag: Tag) extends Table[AccountWebHook](tag, "ACCOUNT_WEB_HOOK") with BasicTemplate {
+    val url = column[String]("URL")
+    val token = column[Option[String]]("TOKEN")
+    val ctype = column[WebHookContentType]("CTYPE")
+    def * = (userName, url, ctype, token) <> ((AccountWebHook.apply _).tupled, AccountWebHook.unapply)
+
+    def byPrimaryKey(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
+  }
+}
+
+case class AccountWebHook(
+  userName: String,
+  url: String,
+  ctype: WebHookContentType,
+  token: Option[String]
+) extends WebHook

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

@@ -0,0 +1,34 @@
+package gitbucket.core.model
+
+trait AccountWebHookEventComponent extends TemplateComponent {
+  self: Profile =>
+
+  import profile.api._
+  import gitbucket.core.model.Profile.AccountWebHooks
+
+  lazy val AccountWebHookEvents = TableQuery[AccountWebHookEvents]
+
+  class AccountWebHookEvents(tag: Tag) extends Table[AccountWebHookEvent](tag, "ACCOUNT_WEB_HOOK_EVENT") with BasicTemplate {
+    val url = column[String]("URL")
+    val event = column[WebHook.Event]("EVENT")
+
+    def * = (userName, url, event)  <> ((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)
+
+    def byAccountWebHook(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
+
+    def byAccountWebHook(owner: Rep[String], url: Rep[String]) =
+      (this.userName === userName) && (this.url === url)
+
+    def byAccountWebHook(webhook: AccountWebHooks) =
+      (this.userName === webhook.userName) && (this.url === webhook.url)
+
+    def byPrimaryKey(userName: String, url: String, event: WebHook.Event) =
+      (this.userName === userName.bind) && (this.url === url.bind) && (this.event === event.bind)
+  }
+}
+
+case class AccountWebHookEvent(
+                         userName: String,
+                         url: String,
+                         event: WebHook.Event
+                       )

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

@@ -7,6 +7,10 @@ protected[model] trait TemplateComponent { self: Profile =>
     val userName = column[String]("USER_NAME")
     val repositoryName = column[String]("REPOSITORY_NAME")
 
+    def byAccount(userName: String) = (this.userName === userName.bind)
+
+    def byAccount(userName: Rep[String]) = (this.userName === userName)
+
     def byRepository(owner: String, repository: String) =
       (userName === owner.bind) && (repositoryName === repository.bind)
 
@@ -38,6 +42,20 @@ protected[model] trait TemplateComponent { self: Profile =>
       byRepository(owner, repository) && (this.labelName === labelName.bind)
   }
 
+  trait PriorityTemplate extends BasicTemplate { self: Table[_] =>
+    val priorityId = column[Int]("PRIORITY_ID")
+    val priorityName = column[String]("PRIORITY_NAME")
+
+    def byPriority(owner: String, repository: String, priorityId: Int) =
+      byRepository(owner, repository) && (this.priorityId === priorityId.bind)
+
+    def byPriority(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) =
+      byRepository(userName, repositoryName) && (this.priorityId === priorityId)
+
+    def byPriority(owner: String, repository: String, priorityName: String) =
+      byRepository(owner, repository) && (this.priorityName === priorityName.bind)
+  }
+
   trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
     val milestoneId = column[Int]("MILESTONE_ID")
 

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

@@ -13,12 +13,13 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
   }
 
-  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
+  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
     val commentCount = column[Int]("COMMENT_COUNT")
-    def * = (userName, repositoryName, issueId, commentCount)
+    val priority = column[Int]("PRIORITY")
+    def * = (userName, repositoryName, issueId, commentCount, priority)
   }
 
-  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate {
+  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate with PriorityTemplate {
     val openedUserName = column[String]("OPENED_USER_NAME")
     val assignedUserName = column[String]("ASSIGNED_USER_NAME")
     val title = column[String]("TITLE")
@@ -27,7 +28,7 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     val pullRequest = column[Boolean]("PULL_REQUEST")
-    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
+    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, priorityId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
 
     def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
   }
@@ -39,6 +40,7 @@ case class Issue(
   issueId: Int,
   openedUserName: String,
   milestoneId: Option[Int],
+  priorityId: Option[Int],
   assignedUserName: Option[String],
   title: String,
   content: Option[String],

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

@@ -0,0 +1,43 @@
+package gitbucket.core.model
+
+trait PriorityComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  lazy val Priorities = TableQuery[Priorities]
+
+  class Priorities(tag: Tag) extends Table[Priority](tag, "PRIORITY") with PriorityTemplate {
+    override val priorityId = column[Int]("PRIORITY_ID", O AutoInc)
+    override val priorityName = column[String]("PRIORITY_NAME")
+    val description = column[String]("DESCRIPTION")
+    val ordering = column[Int]("ORDERING")
+    val isDefault = column[Boolean]("IS_DEFAULT")
+    val color = column[String]("COLOR")
+    def * = (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, priorityId: Int) = byPriority(owner, repository, priorityId)
+    def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) = byPriority(userName, repositoryName, priorityId)
+  }
+}
+
+case class Priority (
+  userName: String,
+  repositoryName: String,
+  priorityId: Int = 0,
+  priorityName: String,
+  description: Option[String],
+  isDefault: Boolean,
+  ordering: Int = 0,
+  color: String){
+
+  val fontColor = {
+    val r = color.substring(0, 2)
+    val g = color.substring(2, 4)
+    val b = color.substring(4, 6)
+
+    if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
+      "000000"
+    } else {
+      "ffffff"
+    }
+  }
+}

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

@@ -15,6 +15,11 @@ trait Profile {
     t => new java.util.Date(t.getTime)
   )
 
+  /**
+    * WebHookBase.Event Column Types
+    */
+  implicit val eventColumnType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
+
   /**
    * Extends Column to add conditional condition
    */
@@ -47,12 +52,15 @@ trait CoreProfile extends ProfileProvider with Profile
   with IssueCommentComponent
   with IssueLabelComponent
   with LabelComponent
+  with PriorityComponent
   with MilestoneComponent
   with PullRequestComponent
   with RepositoryComponent
   with SshKeyComponent
-  with WebHookComponent
-  with WebHookEventComponent
+  with RepositoryWebHookComponent
+  with RepositoryWebHookEventComponent
+  with AccountWebHookComponent
+  with AccountWebHookEventComponent
   with ProtectedBranchComponent
   with DeployKeyComponent
 

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

@@ -0,0 +1,27 @@
+package gitbucket.core.model
+
+trait RepositoryWebHookComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+
+  implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+
+  lazy val RepositoryWebHooks = TableQuery[RepositoryWebHooks]
+
+  class RepositoryWebHooks(tag: Tag) extends Table[RepositoryWebHook](tag, "WEB_HOOK") with BasicTemplate {
+    val url = column[String]("URL")
+    val token = column[Option[String]]("TOKEN")
+    val ctype = column[WebHookContentType]("CTYPE")
+    def * = (userName, repositoryName, url, ctype, token) <> ((RepositoryWebHook.apply _).tupled, RepositoryWebHook.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+  }
+}
+
+
+case class RepositoryWebHook(
+  userName: String,
+  repositoryName: String,
+  url: String,
+  ctype: WebHookContentType,
+  token: Option[String]
+) extends WebHook

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

@@ -0,0 +1,28 @@
+package gitbucket.core.model
+
+trait RepositoryWebHookEventComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+  import gitbucket.core.model.Profile.RepositoryWebHooks
+
+  lazy val RepositoryWebHookEvents = TableQuery[RepositoryWebHookEvents]
+
+  class RepositoryWebHookEvents(tag: Tag) extends Table[RepositoryWebHookEvent](tag, "WEB_HOOK_EVENT") with BasicTemplate {
+    val url = column[String]("URL")
+    val event = column[WebHook.Event]("EVENT")
+    def * = (userName, repositoryName, url, event) <> ((RepositoryWebHookEvent.apply _).tupled, RepositoryWebHookEvent.unapply)
+
+    def byRepositoryWebHook(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+    def byRepositoryWebHook(owner: Rep[String], repository: Rep[String], url: Rep[String]) =
+      byRepository(userName, repositoryName) && (this.url === url)
+    def byRepositoryWebHook(webhook: RepositoryWebHooks) =
+      byRepository(webhook.userName, webhook.repositoryName) && (this.url === webhook.url)
+    def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) = byRepositoryWebHook(owner, repository, url) && (this.event === event.bind)
+  }
+}
+
+case class RepositoryWebHookEvent(
+  userName: String,
+  repositoryName: String,
+  url: String,
+  event: WebHook.Event
+)

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

@@ -1,22 +1,5 @@
 package gitbucket.core.model
 
-trait WebHookComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
-
-  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")
-    val ctype = column[WebHookContentType]("CTYPE")
-    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)
-  }
-}
-
 abstract sealed case class WebHookContentType(code: String, ctype: String)
 
 object WebHookContentType {
@@ -33,13 +16,11 @@ object WebHookContentType {
   def valueOpt(code: String): Option[WebHookContentType] = map.get(code)
 }
 
-case class WebHook(
-  userName: String,
-  repositoryName: String,
-  url: String,
-  ctype: WebHookContentType,
-  token: Option[String]
-)
+trait WebHook{
+  val url: String
+  val ctype: WebHookContentType
+  val token: Option[String]
+}
 
 object WebHook {
   abstract sealed class Event(val name: String)
@@ -86,6 +67,7 @@ object WebHook {
       TeamAdd,
       Watch
     )
+
     private val map: Map[String,Event] = values.map(e => e.name -> e).toMap
     def valueOf(name: String): Event = map(name)
     def valueOpt(name: String): Option[Event] = map.get(name)

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

@@ -1,30 +0,0 @@
-package gitbucket.core.model
-
-trait WebHookEventComponent extends TemplateComponent { self: Profile =>
-  import profile.api._
-  import gitbucket.core.model.Profile.WebHooks
-
-  lazy val WebHookEvents = TableQuery[WebHookEvents]
-
-  implicit val typedType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
-
-  class WebHookEvents(tag: Tag) extends Table[WebHookEvent](tag, "WEB_HOOK_EVENT") with BasicTemplate {
-    val url = column[String]("URL")
-    val event = column[WebHook.Event]("EVENT")
-    def * = (userName, repositoryName, url, event) <> ((WebHookEvent.apply _).tupled, WebHookEvent.unapply)
-
-    def byWebHook(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
-    def byWebHook(owner: Rep[String], repository: Rep[String], url: Rep[String]) =
-      byRepository(userName, repositoryName) && (this.url === url)
-    def byWebHook(webhook: WebHooks) =
-      byRepository(webhook.userName, webhook.repositoryName) && (this.url === webhook.url)
-    def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) = byWebHook(owner, repository, url) && (this.event === event.bind)
-  }
-}
-
-case class WebHookEvent(
-  userName: String,
-  repositoryName: String,
-  url: String,
-  event: WebHook.Event
-)

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

@@ -0,0 +1,10 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.model.Profile._
+import profile.api._
+
+trait AccountHook {
+
+  def deleted(userName: String)(implicit session: Session): Unit = ()
+
+}

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

@@ -0,0 +1,20 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.controller.Context
+import gitbucket.core.model.Issue
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+
+trait IssueHook {
+
+  def created(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def addedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def closed(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def reopened(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+
+}
+
+trait PullRequestHook extends IssueHook {
+
+  def merged(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+
+}

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

@@ -1,12 +1,14 @@
 package gitbucket.core.plugin
 
 import javax.servlet.ServletContext
+
 import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.SyntaxSugars._
 import io.github.gitbucket.solidbase.model.Version
+import play.twirl.api.Html
 
 /**
  * Trait for define plugin interface.
@@ -69,6 +71,16 @@ abstract class Plugin {
    */
   def repositoryRoutings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[GitRepositoryRouting] = Nil
 
+  /**
+   * Override to add account hooks.
+   */
+  val accountHooks: Seq[AccountHook] = Nil
+
+  /**
+   * Override to add account hooks.
+   */
+  def accountHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[AccountHook] = Nil
+
   /**
    * Override to add receive hooks.
    */
@@ -89,6 +101,26 @@ abstract class Plugin {
    */
   def repositoryHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[RepositoryHook] = Nil
 
+  /**
+   * Override to add issue hooks.
+   */
+  val issueHooks: Seq[IssueHook] = Nil
+
+  /**
+   * Override to add issue hooks.
+   */
+  def issueHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[IssueHook] = Nil
+
+  /**
+   * Override to add pull request hooks.
+   */
+  val pullRequestHooks: Seq[PullRequestHook] = Nil
+
+  /**
+   * Override to add pull request hooks.
+   */
+  def pullRequestHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[PullRequestHook] = Nil
+
   /**
    * Override to add global menus.
    */
@@ -159,6 +191,16 @@ abstract class Plugin {
    */
   def dashboardTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
 
+  /**
+   * Override to add issue sidebars.
+   */
+  val issueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
+
+  /**
+   * Override to add issue sidebars.
+   */
+  def issueSidebars(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
+
   /**
    * Override to add assets mappings.
    */
@@ -209,12 +251,21 @@ abstract class Plugin {
     (repositoryRoutings ++ repositoryRoutings(registry, context, settings)).foreach { routing =>
       registry.addRepositoryRouting(routing)
     }
+    (accountHooks ++ accountHooks(registry, context, settings)).foreach { accountHook =>
+      registry.addAccountHook(accountHook)
+    }
     (receiveHooks ++ receiveHooks(registry, context, settings)).foreach { receiveHook =>
       registry.addReceiveHook(receiveHook)
     }
     (repositoryHooks ++ repositoryHooks(registry, context, settings)).foreach { repositoryHook =>
       registry.addRepositoryHook(repositoryHook)
     }
+    (issueHooks ++ issueHooks(registry, context, settings)).foreach { issueHook =>
+      registry.addIssueHook(issueHook)
+    }
+    (pullRequestHooks ++ pullRequestHooks(registry, context, settings)).foreach { pullRequestHook =>
+      registry.addPullRequestHook(pullRequestHook)
+    }
     (globalMenus ++ globalMenus(registry, context, settings)).foreach { globalMenu =>
       registry.addGlobalMenu(globalMenu)
     }
@@ -236,6 +287,9 @@ abstract class Plugin {
     (dashboardTabs ++ dashboardTabs(registry, context, settings)).foreach { dashboardTab =>
       registry.addDashboardTab(dashboardTab)
     }
+    (issueSidebars ++ issueSidebars(registry, context, settings)).foreach { issueSidebar =>
+      registry.addIssueSidebar(issueSidebar)
+    }
     (assetsMappings ++ assetsMappings(registry, context, settings)).foreach { assetMapping =>
       registry.addAssetsMapping((assetMapping._1, assetMapping._2, getClass.getClassLoader))
     }

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

@@ -6,7 +6,7 @@ import java.util.Base64
 import javax.servlet.ServletContext
 
 import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
@@ -17,6 +17,7 @@ import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
 import org.slf4j.LoggerFactory
+import play.twirl.api.Html
 
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
@@ -32,10 +33,17 @@ class PluginRegistry {
     "md" -> MarkdownRenderer, "markdown" -> MarkdownRenderer
   )
   private val repositoryRoutings = new ListBuffer[GitRepositoryRouting]
+  private val accountHooks = new ListBuffer[AccountHook]
   private val receiveHooks = new ListBuffer[ReceiveHook]
   receiveHooks += new ProtectedBranchReceiveHook()
 
   private val repositoryHooks = new ListBuffer[RepositoryHook]
+  private val issueHooks = new ListBuffer[IssueHook]
+  issueHooks += new gitbucket.core.util.Notifier.IssueHook()
+
+  private val pullRequestHooks = new ListBuffer[PullRequestHook]
+  pullRequestHooks += new gitbucket.core.util.Notifier.PullRequestHook()
+
   private val globalMenus = new ListBuffer[(Context) => Option[Link]]
   private val repositoryMenus = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
   private val repositorySettingTabs = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
@@ -43,6 +51,7 @@ class PluginRegistry {
   private val systemSettingMenus = new ListBuffer[(Context) => Option[Link]]
   private val accountSettingMenus = new ListBuffer[(Context) => Option[Link]]
   private val dashboardTabs = new ListBuffer[(Context) => Option[Link]]
+  private val issueSidebars = new ListBuffer[(Issue, RepositoryInfo, Context) => Option[Html]]
   private val assetsMappings = new ListBuffer[(String, String, ClassLoader)]
   private val textDecorators = new ListBuffer[TextDecorator]
 
@@ -99,6 +108,10 @@ class PluginRegistry {
     }
   }
 
+  def addAccountHook(accountHook: AccountHook): Unit = accountHooks += accountHook
+
+  def getAccountHooks: Seq[AccountHook] = accountHooks.toSeq
+
   def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks += commitHook
 
   def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq
@@ -107,6 +120,14 @@ class PluginRegistry {
 
   def getRepositoryHooks: Seq[RepositoryHook] = repositoryHooks.toSeq
 
+  def addIssueHook(issueHook: IssueHook): Unit = issueHooks += issueHook
+
+  def getIssueHooks: Seq[IssueHook] = issueHooks.toSeq
+
+  def addPullRequestHook(pullRequestHook: PullRequestHook): Unit = pullRequestHooks += pullRequestHook
+
+  def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.toSeq
+
   def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus += globalMenu
 
   def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq
@@ -135,6 +156,10 @@ class PluginRegistry {
 
   def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.toSeq
 
+  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars += issueSidebar
+
+  def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.toSeq
+
   def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings += assetsMapping
 
   def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.toSeq
@@ -172,7 +197,7 @@ object PluginRegistry {
     if(pluginDir.exists && pluginDir.isDirectory){
       pluginDir.listFiles(new FilenameFilter {
         override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
-      }).foreach { pluginJar =>
+      }).sortBy(_.getName).foreach { pluginJar =>
         val classLoader = new URLClassLoader(Array(pluginJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
         try {
           val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin]

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

@@ -132,7 +132,7 @@ trait ActivityService {
     Activities insert Activity(userName, repositoryName, activityUserName,
       "push",
       s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
-      Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
+      Some(commits.take(5).map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
       currentDate)
 
   def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String,

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

@@ -2,11 +2,10 @@ package gitbucket.core.service
 
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Issue
-import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.Notifier
 
 trait HandleCommentService {
   self: RepositoryService with IssuesService with ActivityService
@@ -21,7 +20,7 @@ trait HandleCommentService {
       defining(repository.owner, repository.name){ case (owner, name) =>
         val userName = loginAccount.userName
 
-        val (action, recordActivity) = actionOpt
+        val (action, actionActivity) = actionOpt
           .collect {
             case "close" if(!issue.closed) => true  ->
               (Some("close")  -> Some(if(issue.isPullRequest) recordClosePullRequestActivity _ else recordCloseIssueActivity _))
@@ -36,54 +35,55 @@ trait HandleCommentService {
 
         val commentId = (content, action) match {
           case (None, None) => None
-          case (None, Some(action)) => Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
-          case (Some(content), _) => Some(createComment(owner, name, userName, issue.issueId, content, action.map(_+ "_comment").getOrElse("comment")))
-        }
+          case (None, Some(action)) =>
+            Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
+          case (Some(content), _) =>
+            val id = Some(createComment(owner, name, userName, issue.issueId, content, action.map(_+ "_comment").getOrElse("comment")))
 
-        // record comment activity if comment is entered
-        content foreach {
-          (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
-          (owner, name, userName, issue.issueId, _)
-        }
-        recordActivity foreach ( _ (owner, name, userName, issue.issueId, issue.title) )
+            // record comment activity
+            if(issue.isPullRequest) recordCommentPullRequestActivity(owner, name, userName, issue.issueId, content)
+            else recordCommentIssueActivity(owner, name, userName, issue.issueId, content)
 
             // extract references and create refer comment
-        content.map { content =>
             createReferComment(owner, name, issue, content, loginAccount)
+
+            id
         }
 
+        actionActivity foreach ( _ (owner, name, userName, issue.issueId, issue.title) )
+
         // call web hooks
         action match {
-          case None => commentId.map { commentIdSome => callIssueCommentWebHook(repository, issue, commentIdSome, loginAccount) }
-          case Some(act) => {
+          case None => commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount))
+          case Some(act) =>
             val webHookAction = act match {
-              case "open"   => "opened"
-              case "reopen" => "reopened"
               case "close"  => "closed"
-              case _ => act
+              case "reopen" => "reopened"
             }
-            if (issue.isPullRequest) {
+            if(issue.isPullRequest)
               callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, loginAccount)
-            } else {
+            else
               callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, loginAccount)
         }
-          }
-        }
 
-        // notifications
-        Notifier() match {
-          case f =>
-            content foreach {
-              f.toNotify(repository, issue, _){
-                Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${
-                  if(issue.isPullRequest) "pull" else "issues"}/${issue.issueId}#comment-${commentId.get}")
-              }
+        // call hooks
+        content foreach { x =>
+          if(issue.isPullRequest)
+            PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
+          else
+            PluginRegistry().getIssueHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
         }
         action foreach {
-              f.toNotify(repository, issue, _){
-                Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/issues/${issue.issueId}")
-              }
-            }
+          case "close" =>
+            if(issue.isPullRequest)
+              PluginRegistry().getPullRequestHooks.foreach(_.closed(issue, repository))
+            else
+              PluginRegistry().getIssueHooks.foreach(_.closed(issue, repository))
+          case "reopen" =>
+            if(issue.isPullRequest)
+              PluginRegistry().getPullRequestHooks.foreach(_.reopened(issue, repository))
+            else
+              PluginRegistry().getIssueHooks.foreach(_.reopened(issue, repository))
         }
 
         commentId.map( issue -> _ )

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

@@ -3,17 +3,16 @@ package gitbucket.core.service
 import gitbucket.core.controller.Context
 import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.util.Notifier
 import gitbucket.core.util.Implicits._
 
-// TODO: Merged with IssuesService?
 trait IssueCreationService {
 
   self: RepositoryService with WebHookIssueCommentService with LabelsService with IssuesService with ActivityService =>
 
   def createIssue(repository: RepositoryInfo, title:String, body:Option[String],
-                  assignee: Option[String], milestoneId: Option[Int], labelNames: Seq[String],
+                  assignee: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Seq[String],
                   loginAccount: Account)(implicit context: Context, s: Session) : Issue = {
 
     val owner = repository.owner
@@ -24,7 +23,8 @@ trait IssueCreationService {
     // insert issue
     val issueId = insertIssue(owner, name, userName, title, body,
       if (manageable) assignee else None,
-      if (manageable) milestoneId else None)
+      if (manageable) milestoneId else None,
+      if (manageable) priorityId else None)
     val issue: Issue = getIssue(owner, name, issueId.toString).get
 
     // insert labels
@@ -46,10 +46,9 @@ trait IssueCreationService {
     // call web hooks
     callIssuesWebHook("opened", repository, issue, context.baseUrl, loginAccount)
 
-    // notifications
-    Notifier().toNotify(repository, issue, body.getOrElse("")) {
-      Notifier.msgIssue(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
-    }
+    // call hooks
+    PluginRegistry().getIssueHooks.foreach(_.created(issue, repository))
+
     issue
   }
 

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

@@ -97,6 +97,30 @@ trait IssuesService {
       .list.toMap
   }
 
+  /**
+    * Returns the Map which contains issue count for each priority.
+    *
+    * @param owner the repository owner
+    * @param repository the repository name
+    * @param condition the search condition
+    * @return the Map which contains issue count for each priority (key is priority name, value is issue count)
+    */
+  def countIssueGroupByPriorities(owner: String, repository: String, condition: IssueSearchCondition,
+                              filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = {
+
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false)
+      .join(Priorities).on { case t1 ~ t2 =>
+        t1.byPriority(t2.userName, t2.repositoryName, t2.priorityId)
+      }
+      .groupBy { case t1 ~ t2 =>
+        t2.priorityName
+      }
+      .map { case priorityName ~ t =>
+        priorityName -> t.length
+      }
+      .list.toMap
+  }
+
   def getCommitStatues(userName: String, repositoryName: String, issueId: Int)(implicit s: Session): Option[CommitStatusInfo] = {
     val status = PullRequests
       .filter { pr =>
@@ -139,18 +163,20 @@ trait IssuesService {
         .joinLeft (IssueLabels) .on { case t1 ~ t2 ~ i ~ t3                => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
         .joinLeft (Labels)      .on { case t1 ~ t2 ~ i ~ t3 ~ t4           => t3.map(_.byLabel(t4.userName, t4.repositoryName, t4.labelId)) }
         .joinLeft (Milestones)  .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5      => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
-        .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 => i asc }
-        .map { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 =>
-          (t1, t2.commentCount, t4.map(_.labelId), t4.map(_.labelName), t4.map(_.color), t5.map(_.title))
+        .joinLeft (Priorities)  .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t1.byPriority(t6.userName, t6.repositoryName, t6.priorityId) }
+        .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
+        .map { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 =>
+          (t1, t2.commentCount, t4.map(_.labelId), t4.map(_.labelName), t4.map(_.color), t5.map(_.title), t6.map(_.priorityName))
         }
         .list
         .splitWith { (c1, c2) => c1._1.userName == c2._1.userName && c1._1.repositoryName == c2._1.repositoryName && c1._1.issueId == c2._1.issueId }
 
     result.map { issues => issues.head match {
-      case (issue, commentCount, _, _, _, milestone) =>
+      case (issue, commentCount, _, _, _, milestone, priority) =>
         IssueInfo(issue,
          issues.flatMap { t => t._3.map (Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get))} toList,
          milestone,
+         priority,
          commentCount,
          getCommitStatues(issue.userName, issue.repositoryName, issue.issueId))
     }} toList
@@ -204,6 +230,10 @@ trait IssuesService {
             case "asc"  => t1.updatedDate asc
             case "desc" => t1.updatedDate desc
           }
+          case "priority" => condition.direction match {
+            case "asc"  => t2.priority asc
+            case "desc" => t2.priority desc
+          }
         }
       }
       .drop(offset).take(limit).zipWithIndex
@@ -219,6 +249,7 @@ trait IssuesService {
         .foldLeft[Rep[Boolean]](false) ( _ || _ ) &&
       (t1.closed           === (condition.state == "closed").bind) &&
       (t1.milestoneId.?      isEmpty, condition.milestone == Some(None)) &&
+      (t1.priorityId.?       isEmpty, condition.priority == Some(None)) &&
       (t1.assignedUserName.? isEmpty, condition.assigned  == Some(None)) &&
       (t1.openedUserName   === condition.author.get.bind, condition.author.isDefined) &&
       (t1.pullRequest      === pullRequest.bind) &&
@@ -227,6 +258,11 @@ trait IssuesService {
         (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) &&
         (t2.title === condition.milestone.get.get.bind)
       } exists, condition.milestone.flatten.isDefined) &&
+      // Priority filter
+      (Priorities filter { t2 =>
+        (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.priorityId)) &&
+          (t2.priorityName === condition.priority.get.get.bind)
+      } exists, condition.priority.flatten.isDefined) &&
       // Assignee filter
       (t1.assignedUserName === condition.assigned.get.get.bind, condition.assigned.flatten.isDefined) &&
       // Label filter
@@ -253,7 +289,7 @@ trait IssuesService {
     }
 
   def insertIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
-                  assignedUserName: Option[String], milestoneId: Option[Int],
+                  assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int],
                   isPullRequest: Boolean = false)(implicit s: Session): Int = {
     // next id number
     sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
@@ -264,6 +300,7 @@ trait IssuesService {
         id,
         loginUser,
         milestoneId,
+        priorityId,
         assignedUserName,
         title,
         content,
@@ -316,6 +353,10 @@ trait IssuesService {
     Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
   }
 
+  def updatePriorityId(owner: String, repository: String, issueId: Int, priorityId: Option[Int])(implicit s: Session): Int = {
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.priorityId?).update (priorityId)
+  }
+
   def updateComment(commentId: Int, content: String)(implicit s: Session): Int = {
     IssueComments.filter (_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
   }
@@ -430,6 +471,7 @@ object IssuesService {
   case class IssueSearchCondition(
       labels: Set[String] = Set.empty,
       milestone: Option[Option[String]] = None,
+      priority: Option[Option[String]] = None,
       author: Option[String] = None,
       assigned: Option[Option[String]] = None,
       mentioned: Option[String] = None,
@@ -459,6 +501,10 @@ object IssuesService {
           case Some(x) => s"milestone:${x}"
           case None    => "no:milestone"
         }},
+        priority.map { _ match {
+          case Some(x) => s"priority:${x}"
+          case None    => "no:priority"
+        }},
         (sort, direction) match {
           case ("created" , "desc") => None
           case ("created" , "asc" ) => Some("sort:created-asc")
@@ -466,6 +512,8 @@ object IssuesService {
           case ("comments", "asc" ) => Some("sort:comments-asc")
           case ("updated" , "desc") => Some("sort:updated-desc")
           case ("updated" , "asc" ) => Some("sort:updated-asc")
+          case ("priority", "desc") => Some("sort:priority-desc")
+          case ("priority", "asc" ) => Some("sort:priority-asc")
           case x                    => throw new MatchError(x)
         },
         visibility.map(visibility => s"visibility:${visibility}")
@@ -480,6 +528,10 @@ object IssuesService {
           case Some(x) => "milestone=" + urlEncode(x)
           case None    => "milestone=none"
         },
+        priority.map {
+          case Some(x) => "priority=" + urlEncode(x)
+          case None    => "priority=none"
+        },
         author   .map(x => "author="    + urlEncode(x)),
         assigned.map {
           case Some(x) => "assigned="  + urlEncode(x)
@@ -512,6 +564,10 @@ object IssuesService {
           case "none" => None
           case x      => Some(x)
         },
+        param(request, "priority").map {
+          case "none" => None
+          case x      => Some(x)
+        },
         param(request, "author"),
         param(request, "assigned").map {
           case "none" => None
@@ -519,7 +575,7 @@ object IssuesService {
         },
         param(request, "mentioned"),
         param(request, "state",     Seq("open", "closed")).getOrElse("open"),
-        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
+        param(request, "sort",      Seq("created", "comments", "updated", "priority")).getOrElse("created"),
         param(request, "direction", Seq("asc", "desc")).getOrElse("desc"),
         param(request, "visibility"),
         param(request, "groups").map(_.split(",").toSet).getOrElse(Set.empty)
@@ -535,6 +591,6 @@ object IssuesService {
 
   case class CommitStatusInfo(count: Int, successCount: Int, context: Option[String], state: Option[CommitState], targetUrl: Option[String], description: Option[String])
 
-  case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], commentCount: Int, status:Option[CommitStatusInfo])
+  case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], priority: Option[String], commentCount: Int, status:Option[CommitStatusInfo])
 
 }

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

@@ -0,0 +1,84 @@
+package gitbucket.core.service
+
+import gitbucket.core.model.Priority
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.util.StringUtil
+
+trait PrioritiesService {
+
+  def getPriorities(owner: String, repository: String)(implicit s: Session): List[Priority] =
+    Priorities.filter(_.byRepository(owner, repository)).sortBy(_.ordering asc).list
+
+  def getPriority(owner: String, repository: String, priorityId: Int)(implicit s: Session): Option[Priority] =
+    Priorities.filter(_.byPrimaryKey(owner, repository, priorityId)).firstOption
+
+  def getPriority(owner: String, repository: String, priorityName: String)(implicit s: Session): Option[Priority] =
+    Priorities.filter(_.byPriority(owner, repository, priorityName)).firstOption
+
+  def createPriority(owner: String, repository: String, priorityName: String, description: Option[String], color: String)(implicit s: Session): Int = {
+    val ordering = Priorities.filter(_.byRepository(owner, repository))
+      .list
+      .map(p => p.ordering)
+      .reduceOption(_ max _)
+      .map(m => m + 1)
+      .getOrElse(0)
+
+    Priorities returning Priorities.map(_.priorityId) insert Priority(
+      userName       = owner,
+      repositoryName = repository,
+      priorityName   = priorityName,
+      description    = description,
+      isDefault      = false,
+      ordering       = ordering,
+      color          = color
+    )
+  }
+
+  def updatePriority(owner: String, repository: String, priorityId: Int, priorityName: String, description: Option[String], color: String)
+                 (implicit s: Session): Unit =
+    Priorities.filter(_.byPrimaryKey(owner, repository, priorityId))
+          .map(t => (t.priorityName, t.description.?, t.color))
+          .update(priorityName, description, color)
+
+  def reorderPriorities(owner: String, repository: String, order: Map[Int, Int])
+                    (implicit s: Session): Unit = {
+
+    Priorities.filter(_.byRepository(owner, repository))
+      .list
+      .foreach(p => Priorities
+        .filter(_.byPrimaryKey(owner, repository, p.priorityId))
+        .map(_.ordering)
+        .update(order.get(p.priorityId).get))
+  }
+
+  def deletePriority(owner: String, repository: String, priorityId: Int)(implicit s: Session): Unit = {
+    Issues.filter(_.byRepository(owner, repository))
+      .filter(_.priorityId === priorityId)
+      .map(_.priorityId?)
+      .update(None)
+
+    Priorities.filter(_.byPrimaryKey(owner, repository, priorityId)).delete
+  }
+
+  def getDefaultPriority(owner: String, repository: String)(implicit s: Session): Option[Priority] = {
+    Priorities
+      .filter(_.byRepository(owner, repository))
+      .filter(_.isDefault)
+      .list
+      .headOption
+  }
+
+  def setDefaultPriority(owner: String, repository: String, priorityId: Option[Int])(implicit s: Session): Unit = {
+    Priorities
+      .filter(_.byRepository(owner, repository))
+      .filter(_.isDefault)
+      .map(_.isDefault)
+      .update(false)
+
+    priorityId.foreach(id => Priorities
+      .filter(_.byPrimaryKey(owner, repository, id))
+      .map(_.isDefault)
+      .update(true))
+  }
+}

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

@@ -10,7 +10,7 @@ import org.eclipse.jgit.dircache.DirCache
 import org.eclipse.jgit.lib.{FileMode, Constants}
 
 trait RepositoryCreationService {
-  self: AccountService with RepositoryService with LabelsService with WikiService with ActivityService =>
+  self: AccountService with RepositoryService with LabelsService with WikiService with ActivityService with PrioritiesService =>
 
   def createRepository(loginAccount: Account, owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
                       (implicit s: Session) {
@@ -30,6 +30,9 @@ trait RepositoryCreationService {
     // Insert default labels
     insertDefaultLabels(owner, name)
 
+    // Insert default priorities
+    insertDefaultPriorities(owner, name)
+
     // Create the actual repository
     val gitdir = getRepositoryDir(owner, name)
     JGitUtil.initRepository(gitdir)
@@ -74,5 +77,13 @@ trait RepositoryCreationService {
     createLabel(userName, repositoryName, "wontfix", "ffffff")
   }
 
+  def insertDefaultPriorities(userName: String, repositoryName: String)(implicit s: Session): Unit = {
+    createPriority(userName, repositoryName, "highest", Some("All defects at this priority must be fixed before any public product is delivered."), "fc2929")
+    createPriority(userName, repositoryName, "very high", Some("Issues must be addressed before a final product is delivered."), "fc5629")
+    createPriority(userName, repositoryName, "high", Some("Issues should be addressed before a final product is delivered. If the issue cannot be resolved before delivery, it should be prioritized for the next release."), "fc9629")
+    createPriority(userName, repositoryName, "important", Some("Issues can be shipped with a final product, but should be reviewed before the next release."), "fccd29")
+    createPriority(userName, repositoryName, "default", Some("Default."), "acacac")
 
+    setDefaultPriority(userName, repositoryName, getPriority(userName, repositoryName, "default").map(_.priorityId))
+  }
 }

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

@@ -59,13 +59,14 @@ trait RepositoryService { self: AccountService =>
       (Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
         Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
 
-        val webHooks                = WebHooks               .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val webHookEvents           = WebHookEvents          .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val webHooks                = RepositoryWebHooks     .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val webHookEvents           = RepositoryWebHookEvents.filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val milestones              = Milestones             .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val issueId                 = IssueId                .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val issues                  = Issues                 .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val pullRequests            = PullRequests           .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val labels                  = Labels                 .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val priorities              = Priorities             .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val issueComments           = IssueComments          .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val issueLabels             = IssueLabels            .filter(_.byRepository(oldUserName, oldRepositoryName)).list
         val commitComments          = CommitComments         .filter(_.byRepository(oldUserName, oldRepositoryName)).list
@@ -81,7 +82,7 @@ trait RepositoryService { self: AccountService =>
 
         Repositories.filter { t =>
           (t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
-        }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
+        }.map { t => t.parentUserName -> t.parentRepositoryName }.update(newUserName, newRepositoryName)
 
         // Updates activity fk before deleting repository because activity is sorted by activityId
         // and it can't be changed by deleting-and-inserting record.
@@ -92,17 +93,22 @@ trait RepositoryService { self: AccountService =>
 
         deleteRepository(oldUserName, oldRepositoryName)
 
-        WebHooks     .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-        WebHookEvents.insertAll(webHookEvents .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        RepositoryWebHooks     .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        RepositoryWebHookEvents.insertAll(webHookEvents .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         Milestones   .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Priorities   .insertAll(priorities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         IssueId      .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
 
         val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
+        val newPriorities = Priorities.filter(_.byRepository(newUserName, newRepositoryName)).list
         Issues.insertAll(issues.map { x => x.copy(
           userName       = newUserName,
           repositoryName = newRepositoryName,
           milestoneId    = x.milestoneId.map { id =>
             newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
+          },
+          priorityId    = x.priorityId.map { id =>
+            newPriorities.find(_.priorityName == priorities.find(_.priorityId == id).get.priorityName).get.priorityId
           }
         )} :_*)
 
@@ -161,10 +167,11 @@ trait RepositoryService { self: AccountService =>
     IssueComments .filter(_.byRepository(userName, repositoryName)).delete
     PullRequests  .filter(_.byRepository(userName, repositoryName)).delete
     Issues        .filter(_.byRepository(userName, repositoryName)).delete
+    Priorities    .filter(_.byRepository(userName, repositoryName)).delete
     IssueId       .filter(_.byRepository(userName, repositoryName)).delete
     Milestones    .filter(_.byRepository(userName, repositoryName)).delete
-    WebHooks      .filter(_.byRepository(userName, repositoryName)).delete
-    WebHookEvents .filter(_.byRepository(userName, repositoryName)).delete
+    RepositoryWebHooks      .filter(_.byRepository(userName, repositoryName)).delete
+    RepositoryWebHookEvents .filter(_.byRepository(userName, repositoryName)).delete
     DeployKeys    .filter(_.byRepository(userName, repositoryName)).delete
     Repositories  .filter(_.byRepository(userName, repositoryName)).delete
 

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

@@ -1,9 +1,9 @@
 package gitbucket.core.service
 
-import gitbucket.core.util.{Directory, SyntaxSugars}
 import gitbucket.core.util.Implicits._
-import Directory._
-import SyntaxSugars._
+import gitbucket.core.util.ConfigUtil._
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.SyntaxSugars._
 import SystemSettingsService._
 import javax.servlet.http.HttpServletRequest
 
@@ -220,23 +220,28 @@ object SystemSettingsService {
   private val LdapSsl = "ldap.ssl"
   private val LdapKeystore = "ldap.keystore"
 
-  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
+  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
+    getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse {
       defining(props.getProperty(key)){ value =>
-      if(value == null || value.isEmpty) default
-      else convertType(value).asInstanceOf[A]
+        if(value == null || value.isEmpty){
+          default
+        } else {
+          convertType(value).asInstanceOf[A]
+        }
+      }
+    })
   }
 
-  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
+  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] = {
+    getSystemProperty(key).orElse(getEnvironmentVariable(key).orElse {
       defining(props.getProperty(key)){ value =>
-      if(value == null || value.isEmpty) default
-      else Some(convertType(value)).asInstanceOf[Option[A]]
+        if(value == null || value.isEmpty){
+          default
+        } else {
+          Some(convertType(value)).asInstanceOf[Option[A]]
         }
-
-  private def convertType[A: ClassTag](value: String) =
-    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
-      if(c == classOf[Boolean])  value.toBoolean
-      else if(c == classOf[Int]) value.toInt
-      else value
+      }
+    })
   }
 
 }

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

@@ -3,12 +3,12 @@ package gitbucket.core.service
 import fr.brouillard.oss.security.xhub.XHub
 import fr.brouillard.oss.security.xhub.XHub.{XHubConverter, XHubDigest}
 import gitbucket.core.api._
-import gitbucket.core.model.{Account, CommitComment, Issue, IssueComment, PullRequest, WebHook, WebHookEvent}
+import gitbucket.core.model.{Account, CommitComment, Issue, IssueComment, PullRequest, WebHook, RepositoryWebHook, RepositoryWebHookEvent, AccountWebHook, AccountWebHookEvent}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.apache.http.client.utils.URLEncodedUtils
 import gitbucket.core.util.JGitUtil.CommitInfo
-import gitbucket.core.util.RepositoryName
+import gitbucket.core.util.{RepositoryName, StringUtil}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import org.apache.http.NameValuePair
 import org.apache.http.client.entity.UrlEncodedFormEntity
@@ -18,7 +18,7 @@ import org.eclipse.jgit.lib.ObjectId
 import org.slf4j.LoggerFactory
 
 import scala.concurrent._
-import scala.util.{Success, Failure}
+import scala.util.{Failure, Success}
 import org.apache.http.HttpRequest
 import org.apache.http.HttpResponse
 import gitbucket.core.model.WebHookContentType
@@ -32,45 +32,86 @@ trait WebHookService {
   private val logger = LoggerFactory.getLogger(classOf[WebHookService])
 
   /** get All WebHook informations of repository */
-  def getWebHooks(owner: String, repository: String)(implicit s: Session): List[(WebHook, Set[WebHook.Event])] =
-    WebHooks.filter(_.byRepository(owner, repository))
-      .join(WebHookEvents).on { (w, t) => t.byWebHook(w) }
+  def getWebHooks(owner: String, repository: String)(implicit s: Session): List[(RepositoryWebHook, Set[WebHook.Event])] =
+    RepositoryWebHooks.filter(_.byRepository(owner, repository))
+      .join(RepositoryWebHookEvents).on { (w, t) => t.byRepositoryWebHook(w) }
       .map { case (w, t) => w -> t.event }
       .list.groupBy(_._1).mapValues(_.map(_._2).toSet).toList.sortBy(_._1.url)
 
   /** get All WebHook informations of repository event */
-  def getWebHooksByEvent(owner: String, repository: String, event: WebHook.Event)(implicit s: Session): List[WebHook] =
-     WebHooks.filter(_.byRepository(owner, repository))
-       .join(WebHookEvents).on { (wh, whe) => whe.byWebHook(wh) }
+  def getWebHooksByEvent(owner: String, repository: String, event: WebHook.Event)(implicit s: Session): List[RepositoryWebHook] =
+    RepositoryWebHooks.filter(_.byRepository(owner, repository))
+       .join(RepositoryWebHookEvents).on { (wh, whe) => whe.byRepositoryWebHook(wh) }
        .filter { case (wh, whe) => whe.event === event.bind}
        .map{ case (wh, whe) => wh }
        .list.distinct
 
   /** get All WebHook information from repository to url */
-  def getWebHook(owner: String, repository: String, url: String)(implicit s: Session): Option[(WebHook, Set[WebHook.Event])] =
-    WebHooks
+  def getWebHook(owner: String, repository: String, url: String)(implicit s: Session): Option[(RepositoryWebHook, Set[WebHook.Event])] =
+    RepositoryWebHooks
       .filter(_.byPrimaryKey(owner, repository, url))
-      .join(WebHookEvents).on { (w, t) => t.byWebHook(w) }
+      .join(RepositoryWebHookEvents).on { (w, t) => t.byRepositoryWebHook(w) }
       .map { case (w, t) => w -> t.event }
       .list.groupBy(_._1).mapValues(_.map(_._2).toSet).headOption
 
   def addWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
-    WebHooks insert WebHook(owner, repository, url, ctype, token)
+    RepositoryWebHooks insert RepositoryWebHook(owner, repository, url, ctype, token)
     events.map { event: WebHook.Event =>
-      WebHookEvents insert WebHookEvent(owner, repository, url, event)
+      RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
     }
   }
 
   def updateWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
-    WebHooks.filter(_.byPrimaryKey(owner, repository, url)).map(w => (w.ctype, w.token)).update((ctype, token))
-    WebHookEvents.filter(_.byWebHook(owner, repository, url)).delete
+    RepositoryWebHooks.filter(_.byPrimaryKey(owner, repository, url)).map(w => (w.ctype, w.token)).update((ctype, token))
+    RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete
     events.map { event: WebHook.Event =>
-      WebHookEvents insert WebHookEvent(owner, repository, url, event)
+      RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
     }
   }
 
   def deleteWebHook(owner: String, repository: String, url :String)(implicit s: Session): Unit =
-    WebHooks.filter(_.byPrimaryKey(owner, repository, url)).delete
+    RepositoryWebHooks.filter(_.byPrimaryKey(owner, repository, url)).delete
+
+  /** get All AccountWebHook informations of user */
+  def getAccountWebHooks(owner: String)(implicit s: Session): List[(AccountWebHook, Set[WebHook.Event])] =
+    AccountWebHooks.filter(_.byAccount(owner))
+      .join(AccountWebHookEvents).on { (w, t) => t.byAccountWebHook(w) }
+      .map { case (w, t) => w -> t.event }
+      .list.groupBy(_._1).mapValues(_.map(_._2).toSet).toList.sortBy(_._1.url)
+
+  /** get All AccountWebHook informations of repository event */
+  def getAccountWebHooksByEvent(owner: String, event: WebHook.Event)(implicit s: Session): List[AccountWebHook] =
+    AccountWebHooks.filter(_.byAccount(owner))
+      .join(AccountWebHookEvents).on { (wh, whe) => whe.byAccountWebHook(wh) }
+      .filter { case (wh, whe) => whe.event === event.bind}
+      .map{ case (wh, whe) => wh }
+      .list.distinct
+
+  /** get All AccountWebHook information from repository to url */
+  def getAccountWebHook(owner: String, url: String)(implicit s: Session): Option[(AccountWebHook, Set[WebHook.Event])] =
+    AccountWebHooks
+      .filter(_.byPrimaryKey(owner, url))
+      .join(AccountWebHookEvents).on { (w, t) => t.byAccountWebHook(w) }
+      .map { case (w, t) => w -> t.event }
+      .list.groupBy(_._1).mapValues(_.map(_._2).toSet).headOption
+
+  def addAccountWebHook(owner: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
+    AccountWebHooks insert AccountWebHook(owner, url, ctype, token)
+    events.map { event: WebHook.Event =>
+      AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
+    }
+  }
+
+  def updateAccountWebHook(owner: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
+    AccountWebHooks.filter(_.byPrimaryKey(owner, url)).map(w => (w.ctype, w.token)).update((ctype, token))
+    AccountWebHookEvents.filter(_.byAccountWebHook(owner, url)).delete
+    events.map { event: WebHook.Event =>
+      AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
+    }
+  }
+
+  def deleteAccountWebHook(owner: String, url :String)(implicit s: Session): Unit =
+    AccountWebHooks.filter(_.byPrimaryKey(owner, url)).delete
 
   def callWebHookOf(owner: String, repository: String, event: WebHook.Event)(makePayload: => Option[WebHookPayload])
                    (implicit s: Session, c: JsonFormat.Context): Unit = {
@@ -78,6 +119,10 @@ trait WebHookService {
     if(webHooks.nonEmpty){
       makePayload.map(callWebHook(event, webHooks, _))
     }
+    val accountWebHooks = getAccountWebHooksByEvent(owner, event)
+    if(accountWebHooks.nonEmpty){
+      makePayload.map(callWebHook(event, accountWebHooks, _))
+    }
   }
 
   def callWebHook(event: WebHook.Event, webHooks: List[WebHook], payload: WebHookPayload)
@@ -160,7 +205,7 @@ trait WebHookPullRequestService extends WebHookService {
   import WebHookService._
   // https://developer.github.com/v3/activity/events/types/#issuesevent
   def callIssuesWebHook(action: String, repository: RepositoryService.RepositoryInfo, issue: Issue, baseUrl: String, sender: Account)
-                       (implicit s: Session, context:JsonFormat.Context): Unit = {
+                       (implicit s: Session, context: JsonFormat.Context): Unit = {
     callWebHookOf(repository.owner, repository.name, WebHook.Issues){
       val users = getAccountsByUserNames(Set(repository.owner, issue.openedUserName), Set(sender))
       for{
@@ -178,7 +223,7 @@ trait WebHookPullRequestService extends WebHookService {
   }
 
   def callPullRequestWebHook(action: String, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account)
-                            (implicit s: Session, context:JsonFormat.Context): Unit = {
+                            (implicit s: Session, c: JsonFormat.Context): Unit = {
     import WebHookService._
     callWebHookOf(repository.owner, repository.name, WebHook.PullRequest){
       for{
@@ -207,7 +252,7 @@ trait WebHookPullRequestService extends WebHookService {
 
   /** @return Map[(issue, issueUser, pullRequest, baseOwner, headOwner), webHooks] */
   def getPullRequestsByRequestForWebhook(userName:String, repositoryName:String, branch:String)
-                                       (implicit s: Session): Map[(Issue, Account, PullRequest, Account, Account), List[WebHook]] =
+                                       (implicit s: Session): Map[(Issue, Account, PullRequest, Account, Account), List[RepositoryWebHook]] =
     (for{
       is <- Issues if is.closed    === false.bind
       pr <- PullRequests if pr.byPrimaryKey(is.userName, is.repositoryName, is.issueId)
@@ -217,14 +262,14 @@ trait WebHookPullRequestService extends WebHookService {
       bu <- Accounts if bu.userName === pr.userName
       ru <- Accounts if ru.userName === pr.requestUserName
       iu <- Accounts if iu.userName === is.openedUserName
-      wh <- WebHooks if wh.byRepository(is.userName , is.repositoryName)
-      wht <- WebHookEvents if wht.event === WebHook.PullRequest.asInstanceOf[WebHook.Event].bind && wht.byWebHook(wh)
+      wh <- RepositoryWebHooks if wh.byRepository(is.userName , is.repositoryName)
+      wht <- RepositoryWebHookEvents if wht.event === WebHook.PullRequest.asInstanceOf[WebHook.Event].bind && wht.byRepositoryWebHook(wh)
     } yield {
       ((is, iu, pr, bu, ru), wh)
     }).list.groupBy(_._1).mapValues(_.map(_._2))
 
   def callPullRequestWebHookByRequestBranch(action: String, requestRepository: RepositoryService.RepositoryInfo, requestBranch: String, baseUrl: String, sender: Account)
-                                           (implicit s: Session, context:JsonFormat.Context): Unit = {
+                                           (implicit s: Session, c: JsonFormat.Context): Unit = {
     import WebHookService._
     for{
       ((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch)
@@ -246,12 +291,13 @@ trait WebHookPullRequestService extends WebHookService {
       callWebHook(WebHook.PullRequest, webHooks, payload)
     }
   }
+
 }
 
 trait WebHookPullRequestReviewCommentService extends WebHookService {
   self: AccountService with RepositoryService with PullRequestService with IssuesService with CommitsService =>
   def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account)
-                                         (implicit s: Session, context:JsonFormat.Context): Unit = {
+                                         (implicit s: Session, c: JsonFormat.Context): Unit = {
     import WebHookService._
     callWebHookOf(repository.owner, repository.name, WebHook.PullRequestReviewComment){
       for{
@@ -285,7 +331,7 @@ trait WebHookIssueCommentService extends WebHookPullRequestService {
 
   import WebHookService._
   def callIssueCommentWebHook(repository: RepositoryService.RepositoryInfo, issue: Issue, issueCommentId: Int, sender: Account)
-                             (implicit s: Session, context:JsonFormat.Context): Unit = {
+                             (implicit s: Session, c: JsonFormat.Context): Unit = {
     callWebHookOf(repository.owner, repository.name, WebHook.IssueComment){
       for{
         issueComment <- getComment(repository.owner, repository.name, issueCommentId.toString())
@@ -344,6 +390,17 @@ object WebHookService {
           repositoryInfo,
           owner= ApiUser(repositoryOwner))
       )
+
+    def createDummyPayload(sender: Account): WebHookPushPayload =
+      WebHookPushPayload(
+        pusher = ApiPusher(sender),
+        sender = ApiUser(sender),
+        ref = "refs/heads/master",
+        before = "adc83b19e793491b1c6ea0fd8b46cd9f32e592fc",
+        after = "adc83b19e793491b1c6ea0fd8b46cd9f32e592fc",
+        commits = List.empty,
+        repository = ApiRepository.forDummyPayload(ApiUser(sender))
+      )
   }
 
   // https://developer.github.com/v3/activity/events/types/#issuesevent
@@ -470,4 +527,53 @@ object WebHookService {
         sender       = senderPayload)
     }
   }
+
+  // https://developer.github.com/v3/activity/events/types/#gollumevent
+  case class WebHookGollumPayload(
+    pages: Seq[WebHookGollumPagePayload],
+    repository: ApiRepository,
+    sender: ApiUser
+  ) extends WebHookPayload
+
+  case class WebHookGollumPagePayload(
+    page_name: String,
+    title: String,
+    summary: Option[String] = None,
+    action: String, // created or edited
+    sha: String, // SHA of the latest commit
+    html_url: ApiPath
+  )
+
+  object WebHookGollumPayload {
+    def apply(
+      action: String,
+      pageName: String,
+      sha: String,
+      repository: RepositoryInfo,
+      repositoryUser: Account,
+      sender: Account
+    ): WebHookGollumPayload = apply(Seq((action, pageName, sha)), repository, repositoryUser, sender)
+
+    def apply(
+      pages: Seq[(String, String, String)],
+      repository: RepositoryInfo,
+      repositoryUser: Account,
+      sender: Account
+    ): WebHookGollumPayload = {
+      WebHookGollumPayload(
+        pages = pages.map { case (action, pageName, sha) =>
+          WebHookGollumPagePayload(
+            action = action,
+            page_name = pageName,
+            title = pageName,
+            sha = sha,
+            html_url = ApiPath(s"/${RepositoryName(repository).fullName}/wiki/${StringUtil.urlDecode(pageName)}")
+          )
+        },
+        repository = ApiRepository(repository, repositoryUser),
+        sender = ApiUser(sender)
+      )
+    }
+  }
+
 }

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

@@ -1,6 +1,7 @@
 package gitbucket.core.servlet
 
 import java.io.File
+import java.util
 import java.util.Date
 
 import gitbucket.core.api
@@ -22,6 +23,7 @@ import org.slf4j.LoggerFactory
 import javax.servlet.ServletConfig
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 
+import org.eclipse.jgit.diff.DiffEntry.ChangeType
 import org.json4s.jackson.Serialization._
 
 
@@ -161,6 +163,12 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
             receivePack.setPostReceiveHook(hook)
           }
         }
+
+        if(repository.endsWith(".wiki")){
+          defining(request) { implicit r =>
+            receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.replaceFirst("\\.wiki$", ""), pusher, baseUrl))
+          }
+        }
       }
     }
 
@@ -170,7 +178,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)/*(implicit session: Session)*/
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)
   extends PostReceiveHook with PreReceiveHook
   with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
   with WebHookPullRequestService with CommitsService {
@@ -185,7 +193,8 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
           // call pre-commit hook
           PluginRegistry().getReceiveHooks
             .flatMap(_.preReceive(owner, repository, receivePack, command, pusher))
-            .headOption.foreach { error =>
+            .headOption
+            .foreach { error =>
               command.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON, error)
             }
         }
@@ -285,8 +294,10 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
 
             // call web hook
             callWebHookOf(owner, repository, WebHook.Push) {
-              for (pusherAccount <- getAccountByUserName(pusher);
-                   ownerAccount <- getAccountByUserName(owner)) yield {
+              for {
+                pusherAccount <- getAccountByUserName(pusher)
+                ownerAccount  <- getAccountByUserName(owner)
+              } yield {
                 WebHookPushPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount,
                   newId = command.getNewId(), oldId = command.getOldId())
               }
@@ -309,6 +320,67 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
 
 }
 
+class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String)
+  extends PostReceiveHook with WebHookService with AccountService with RepositoryService {
+
+  private val logger = LoggerFactory.getLogger(classOf[WikiCommitHook])
+
+  override def onPostReceive(receivePack: ReceivePack, commands: util.Collection[ReceiveCommand]): Unit = {
+    Database() withTransaction { implicit session =>
+      try {
+        commands.asScala.headOption.foreach { command =>
+          implicit val apiContext = api.JsonFormat.Context(baseUrl)
+          val refName = command.getRefName.split("/")
+          val commitIds = if (refName(1) == "tags") {
+            None
+          } else {
+            command.getType match {
+              case ReceiveCommand.Type.DELETE => None
+              case _ => Some((command.getOldId.getName, command.getNewId.name))
+            }
+          }
+
+          commitIds.map { case (oldCommitId, newCommitId) =>
+            val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
+              JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit =>
+                val diffs = JGitUtil.getDiffs(git, commit.id, false)
+                diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") =>
+                  val action = if(diff.changeType == ChangeType.ADD) "created" else "edited"
+                  val fileName = diff.newPath
+                  println(action + " - " + fileName + " - " + commit.id)
+                  (action, fileName, commit.id)
+                }
+              }
+            }
+
+            val pages = commits
+              .groupBy { case (action, fileName, commitId) => fileName }
+              .map { case (fileName, commits) =>
+                (commits.head._1, fileName, commits.last._3)
+              }
+
+            callWebHookOf(owner, repository, WebHook.Gollum) {
+              for {
+                pusherAccount  <- getAccountByUserName(pusher)
+                repositoryUser <- getAccountByUserName(owner)
+                repositoryInfo <- getRepository(owner, repository)
+              } yield {
+                WebHookGollumPayload(pages.toSeq, repositoryInfo, repositoryUser, pusherAccount)
+              }
+            }
+          }
+        }
+      } catch {
+        case ex: Exception => {
+          logger.error(ex.toString, ex)
+          throw ex
+        }
+      }
+    }
+  }
+
+}
+
 object GitLfs {
 
   case class BatchRequest(

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

@@ -4,11 +4,15 @@ import com.typesafe.config.ConfigFactory
 import java.io.File
 
 import Directory._
-import com.github.takezoe.slick.blocking.{BlockingH2Driver, BlockingMySQLDriver, BlockingJdbcProfile}
+import ConfigUtil._
+import com.github.takezoe.slick.blocking.{BlockingH2Driver, BlockingJdbcProfile, BlockingMySQLDriver}
+import gitbucket.core.util.SyntaxSugars.defining
 import liquibase.database.AbstractJdbcDatabase
 import liquibase.database.core.{H2Database, MySQLDatabase, PostgresDatabase}
 import org.apache.commons.io.FileUtils
 
+import scala.reflect.ClassTag
+
 object DatabaseConfig {
 
   private lazy val config = {
@@ -30,14 +34,14 @@ object DatabaseConfig {
     ConfigFactory.parseFile(file)
   }
 
-  private lazy val dbUrl = config.getString("db.url")
+  private lazy val dbUrl = getValue("db.url", config.getString) //config.getString("db.url")
 
   def url(directory: Option[String]): String =
     dbUrl.replace("${DatabaseHome}", directory.getOrElse(DatabaseHome))
 
   lazy val url                : String = url(None)
-  lazy val user               : String = config.getString("db.user")
-  lazy val password           : String = config.getString("db.password")
+  lazy val user               : String = getValue("db.user", config.getString)
+  lazy val password           : String = getValue("db.password", config.getString)
   lazy val jdbcDriver         : String = DatabaseType(url).jdbcDriver
   lazy val slickDriver        : BlockingJdbcProfile  = DatabaseType(url).slickDriver
   lazy val liquiDriver        : AbstractJdbcDatabase = DatabaseType(url).liquiDriver
@@ -47,8 +51,16 @@ object DatabaseConfig {
   lazy val minimumIdle        : Option[Int]    = getOptionValue("db.minimumIdle"      , config.getInt)
   lazy val maximumPoolSize    : Option[Int]    = getOptionValue("db.maximumPoolSize"  , config.getInt)
 
+  private def getValue[T](path: String, f: String => T): T = {
+    getSystemProperty(path).getOrElse(getEnvironmentVariable(path).getOrElse{
+      f(path)
+    })
+  }
+
   private def getOptionValue[T](path: String, f: String => T): Option[T] = {
+    getSystemProperty(path).orElse(getEnvironmentVariable(path).orElse {
       if(config.hasPath(path)) Some(f(path)) else None
+    })
   }
 
 }
@@ -99,3 +111,33 @@ object DatabaseType {
     }
   }
 }
+
+object ConfigUtil {
+
+  def getEnvironmentVariable[A](key: String): Option[A] = {
+    val value = System.getenv("GITBUCKET_" + key.toUpperCase.replace('.', '_'))
+    if(value != null && value.nonEmpty){
+      Some(convertType(value)).asInstanceOf[Option[A]]
+    } else {
+      None
+    }
+  }
+
+  def getSystemProperty[A](key: String): Option[A] = {
+    val value = System.getProperty("gitbucket." + key)
+    if(value != null && value.nonEmpty){
+      Some(convertType(value)).asInstanceOf[Option[A]]
+    } else {
+      None
+    }
+  }
+
+  def convertType[A: ClassTag](value: String) =
+    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
+      if(c == classOf[Boolean])  value.toBoolean
+      else if(c == classOf[Long]) value.toLong
+      else if(c == classOf[Int]) value.toInt
+      else value
+    }
+
+}

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

@@ -13,14 +13,86 @@ import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
 import org.slf4j.LoggerFactory
 import gitbucket.core.controller.Context
 import SystemSettingsService.Smtp
-import SyntaxSugars.defining
 
-trait Notifier extends RepositoryService with AccountService with IssuesService {
+/**
+ * The trait for notifications.
+ * This is used by notifications plugin, which provides notifications feature on GitBucket.
+ * Please see the plugin for details.
+ */
+trait Notifier {
 
-  def toNotify(r: RepositoryService.RepositoryInfo, issue: Issue, content: String)
-      (msg: String => String)(implicit context: Context): Unit
+  def toNotify(subject: String, msg: String)
+              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit
 
-  protected def recipients(issue: Issue, loginAccount: Account)(notify: String => Unit)(implicit session: Session) =
+}
+
+object Notifier {
+  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
+    case settings if (settings.notification && settings.useSMTP) => new Mailer(settings.smtp.get)
+    case _ => new MockMailer
+  }
+
+
+  // TODO This class is temporary keeping the current feature until Notifications Plugin is available.
+  class IssueHook extends gitbucket.core.plugin.IssueHook
+    with RepositoryService with AccountService with IssuesService {
+
+    override def created(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+      Notifier().toNotify(
+        subject(issue, r),
+        message(issue.content getOrElse "", r)(content => s"""
+          |$content<br/>
+          |--<br/>
+          |<a href="${s"${context.baseUrl}/${r.owner}/${r.name}/issues/${issue.issueId}"}">View it on GitBucket</a>
+          """.stripMargin)
+      )(recipients(issue))
+    }
+
+    override def addedComment(commentId: Int, content: String, issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+      Notifier().toNotify(
+        subject(issue, r),
+        message(content, r)(content => s"""
+          |$content<br/>
+          |--<br/>
+          |<a href="${s"${context.baseUrl}/${r.owner}/${r.name}/issues/${issue.issueId}#comment-$commentId"}">View it on GitBucket</a>
+          """.stripMargin)
+      )(recipients(issue))
+    }
+
+    override def closed(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+      Notifier().toNotify(
+        subject(issue, r),
+        message("close", r)(content => s"""
+          |$content <a href="${s"${context.baseUrl}/${r.owner}/${r.name}/issues/${issue.issueId}"}">#${issue.issueId}</a>
+          """.stripMargin)
+      )(recipients(issue))
+    }
+
+    override def reopened(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+      Notifier().toNotify(
+        subject(issue, r),
+        message("reopen", r)(content => s"""
+          |$content <a href="${s"${context.baseUrl}/${r.owner}/${r.name}/issues/${issue.issueId}"}">#${issue.issueId}</a>
+          """.stripMargin)
+      )(recipients(issue))
+    }
+
+
+    protected def subject(issue: Issue, r: RepositoryService.RepositoryInfo): String =
+      s"[${r.owner}/${r.name}] ${issue.title} (#${issue.issueId})"
+
+    protected def message(content: String, r: RepositoryService.RepositoryInfo)(msg: String => String)(implicit context: Context): String =
+      msg(Markdown.toHtml(
+        markdown         = content,
+        repository       = r,
+        enableWikiLink   = false,
+        enableRefsLink   = true,
+        enableAnchor     = false,
+        enableLineBreaks = false
+      ))
+
+    protected val recipients: Issue => Account => Session => Seq[String] = {
+      issue => loginAccount => implicit session =>
         (
           // individual repository's owner
           issue.userName ::
@@ -34,66 +106,64 @@ trait Notifier extends RepositoryService with AccountService with IssuesService
         )
         .distinct
         .withFilter ( _ != loginAccount.userName )  // the operation in person is excluded
-    .foreach (
+        .flatMap (
           getAccountByUserName(_)
             .filterNot (_.isGroupAccount)
-        .filterNot (LDAPUtil.isDummyMailAddress(_))
-        .foreach (x => notify(x.mailAddress))
+            .filterNot (LDAPUtil.isDummyMailAddress)
+            .map (_.mailAddress)
         )
-}
-
-object Notifier {
-  // TODO We want to be able to switch to mock.
-  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
-    case settings if (settings.notification && settings.useSMTP) => new Mailer(settings.smtp.get)
-    case _ => new MockMailer
+    }
   }
 
-  def msgIssue(url: String) = (content: String) => s"""
-    |${content}<br/>
-    |--<br/>
-    |<a href="${url}">View it on GitBucket</a>
-    """.stripMargin
-
-  def msgPullRequest(url: String) = (content: String) => s"""
-    |${content}<hr/>
+  // TODO This class is temporary keeping the current feature until Notifications Plugin is available.
+  class PullRequestHook extends IssueHook with gitbucket.core.plugin.PullRequestHook {
+    override def created(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+      val url = s"${context.baseUrl}/${r.owner}/${r.name}/pull/${issue.issueId}"
+      Notifier().toNotify(
+        subject(issue, r),
+        message(issue.content getOrElse "", r)(content => s"""
+          |$content<hr/>
           |View, comment on, or merge it at:<br/>
-    |<a href="${url}">${url}</a>
-    """.stripMargin
+          |<a href="$url">$url</a>
+          """.stripMargin)
+      )(recipients(issue))
+    }
 
-  def msgComment(url: String) = (content: String) => s"""
-    |${content}<br/>
+    override def addedComment(commentId: Int, content: String, issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+      Notifier().toNotify(
+        subject(issue, r),
+        message(content, r)(content => s"""
+          |$content<br/>
           |--<br/>
-    |<a href="${url}">View it on GitBucket</a>
-    """.stripMargin
+          |<a href="${s"${context.baseUrl}/${r.owner}/${r.name}/pull/${issue.issueId}#comment-$commentId"}">View it on GitBucket</a>
+          """.stripMargin)
+      )(recipients(issue))
+    }
+
+    override def merged(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+      Notifier().toNotify(
+        subject(issue, r),
+        message("merge", r)(content => s"""
+          |$content <a href="${s"${context.baseUrl}/${r.owner}/${r.name}/pull/${issue.issueId}"}">#${issue.issueId}</a>
+          """.stripMargin)
+      )(recipients(issue))
+    }
+  }
 
-  def msgStatus(url: String) = (content: String) => s"""
-    |${content} <a href="${url}">#${url split('/') last}</a>
-    """.stripMargin
 }
 
 class Mailer(private val smtp: Smtp) extends Notifier {
   private val logger = LoggerFactory.getLogger(classOf[Mailer])
 
-  def toNotify(r: RepositoryService.RepositoryInfo, issue: Issue, content: String)
-      (msg: String => String)(implicit context: Context): Unit = {
+  def toNotify(subject: String, msg: String)
+              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
     context.loginAccount.foreach { loginAccount =>
       val database = Database()
 
       val f = Future {
-        database withSession { implicit session =>
-          defining(
-            s"[${r.owner}/${r.name}] ${issue.title} (#${issue.issueId})" ->
-              msg(Markdown.toHtml(
-                markdown         = content,
-                repository       = r,
-                enableWikiLink   = false,
-                enableRefsLink   = true,
-                enableAnchor     = false,
-                enableLineBreaks = false
-              ))
-          ) { case (subject, msg) =>
-            recipients(issue, loginAccount) { to => send(to, subject, msg, loginAccount) }
+        database withSession { session =>
+          recipients(loginAccount)(session) foreach { to =>
+            send(to, subject, msg, loginAccount)
           }
         }
         "Notifications Successful."
@@ -137,6 +207,6 @@ class Mailer(private val smtp: Smtp) extends Notifier {
 
 }
 class MockMailer extends Notifier {
-  def toNotify(r: RepositoryService.RepositoryInfo, issue: Issue, content: String)
-      (msg: String => String)(implicit context: Context): Unit = {}
+  def toNotify(subject: String, msg: String)
+              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
 }

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

@@ -1,7 +1,7 @@
 package gitbucket.core.util
 
 // TODO Move to gitbucket.core.api package?
-case class RepositoryName(owner:String, name:String){
+case class RepositoryName(owner: String, name: String){
   val fullName = s"${owner}/${name}"
 }
 

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

@@ -136,6 +136,4 @@ object StringUtil {
 //    }
 //    b.toString
 //  }
-
-
 }

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

@@ -19,6 +19,19 @@ trait Validations {
       }
   }
 
+  /**
+   * Constraint for the password.
+   */
+  def password: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(!value.matches("[a-zA-Z0-9\\-_.]+")){
+        Some(s"${name} contains invalid character.")
+      } else {
+        None
+      }
+  }
+
+
   /**
    * Constraint for the repository identifier.
    */

src/main/scala/gitbucket/core/view/Markdown.scala

@@ -38,7 +38,6 @@ object Markdown {
     val source = if(enableTaskList) escapeTaskList(markdown) else markdown
 
     val options = new Options()
-    options.setSanitize(true)
     options.setBreaks(enableLineBreaks)
 
     val renderer = new GitBucketMarkedRenderer(options, repository,

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

@@ -2,8 +2,7 @@
   personalTokens: List[gitbucket.core.model.AccessToken],
   gneratedToken: Option[(gitbucket.core.model.AccessToken, String)])(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main("Applications"){
-<div class="container body">
-  @gitbucket.core.account.html.menu("application", context.settings.ssh){
+  @gitbucket.core.account.html.menu("application", context.loginAccount.get.userName, false){
     <div class="panel panel-default">
       <div class="panel-heading strong">Personal access tokens</div>
       <div class="panel-body">
@@ -49,5 +48,4 @@
       </div>
     </form>
   }
-</div>
 }

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

@@ -0,0 +1,14 @@
+@(members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@gitbucket.core.html.main("Create group"){
+  <div class="content-wrapper main-center">
+    <div class="content body">
+      <h2>Create group</h2>
+      <form id="form" method="post" action="@context.path/groups/new" validate="true">
+        @gitbucket.core.account.html.groupform(None, members, false)
+        <fieldset class="border-top">
+          <input type="submit" class="btn btn-success" value="Create group"/>
+        </fieldset>
+      </form>
+    </div>
+  </div>
+}

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

@@ -2,8 +2,7 @@
 @import gitbucket.core.util.LDAPUtil
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Edit your profile"){
-<div class="container body">
-  @gitbucket.core.account.html.menu("profile", context.settings.ssh){
+  @gitbucket.core.account.html.menu("profile", context.loginAccount.get.userName, false){
     @gitbucket.core.helper.html.information(info)
     @gitbucket.core.helper.html.error(error)
     @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
@@ -61,7 +60,6 @@
       </div>
     </form>
   }
-</div>
 }
 <script>
 $(function(){

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

@@ -0,0 +1,19 @@
+@(account: gitbucket.core.model.Account,
+  members: List[gitbucket.core.model.GroupMember],
+  info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Edit group"){
+  @gitbucket.core.account.html.menu("profile", account.userName, true){
+    @gitbucket.core.helper.html.information(info)
+    <h2>Edit group</h2>
+    <form id="form" method="post" action="@context.path/@account.userName/_editgroup" validate="true">
+      @gitbucket.core.account.html.groupform(Some(account), members, false)
+      <fieldset class="border-top">
+        <div class="pull-right">
+          <a href="@helpers.url(account.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
+        </div>
+        <input type="submit" class="btn btn-success" value="Update group"/>
+      </fieldset>
+    </form>
+  }
+}

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

@@ -0,0 +1,16 @@
+@(webHook: gitbucket.core.model.AccountWebHook,
+  events: Set[gitbucket.core.model.WebHook.Event],
+  account: gitbucket.core.model.Account,
+  create: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Service Hooks"){
+  @gitbucket.core.account.html.menu("hooks", account.userName, account.isGroupAccount){
+    @gitbucket.core.settings.html.edithookform(
+      webHook, events, create,
+      helpers.url(account.userName) + "/_hooks/new",
+      helpers.url(account.userName) + "/_hooks/edit",
+      helpers.url(account.userName) + "/_hooks/delete",
+      helpers.url(account.userName) + "/_hooks/test"
+    )
+  }
+}

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

@@ -1,145 +0,0 @@
-@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.view.helpers
-@gitbucket.core.html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div class="content-wrapper main-center">
-  <div class="content body">
-    <h2>@{if(account.isEmpty) "Create group" else "Edit group"}</h2>
-    <form id="form" method="post" action="@if(account.isEmpty){@context.path/groups/new} else {@context.path/@account.get.userName/_editgroup}" validate="true">
-      <div class="row">
-        <div class="col-md-5">
-          <fieldset class="form-group">
-            <label for="groupName" class="strong">Group name</label>
-            <div>
-              <span id="error-groupName" class="error"></span>
-            </div>
-            <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-          </fieldset>
-          <fieldset class="form-group">
-            <label class="strong">URL (Optional)</label>
-            <div>
-              <span id="error-url" class="error"></span>
-            </div>
-            <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
-          </fieldset>
-          <fieldset class="form-group">
-            <label for="groupDescription" class="strong">Description (Optional)</label>
-            <div>
-              <textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
-            </div>
-          </fieldset>
-          <fieldset class="form-group">
-            <label for="avatar" class="strong">Image (Optional)</label>
-            @gitbucket.core.helper.html.uploadavatar(account)
-          </fieldset>
-        </div>
-        <div class="col-md-7">
-          <fieldset class="form-group">
-            <label class="strong">Members</label>
-            <ul id="member-list" class="collaborator">
-            </ul>
-            @gitbucket.core.helper.html.account("memberName", 200, true, false)
-            <input type="button" class="btn btn-default" value="Add" id="addMember"/>
-            <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
-            <div>
-              <span class="error" id="error-members"></span>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-      <fieldset class="border-top">
-        @if(account.isDefined){
-          <div class="pull-right">
-            <a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
-          </div>
-        }
-        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
-        @if(account.isDefined){
-          <a href="@helpers.url(account.get.userName)" class="btn btn-default">Cancel</a>
-        }
-      </fieldset>
-    </form>
-  </div>
-</div>
-}
-<script>
-$(function(){
-  $('input[type=submit]').click(function(){
-    updateMembers();
-  });
-
-  $('#addMember').click(function(){
-    $('#error-members').text('');
-    var userName = $('#memberName').val();
-
-    // check empty
-    if($.trim(userName) == ''){
-      return false;
-    }
-
-    // check duplication
-    var exists = $('#member-list li').filter(function(){
-      return $(this).data('name') == userName;
-    }).length > 0;
-    if(exists){
-      $('#error-members').text('User has been already added.');
-      return false;
-    }
-
-    // check existence
-    $.post('@context.path/_user/existence', { 'userName': userName },
-      function(data, status){
-        if(data == 'user'){
-          addMemberHTML(userName, false);
-        } else {
-          $('#error-members').text('User does not exist.');
-        }
-      });
-  });
-
-  $(document).on('click', '.remove', function(){
-    $(this).parent().remove();
-  });
-
-  // Don't submit form by ENTER key
-  $('#memberName').keypress(function(e){
-    return !(e.keyCode == 13);
-  });
-
-  $('#delete').click(function(){
-    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
-  });
-
-  @members.map { member =>
-    addMemberHTML('@member.userName', @member.isManager);
-  }
-
-  function addMemberHTML(userName, isManager){
-    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 = $('<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">')
-        .append(memberButton)
-        .append(managerButton))
-      .append(' ')
-      .append($('<a>').attr('href', '@context.path/' + userName).text(userName))
-      .append(' ')
-      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
-  }
-
-  function updateMembers(){
-    var members = $('#member-list li').map(function(i, e){
-      var userName = $(e).data('name');
-      return userName + ':' + $(e).find('label.active input[type=radio]').attr('value');
-    }).get().join(',');
-    $('#members').val(members);
-  }
-});
-</script>

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

@@ -0,0 +1,132 @@
+@(account: Option[gitbucket.core.model.Account],
+  members: List[gitbucket.core.model.GroupMember],
+  admin: Boolean)(implicit context: gitbucket.core.controller.Context)
+<div class="row">
+  <div class="col-md-5">
+    <fieldset class="form-group">
+      <label for="groupName" class="strong">Group name</label>
+      <div>
+        <span id="error-groupName" class="error"></span>
+      </div>
+      <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+      @if(account.isDefined && admin){
+        <label for="removed">
+          <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
+          Disable
+        </label>
+      }
+    </fieldset>
+    <fieldset class="form-group">
+      <label class="strong">URL (Optional)</label>
+      <div>
+        <span id="error-url" class="error"></span>
+      </div>
+      <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
+    </fieldset>
+    <fieldset class="form-group">
+      <label for="groupDescription" class="strong">Description (Optional)</label>
+      <div>
+        <textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
+      </div>
+    </fieldset>
+    <fieldset class="form-group">
+      <label for="avatar" class="strong">Image (Optional)</label>
+      @gitbucket.core.helper.html.uploadavatar(account)
+    </fieldset>
+  </div>
+  <div class="col-md-7">
+    <fieldset class="form-group">
+      <label class="strong">Members</label>
+      <ul id="member-list" class="collaborator">
+      </ul>
+      @gitbucket.core.helper.html.account("memberName", 200, true, false)
+      <input type="button" class="btn btn-default" value="Add" id="addMember"/>
+      <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
+      <div>
+        <span class="error" id="error-members"></span>
+      </div>
+    </fieldset>
+  </div>
+</div>
+<script>
+$(function(){
+  $('input[type=submit]').click(function(){
+    updateMembers();
+  });
+
+  $('#addMember').click(function(){
+    $('#error-members').text('');
+    var userName = $('#memberName').val();
+
+    // check empty
+    if($.trim(userName) == ''){
+      return false;
+    }
+
+    // check duplication
+    var exists = $('#member-list li').filter(function(){
+      return $(this).data('name') == userName;
+    }).length > 0;
+    if(exists){
+      $('#error-members').text('User has been already added.');
+      return false;
+    }
+
+    // check existence
+    $.post('@context.path/_user/existence', { 'userName': userName },
+      function(data, status){
+        if(data == 'user'){
+          addMemberHTML(userName, false);
+        } else {
+          $('#error-members').text('User does not exist.');
+        }
+      });
+  });
+
+  $(document).on('click', '.remove', function(){
+    $(this).parent().remove();
+  });
+
+  // Don't submit form by ENTER key
+  $('#memberName').keypress(function(e){
+    return !(e.keyCode == 13);
+  });
+
+  $('#delete').click(function(){
+    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
+  });
+
+  @members.map { member =>
+    addMemberHTML('@member.userName', @member.isManager);
+  }
+
+  function addMemberHTML(userName, isManager){
+    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 = $('<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">')
+        .append(memberButton)
+        .append(managerButton))
+      .append(' ')
+      .append($('<a>').attr('href', '@context.path/' + userName).text(userName))
+      .append(' ')
+      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
+  }
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $(e).find('label.active input[type=radio]').attr('value');
+    }).get().join(',');
+    $('#members').val(members);
+  }
+});
+</script>

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

@@ -0,0 +1,42 @@
+@(account: gitbucket.core.model.Account,
+  webHooks: List[(gitbucket.core.model.AccountWebHook, Set[gitbucket.core.model.WebHook.Event])],
+  info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Service Hooks"){
+  @gitbucket.core.account.html.menu("hooks", account.userName, account.isGroupAccount){
+    @gitbucket.core.helper.html.information(info)
+    <div class="panel panel-default">
+      <div class="panel-heading strong">
+        Webhooks
+      </div>
+      <div class="panel-body">
+        <p>
+          Webhooks allow external services to be notified when certain events happen within your repository.
+          When the specified events happen, we’ll send a POST request to each of the URLs you provide.
+          Learn more in <a href="https://github.com/takezoe/gitbucket/wiki/API-WebHook" target="_blank">GitBucket Wiki Webhook Page</a>.
+        </p>
+        <a href="@helpers.url(account.userName)/_hooks/new" class="btn btn-success pull-right" style="margin-bottom: 10px;">Add webhook</a>
+
+        <table class="table table-condensed" style="margin-bottom:0px;">
+          @webHooks.map { case (webHook, events) =>
+          <tr><td style="vertical-align: middle;">
+            <a href="@helpers.url(account.userName)/_hooks/edit?url=@helpers.urlEncode(webHook.url)" class="css-truncate" style="max-width:360px">
+              <span class="css-truncate-target">@webHook.url</span>
+            </a>
+            <em class="css-truncate" style="max-width: 225px;">(<span class="css-truncate-target">@events.map(_.name).mkString(", ")</span>)</em>
+          </td><td>
+            <div class="btn-group pull-right">
+              <a href="@helpers.url(account.userName)/_hooks/edit?url=@helpers.urlEncode(webHook.url)" class="btn btn-default">
+                <span class="octicon octicon-pencil"></span>
+              </a>
+              <a href="@helpers.url(account.userName)/_hooks/delete?url=@helpers.urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
+                <span class="octicon octicon-x"></span>
+              </a>
+            </div>
+          </td></tr>
+          }
+        </table>
+      </div>
+    </div>
+  }
+}

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

@@ -43,6 +43,9 @@
         } else {
           <li@if(active == "activity"){ class="active"}><a href="@helpers.url(account.userName)?tab=activity">Public activity</a></li>
         }
+        @*
+        <li@if(active == "webhooks"){ class="active"}><a href="@helpers.url(account.userName)?tab=webhooks">Webhooks</a></li>
+        *@
         @gitbucket.core.plugin.PluginRegistry().getProfileTabs.map { tab =>
           @tab(account, context).map { link =>
             <li@if(active == link.id){ class="active"}><a href="@context.path/@link.path">@link.label</a></li>

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

@@ -1,25 +1,51 @@
-@(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@(active: String, userName: String, group: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
 <div class="main-sidebar">
   <div class="sidebar">
     <ul class="sidebar-menu">
-      <li@if(active=="profile"){ class="active"}>
-        <a href="@context.path/@context.loginAccount.get.userName/_edit">Profile</a>
+      @if(group){
+        <li class="menu-item-hover @if(active=="profile"){active}">
+          <a href="@context.path/@userName/_editgroup">
+            <i class="menu-icon octicon octicon-person"></i> <span>Profile</span>
+          </a>
         </li>
-      @if(ssh){
-      <li@if(active=="ssh"){ class="active"}>
-        <a href="@context.path/@context.loginAccount.get.userName/_ssh">SSH Keys</a>
+        <li class="menu-item-hover @if(active=="hooks"){active}">
+          <a href="@context.path/@userName/_hooks">
+            <i class="menu-icon octicon octicon-zap"></i> <span>Service Hooks</span>
+          </a>
+        </li>
+      } else {
+        <li class="menu-item-hover @if(active=="profile"){active}">
+          <a href="@context.path/@userName/_edit">
+            <i class="menu-icon octicon octicon-person"></i> <span>Profile</span>
+          </a>
+        </li>
+        @if(context.settings.ssh){
+          <li class="menu-item-hover @if(active=="ssh"){active}">
+            <a href="@context.path/@userName/_ssh">
+              <i class="menu-icon octicon octicon-key"></i> <span>SSH Keys</span>
+            </a>
           </li>
         }
-      <li@if(active=="application"){ class="active"}>
-        <a href="@context.path/@context.loginAccount.get.userName/_application">Applications</a>
+        <li class="menu-item-hover @if(active=="application"){active}">
+          <a href="@context.path/@userName/_application">
+            <i class="menu-icon octicon octicon-rocket"></i> <span>Applications</span>
+          </a>
+        </li>
+        <li class="menu-item-hover @if(active=="hooks"){active}">
+          <a href="@context.path/@userName/_hooks">
+            <i class="menu-icon octicon octicon-zap"></i> <span>Service Hooks</span>
+          </a>
         </li>
         @gitbucket.core.plugin.PluginRegistry().getAccountSettingMenus.map { menu =>
           @menu(context).map { link =>
-          <li@if(active==link.id){ class="active"}>
-            <a href="@context.path/@link.path">@link.label</a>
+            <li class="menu-item-hover @if(active==link.id){active}">
+              <a href="@context.path/@link.path">
+                <i class="menu-icon octicon octicon-plug"></i> <span>@link.label</span>
+              </a>
             </li>
           }
         }
+      }
     </ul>
   </div>
 </div>

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

@@ -1,8 +1,7 @@
 @(account: gitbucket.core.model.Account, sshKeys: List[gitbucket.core.model.SshKey])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.ssh.SshUtil
 @gitbucket.core.html.main("SSH Keys"){
-<div class="container body">
-  @gitbucket.core.account.html.menu("ssh", context.settings.ssh){
+  @gitbucket.core.account.html.menu("ssh", context.loginAccount.get.userName, false){
     <div class="panel panel-default">
       <div class="panel-heading strong">SSH Keys</div>
       <div class="panel-body">
@@ -37,5 +36,4 @@
       </div>
     </form>
   }
-</div>
 }

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

@@ -2,25 +2,42 @@
 <div class="main-sidebar">
   <div class="sidebar">
     <ul class="sidebar-menu" id="system-admin-menu-container">
-      <li@if(active=="users"){ class="active"}>
-        <a href="@context.path/admin/users">User management</a>
+      <li class="menu-item-hover @if(active=="users"){active}">
+        <a href="@context.path/admin/users">
+          <i class="menu-icon octicon octicon-person"></i>
+          <span>User management</span>
+        </a>
       </li>
-      <li@if(active=="system"){ class="active"}>
-        <a href="@context.path/admin/system">System settings</a>
+      <li class="menu-item-hover @if(active=="system"){active}">
+        <a href="@context.path/admin/system">
+          <i class="menu-icon octicon octicon-gear"></i>
+          <span>System settings</span></a>
       </li>
-      <li@if(active=="plugins"){ class="active"}>
-        <a href="@context.path/admin/plugins">Plugins</a>
+      <li class="menu-item-hover @if(active=="plugins"){active}">
+        <a href="@context.path/admin/plugins">
+          <i class="menu-icon octicon octicon-plug"></i>
+          <span>Plugins</span>
+        </a>
       </li>
-      <li@if(active=="data"){ class="active"}>
-        <a href="@context.path/admin/data">Data export / import</a>
+      <li class="menu-item-hover @if(active=="data"){active}">
+        <a href="@context.path/admin/data">
+          <i class="menu-icon octicon octicon-database"></i>
+          <span>Data export / import</span>
+        </a>
       </li>
-      <li>
-        <a href="@context.path/console/login.jsp" target="_blank">H2 console</a>
+      <li class="menu-item-hover">
+        <a href="@context.path/console/login.jsp" target="_blank">
+          <i class="menu-icon octicon octicon-database"></i>
+          <span>H2 console</span>
+        </a>
       </li>
       @gitbucket.core.plugin.PluginRegistry().getSystemSettingMenus.map { menu =>
         @menu(context).map { link =>
           <li@if(active==link.id){ class="active"}>
-            <a href="@context.path/@link.path">@link.label</a>
+            <a href="@context.path/@link.path">
+              <i class="menu-icon octicon octicon-plug"></i>
+              <span>@link.label</span>
+            </a>
           </li>
         }
       }

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

@@ -1,134 +1,19 @@
 @(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
 @gitbucket.core.html.main(if(account.isEmpty) "New group" else "Update group"){
   @gitbucket.core.admin.html.menu("users"){
-    <form method="POST" action="@if(account.isEmpty){@context.path/admin/users/_newgroup} else {@context.path/admin/users/@account.get.userName/_editgroup}" validate="true">
-      <div class="row">
-        <div class="col-md-6">
-          <fieldset class="form-group">
-            <label for="groupName" class="strong">Group name</label>
-            <div>
-              <span id="error-groupName" class="error"></span>
-            </div>
-            <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-            @if(account.isDefined){
-              <label for="removed">
-                <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
-                Disable
-              </label>
-            }
-          </fieldset>
-          <fieldset class="form-group">
-            <label class="strong">URL (Optional)</label>
-            <div>
-              <span id="error-url" class="error"></span>
-            </div>
-            <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
-          </fieldset>
-          <fieldset class="form-group">
-            <label class="strong">Description (Optional)</label>
-            <textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
-          </fieldset>
-          <fieldset class="form-group">
-            <label for="avatar" class="strong">Image (Optional)</label>
-            @gitbucket.core.helper.html.uploadavatar(account)
-          </fieldset>
-        </div>
-        <div class="col-md-6">
-          <fieldset class="form-group">
-            <label class="strong">Members</label>
-            <ul id="member-list" class="collaborator">
-            </ul>
-            @gitbucket.core.helper.html.account("memberName", 200, true, false)
-            <input type="button" class="btn btn-default" value="Add" id="addMember"/>
-            <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
-            <div>
-              <span class="error" id="error-members"></span>
-            </div>
-          </fieldset>
-        </div>
-      </div>
+    <form id="form" method="post" action="@context.path/admin/users/@(account.map(x => s"${x.userName}/_editgroup").getOrElse("_newgroup"))" validate="true">
+      @gitbucket.core.account.html.groupform(account, members, true
+      )
       <fieldset class="border-top">
+        @if(account.isDefined){
+          <div class="pull-right">
+            <a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
+          </div>
+        }
         <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
         <a href="@context.path/admin/users" class="btn btn-default">Cancel</a>
       </fieldset>
     </form>
   }
 }
-<script>
-$(function(){
-  $('input[type=submit]').click(function(){
-    updateMembers();
-  });
-
-  $('#addMember').click(function(){
-    $('#error-members').text('');
-    var userName = $('#memberName').val();
-
-    // check empty
-    if($.trim(userName) == ''){
-      return false;
-    }
-
-    // check duplication
-    var exists = $('#member-list li').filter(function(){
-      return $(this).data('name') == userName;
-    }).length > 0;
-    if(exists){
-      $('#error-members').text('User has been already added.');
-      return false;
-    }
-
-    // check existence
-    $.post('@context.path/_user/existence', { 'userName': userName },
-      function(data, status){
-        if(data == 'user'){
-          addMemberHTML(userName, false);
-        } else {
-          $('#error-members').text('User does not exist.');
-        }
-      });
-  });
-
-  $(document).on('click', '.remove', function(){
-    $(this).parent().remove();
-  });
-
-  // Don't submit form by ENTER key
-  $('#memberName').keypress(function(e){
-    return !(e.keyCode == 13);
-  });
-
-  @members.map { member =>
-    addMemberHTML('@member.userName', @member.isManager);
-  }
-
-  function addMemberHTML(userName, isManager){
-    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 = $('<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">')
-        .append(memberButton)
-        .append(managerButton))
-      .append(' ')
-      .append($('<a>').attr('href', '@context.path/' + userName).text(userName))
-      .append(' ')
-      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
-  }
-
-  function updateMembers(){
-    var members = $('#member-list li').map(function(i, e){
-      var userName = $(e).data('name');
-      return userName + ':' + $(e).find('label.active input[type=radio]').attr('value');
-    }).get().join(',');
-    $('#members').val(members);
-  }
-});
-</script>

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

@@ -18,7 +18,7 @@
       </a>
     </li>
   }
-  @gitbucket.core.helper.html.dropdown("Organization"){
+  @gitbucket.core.helper.html.dropdown("Organization", filter = ("organization", "Find 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)">

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

@@ -17,7 +17,7 @@
     </tr>
   </thead>
   <tbody>
-    @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
+    @issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) =>
       <tr>
         <td style="padding-top: 12px; padding-bottom: 12px;">
           <a href="@context.path/@issue.userName/@issue.repositoryName">@issue.userName/@issue.repositoryName</a>&nbsp;&#xFF65;

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

@@ -14,11 +14,11 @@
     } else {
       <li><form class="sidebar-form"><input type="text" id="filter-box" class="form-control input-sm" placeholder="Find repository"/></form></li>
       @userRepositories.zipWithIndex.map { case (repository, i) =>
-        <li class="repo-link">
+        <li class="menu-item-hover">
           @if(repository.owner == context.loginAccount.get.userName){
             <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span class="strong">@repository.name</span></a>
           } else {
-            <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
+          <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span>@repository.owner/<span class="strong">@repository.name</span></span></a>
           }
         </li>
       }
@@ -30,8 +30,8 @@
     } else {
       <li><form class="sidebar-form"><input type="text" id="filter-box" class="form-control input-sm" placeholder="Find repository"/></form></li>
       @recentRepositories.zipWithIndex.map { case (repository, i) =>
-        <li class="repo-link">
-          <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
+        <li class="menu-item-hover">
+          <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span>@repository.owner/<span class="strong">@repository.name</span></span></a>
         </li>
       }
     }

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

@@ -286,11 +286,11 @@ $(function(){
     var table = diffText.closest("table[data-diff-id]");
     var i = table.data("diff-id");
     var ignoreWhiteSpace = table.find('.ignore-whitespace').prop('checked');
-    diffUsingJS('oldText-'+i, 'newText-'+i, diffText.attr('id'), viewType, ignoreWhiteSpace);
+    diffUsingJS('oldText-' + i, 'newText-' + i, diffText.attr('id'), viewType, ignoreWhiteSpace);
     var add = diffText.find("table").attr("add") * 1;
     var del = diffText.find("table").attr("del") * 1;
-    table.find(".diffstat").text(add+del+" ").append(renderStatBar(add,del)).attr("title",add+" additions & "+del+" deletions").tooltip();
-    $('span.diffstat[data-diff-id="'+i+'"]')
+    table.find(".diffstat").text(add + del + " ").append(renderStatBar(add, del)).attr("title", add + " additions & " + del + " deletions").tooltip();
+    $('span.diffstat[data-diff-id="' + i + '"]')
         .html('<span class="text-diff-added">+' + add + '</span><span class="text-diff-deleted">-' + del + '</span>')
         .append(renderStatBar(add, del).attr('title', (add + del) + " lines changed").tooltip());
 

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

@@ -2,8 +2,9 @@
   prefix: String  = "",
   style : String  = "",
   right : Boolean = false,
-  filter: String = "")(body: Html)
-<div class="btn-group" @if(style.nonEmpty){style="@style"}>
+  filter: (String, String)  = ("",""))(body: Html)
+@defining(if(filter._1.isEmpty) "" else filter._1 + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId =>
+  <div class="btn-group" @if(style.nonEmpty){style="@style"}>
     <button
         class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
       @if(value.isEmpty){
@@ -17,21 +18,21 @@
       <span class="caret"></span>
     </button>
     <ul class="dropdown-menu@if(right){ pull-right}">
-    @if(filter.nonEmpty) {
-      <li><input id="@filter-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="Filter"/></li>
+      @if(filterId.nonEmpty) {
+        <li><input id="@filterId-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="@filter._2"/></li>
       }
       @body
     </ul>
-</div>
-@if(filter.nonEmpty) {
-<script>
-$(function(){
-  $('#@{filter}-input').parent().click(function(e) {
+  </div>
+  @if(filterId.nonEmpty) {
+    <script>
+    $(window).load(function(){
+      $('#@{filterId}-input').parent().click(function(e) {
         e.stopPropagation();
       });
-  $('#@{filter}-input').keyup(function() {
-    var inputVal = $('#@{filter}-input').val();
-    $.each($('#@{filter}-input').parent().parent().find('a'), function(index, elem) {
+      $('#@{filterId}-input').keyup(function() {
+        var inputVal = $('#@{filterId}-input').val();
+        $.each($('#@{filterId}-input').parent().parent().find('a'), function(index, elem) {
           if ( !inputVal || !elem.text.trim() || elem.text.trim().toLowerCase().indexOf(inputVal.toLowerCase()) >=0 ) {
             $(elem).parent().show();
           } else {
@@ -39,6 +40,7 @@ $(function(){
           }
         });
       });
-});
-</script>
+    });
+    </script>
+  }
 }

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

@@ -44,6 +44,7 @@
 $(function(){
   @if(elastic){
     $('#content@uid').elastic();
+    $('#content@uid').trigger('blur');
   }
 
   $('#preview@uid').click(function(){

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

@@ -1,5 +1,7 @@
 @(collaborators: List[String],
   milestones: List[gitbucket.core.model.Milestone],
+  priorities: List[gitbucket.core.model.Priority],
+  defaultPriority: Option[gitbucket.core.model.Priority],
   labels: List[gitbucket.core.model.Label],
   isManageable: Boolean,
   content: String,
@@ -29,7 +31,7 @@
           </div>
         </div>
         <div class="col-md-3">
-          @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), labels, isManageable, repository)
+          @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), priorities, defaultPriority, labels, isManageable, repository)
         </div>
       </div>
     </form>

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

@@ -3,6 +3,7 @@
   issueLabels: List[gitbucket.core.model.Label],
   collaborators: List[String],
   milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+  priorities: List[gitbucket.core.model.Priority],
   labels: List[gitbucket.core.model.Label],
   isEditable: Boolean,
   isManageable: Boolean,
@@ -54,7 +55,7 @@
         @gitbucket.core.issues.html.commentform(issue, true, isEditable, isManageable, repository)
       </div>
       <div class="col-md-3">
-        @gitbucket.core.issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, isManageable, repository)
+        @gitbucket.core.issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, priorities, None, labels, isManageable, repository)
       </div>
     </div>
   }

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

@@ -3,6 +3,8 @@
   issueLabels: List[gitbucket.core.model.Label],
   collaborators: List[String],
   milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+  priorities: List[gitbucket.core.model.Priority],
+  defaultPriority: Option[gitbucket.core.model.Priority],
   labels: List[gitbucket.core.model.Label],
   isManageable: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
@@ -11,7 +13,7 @@
   <span class="muted small strong">Labels</span>
   @if(isManageable){
     <div class="pull-right">
-      @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "labels") {
+      @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("labels", "Filter Labels")) {
         @labels.map { label =>
           <li>
             <a href="#" class="toggle-label" data-label-id="@label.labelId">
@@ -32,11 +34,45 @@
   @gitbucket.core.issues.html.labellist(issueLabels)
 </ul>
 <hr/>
+
+<div style="margin-bottom: 14px;">
+  <span class="muted small strong">Priority</span>
+  @if(isManageable){
+    <div class="pull-right">
+      @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("priority", "Filter Priority")) {
+        <li><a href="javascript:void(0);" class="priority" data-id=""><i class="octicon octicon-x"></i> Clear priority</a></li>
+        @priorities.map { priority =>
+          <li>
+            <a href="javascript:void(0);" class="priority" data-id="@priority.priorityId" data-name="@priority.priorityName" data-color="#@priority.color" data-font-color="#@priority.fontColor"@if(!priority.description.isEmpty) { title="@priority.description.get" }>
+              @gitbucket.core.helper.html.checkicon(issue.flatMap(_.priorityId).orElse(defaultPriority.map(_.priorityId)).map(id => id == priority.priorityId).getOrElse(false))
+              <span class="label" style="background-color: #@priority.color;">&nbsp;</span>
+              @priority.priorityName
+            </a>
+          </li>
+        }
+      }
+    </div>
+  }
+</div>
+<span id="label-priority">
+  @issue.flatMap(_.priorityId).orElse(defaultPriority.map(_.priorityId)).map { priorityId =>
+    @priorities.collect { case priority if(priority.priorityId == priorityId) =>
+      <a class="issue-priority" style="background-color: #@priority.color; color: #@priority.fontColor;" href="@helpers.url(repository)/issues?priority=@helpers.urlEncode(priority.priorityName)&state=open"@if(!priority.description.isEmpty) { title="@priority.description.get" }>@priority.priorityName</a>
+    }
+  }.getOrElse {
+    <span class="muted small">No priority</span>
+  }
+</span>
+@if(issue.isEmpty){
+  <input type="hidden" name="priorityId" value="@defaultPriority.map(_.priorityId).map(_.toString).getOrElse("")"/>
+}
+<hr/>
+
 <div style="margin-bottom: 14px;">
   <span class="muted small strong">Milestone</span>
   @if(isManageable){
     <div class="pull-right">
-      @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "milestone") {
+      @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("milestone", "Filter Milestone")) {
         <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>
@@ -88,7 +124,7 @@
   <span class="muted small strong">Assignee</span>
   @if(isManageable){
     <div class="pull-right">
-      @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "assignee") {
+      @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("assignee", "Filter Assignee")) {
         <li><a href="javascript:void(0);" class="assign" data-name=""><i class="octicon octicon-x"></i> Clear assignee</a></li>
         @collaborators.map { collaborator =>
           <li>
@@ -112,6 +148,9 @@
   <input type="hidden" name="assignedUserName" value=""/>
 }
 @issue.map { issue =>
+  @gitbucket.core.plugin.PluginRegistry().getIssueSidebars.map { sidebar =>
+    @sidebar(issue, repository, context)
+  }
   <hr/>
   <div style="margin-bottom: 14px;">
     @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
@@ -149,6 +188,20 @@ $(function(){
     );
   });
 
+  $('a.priority').click(function(){
+    var priorityName = $(this).data('name');
+    var priorityId = $(this).data('id');
+    var description = $(this).attr('title');
+    var color = $(this).data('color');
+    var fontColor = $(this).data('font-color');
+    $.post('@helpers.url(repository)/issues/@issue.issueId/priority',
+      { priorityId: priorityId },
+      function(data){
+        displayPriority(priorityName, priorityId, description, color, fontColor);
+      }
+    );
+  });
+
   $('a.assign').click(function(){
     var $this = $(this);
     var userName = $this.data('name');
@@ -185,6 +238,16 @@ $(function(){
     $('input[name=milestoneId]').val(milestoneId);
   });
 
+  $('a.priority').click(function(){
+    var priorityName = $(this).data('name');
+    var priorityId = $(this).data('id');
+    var description = $(this).attr('title');
+    var color = $(this).data('color');
+    var fontColor = $(this).data('font-color');
+    displayPriority(priorityName, priorityId, description, color, fontColor);
+    $('input[name=priorityId]').val(priorityId);
+  });
+
   $('a.assign').click(function(){
     var $this = $(this);
     var userName = $this.data('name');
@@ -219,6 +282,23 @@ $(function(){
     }
   }
 
+  function displayPriority(priorityName, priorityId, description, color, fontColor){
+    $('a.priority i.octicon-check').removeClass('octicon-check');
+    if(priorityId == ''){
+      $('#label-priority').html($('<span class="muted small">').text('No priority'));
+    } else {
+      $('#label-priority').html($('<a class="issue-priority">').text(priorityName)
+        .attr('href', '@helpers.url(repository)/issues?priority=' + encodeURIComponent(priorityName) + '&state=open')
+        .attr('title', description)
+        .css({
+          "background-color": color,
+          "color": fontColor
+        }));
+
+      $('a.priority[data-id=' + priorityId + '] i').addClass('octicon-check');
+    }
+  }
+
   function displayAssignee($this, userName){
     $('a.assign i.octicon-check').removeClass('octicon-check');
     if(userName == ''){

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

@@ -3,6 +3,7 @@
   page: Int,
   collaborators: List[String],
   milestones: List[gitbucket.core.model.Milestone],
+  priorities: List[gitbucket.core.model.Priority],
   labels: List[gitbucket.core.model.Label],
   openCount: Int,
   closedCount: Int,
@@ -38,7 +39,7 @@
         }
       }
     </form>
-    @gitbucket.core.issues.html.listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), isManageable)
+    @gitbucket.core.issues.html.listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, priorities, labels, Some(repository), isManageable)
     @if(isManageable){
       <form id="batcheditForm" method="POST">
         <input type="hidden" name="value"/>
@@ -51,6 +52,7 @@
 @if(isManageable){
 <script>
 $(function(){
+  @*
   $('a.header-link').mouseover(function(e){
     var target = e.target;
     if(e.target.tagName != 'A'){
@@ -70,6 +72,7 @@ $(function(){
     $(target).children('img.header-icon-hover').css('display', 'none');
     $(target).children('img.header-icon'      ).css('display', 'inline');
   });
+  *@
 
   $('.table-issues input[type=checkbox]').change(function(){
     var all = $('.table-issues input[type=checkbox][value]');
@@ -117,6 +120,9 @@ $(function(){
   $('a.toggle-milestone').click(function(){
     submitBatchEdit('@helpers.url(repository)/issues/batchedit/milestone', $(this).data('id'));
   });
+  $('a.toggle-priority').click(function(){
+    submitBatchEdit('@helpers.url(repository)/issues/batchedit/priority', $(this).data('id'));
+  });
 });
 </script>
 }

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

@@ -6,6 +6,7 @@
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
   collaborators: List[String] = Nil,
   milestones: List[gitbucket.core.model.Milestone] = Nil,
+  priorities: List[gitbucket.core.model.Priority] = Nil,
   labels: List[gitbucket.core.model.Label] = Nil,
   repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None,
   isManageable: Boolean = false)(implicit context: gitbucket.core.controller.Context)
@@ -27,7 +28,7 @@
       <th style="background-color: #eee;">
         <input type="checkbox"/>
         <span id="table-issues-control">
-          @gitbucket.core.helper.html.dropdown("Author") {
+          @gitbucket.core.helper.html.dropdown("Author", filter = ("author", "Find Author...")) {
             @collaborators.map { collaborator =>
               <li>
                 <a href="@condition.copy(author = (if(condition.author == Some(collaborator)) None else Some(collaborator))).toURL">
@@ -37,7 +38,7 @@
               </li>
             }
           }
-          @gitbucket.core.helper.html.dropdown("Label") {
+          @gitbucket.core.helper.html.dropdown("Label", filter = ("label", "Find 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">
@@ -48,7 +49,23 @@
               </li>
             }
           }
-          @gitbucket.core.helper.html.dropdown("Milestone") {
+          @gitbucket.core.helper.html.dropdown("Priority", filter = ("priority", "Find Priority...")) {
+            <li>
+              <a href="@condition.copy(priority = (if(condition.priority == Some(None)) None else Some(None))).toURL">
+                @gitbucket.core.helper.html.checkicon(condition.priority == Some(None)) Issues with no priority
+              </a>
+            </li>
+            @priorities.map { priority =>
+              <li>
+                <a href="@condition.copy(priority = (if(condition.priority == Some(Some(priority.priorityName))) None else Some(Some(priority.priorityName)))).toURL"@if(!priority.description.isEmpty) { title="@priority.description.get" }>
+                  @gitbucket.core.helper.html.checkicon(condition.priority == Some(Some(priority.priorityName)))
+                  <span style="background-color: #@priority.color;" class="label-color">&nbsp;&nbsp;</span>
+                  @priority.priorityName
+                </a>
+              </li>
+            }
+          }
+          @gitbucket.core.helper.html.dropdown("Milestone", filter = ("milestone", "Find Milestone...")) {
             <li>
               <a href="@condition.copy(milestone = (if(condition.milestone == Some(None)) None else Some(None))).toURL">
                 @gitbucket.core.helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone
@@ -62,7 +79,7 @@
               </li>
             }
           }
-          @gitbucket.core.helper.html.dropdown("Assignee") {
+          @gitbucket.core.helper.html.dropdown("Assignee", filter = ("assignee", "Find Assignee...")) {
             <li>
               <a href="@condition.copy(assigned = (if(condition.assigned == Some(None)) None else Some(None))).toURL">
                 @gitbucket.core.helper.html.checkicon(condition.assigned == Some(None)) Assigned to nobody
@@ -88,6 +105,16 @@
                 @gitbucket.core.helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
               </a>
             </li>
+            <li>
+              <a href="@condition.copy(sort="priority", direction="asc").toURL">
+                @gitbucket.core.helper.html.checkicon(condition.sort == "priority"  && condition.direction == "asc") Highest priority
+              </a>
+            </li>
+            <li>
+              <a href="@condition.copy(sort="priority", direction="desc" ).toURL">
+                @gitbucket.core.helper.html.checkicon(condition.sort == "priority"  && condition.direction == "desc") Lowest priority
+              </a>
+            </li>
             <li>
               <a href="@condition.copy(sort="comments", direction="desc").toURL">
                 @gitbucket.core.helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
@@ -116,7 +143,7 @@
               <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>
             }
-            @gitbucket.core.helper.html.dropdown("Label") {
+            @gitbucket.core.helper.html.dropdown("Label", filter = ("label", "Find Label...")) {
               @labels.map { label =>
                 <li>
                   <a href="javascript:void(0);" class="toggle-label" data-id="@label.labelId">
@@ -127,13 +154,21 @@
                 </li>
               }
             }
-            @gitbucket.core.helper.html.dropdown("Milestone") {
+            @gitbucket.core.helper.html.dropdown("Priority", filter = ("priority", "Find Priority...")) {
+              <li><a href="javascript:void(0);" class="toggle-priority" data-id="">No priority</a></li>
+              @priorities.map { priority =>
+                <li><a href="javascript:void(0);" class="toggle-priority" data-id="@priority.priorityId"@if(!priority.description.isEmpty) { title="@priority.description.get" }>
+                  <span style="background-color: #@priority.color;" class="label">&nbsp;</span>
+                  @priority.priorityName</a></li>
+              }
+            }
+            @gitbucket.core.helper.html.dropdown("Milestone", filter = ("milestone", "Find 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>
               }
             }
-            @gitbucket.core.helper.html.dropdown("Assignee") {
+            @gitbucket.core.helper.html.dropdown("Assignee", filter = ("assignee", "Find 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>@helpers.avatar(collaborator, 20) @collaborator</a></li>
@@ -171,7 +206,7 @@
         </td>
       </tr>
     }
-    @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
+    @issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) =>
       <tr>
         <td style="padding-top: 12px; padding-bottom: 12px;">
           @if(isManageable){
@@ -208,6 +243,10 @@
           </span>
           <div class="small muted" style="margin-left: 12px; margin-top: 2px;">
             #@issue.issueId opened @gitbucket.core.helper.html.datetimeago(issue.registeredDate) by @helpers.user(issue.openedUserName, styleClass="username")
+            @priority.map(priority => priorities.filter(p => p.priorityName == priority).head).map { priority =>
+            <span style="margin: 20px;"><a href="@condition.copy(priority = Some(Some(priority.priorityName))).toURL" class="username"@if(!priority.description.isEmpty) { title="@priority.description.get" }><i class="octicon octicon-flame"></i>
+              <span class="issue-priority issue-priority-inline" style="background-color: #@priority.color; color: #@priority.fontColor;">@priority.priorityName</span></a></span>
+            }
             @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/priorities/edit.scala.html

@@ -0,0 +1,67 @@
+@(priority: Option[gitbucket.core.model.Priority],
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@defining(priority.map(_.priorityId).getOrElse("new")){ priorityId =>
+<div id="edit-priority-area-@priorityId">
+  <form class="form-inline">
+    <input type="text" id="priorityName-@priorityId" style="width: 300px; float: left; margin-right: 4px;" class="form-control" value="@priority.map(_.priorityName)"@if(priorityId == "new"){ placeholder="New priority name"}/>
+    <div id="priority-color-@priorityId" class="input-group color bscp" data-color="#@priority.map(_.color).getOrElse("888888")" data-color-format="hex" style="width: 100px; float: left;">
+      <input type="text" class="form-control" id="priorityColor-@priorityId" value="#@priority.map(_.color).getOrElse("888888")" style="width: 100px;">
+      <span class="input-group-addon"><i style="background-color: #@priority.map(_.color).getOrElse("888888");"></i></span>
+    </div>
+    <script>
+    $('div#priority-color-@priorityId').colorpicker({format: "hex"});
+    </script>
+    <input type="text" id="description-@priorityId" style="width: 500px; float: left; margin-left: 4px;" class="form-control" value="@priority.flatMap(_.description).getOrElse("")" placeholder="Description..." />
+    <span class="pull-right">
+      <span id="priority-error-@priorityId" class="error"></span>
+      <input type="button" id="cancel-@priorityId" class="btn btn-default priority-edit-cancel" value="Cancel">
+      <input type="button" id="submit-@priorityId" class="btn btn-success" style="margin-bottom: 0px;" value="@(if(priorityId == "new") "Create priority"  else "Save changes")"/>
+    </span>
+  </form>
+</div>
+<script>
+$(function(){
+  $('#submit-@priorityId').click(function(e){
+    $.post('@helpers.url(repository)/issues/priorities/@{if(priorityId == "new") "new" else priorityId + "/edit"}', {
+      'priorityName' : $('#priorityName-@priorityId').val(),
+      'description' : $('#description-@priorityId').val(),
+      'priorityColor': $('#priorityColor-@priorityId').val()
+    }, function(data, status){
+      $('div#edit-priority-area-@priorityId').remove();
+      @if(priorityId == "new"){
+        $('#new-priority-table').hide();
+        // Insert row into the top of table
+        $('#priorities-table tbody').append(data);
+      } else {
+        // Replace table row
+        $('#priority-row-@priorityId').after(data).remove();
+      }
+      $('#priority-no-priorities').hide();
+      updatePriorityCount();
+    }).fail(function(xhr, status, error){
+      var errors = JSON.parse(xhr.responseText);
+      if(errors.priorityName){
+        $('span#priority-error-@priorityId').text(errors.priorityName);
+      } else if(errors.description){
+        $('span#priority-error-@priorityId').text(errors.description);
+      } else if(errors.priorityColor){
+        $('span#priority-error-@priorityId').text(errors.priorityColor);
+      } else {
+        $('span#priority-error-@priorityId').text('error');
+      }
+    });
+    return false;
+  });
+
+  $('#cancel-@priorityId').click(function(e){
+    $('div#edit-priority-area-@priorityId').remove();
+    @if(priorityId == "new"){
+      $('#new-priority-table').hide();
+    } else {
+      $('#priority-@priorityId').show();
+    }
+  });
+});
+</script>
+}

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

@@ -0,0 +1,124 @@
+@(priorities: List[gitbucket.core.model.Priority],
+  counts: Map[String, Int],
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"Priorities - ${repository.owner}/${repository.name}"){
+  @gitbucket.core.html.menu("priorities", repository){
+    @if(hasWritePermission){
+      <div class="pull-right" style="margin-bottom: 10px;">
+        <a class="btn btn-success" href="javascript:void(0);" id="new-priority-button">New priority</a>
+      </div>
+    }
+    <table class="table table-bordered table-hover table-issues" id="new-priority-table" style="display: none;">
+      <tr><td></td></tr>
+    </table>
+    <table id="priorities-table" class="table table-bordered table-hover table-issues">
+      <thead>
+        <tr id="priority-row-header">
+          <th style="background-color: #eee;">
+            <span class="small">@priorities.size priorities</span>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        @priorities.map { priority =>
+          @gitbucket.core.issues.priorities.html.priority(priority, counts, repository, hasWritePermission)
+        }
+        <tr id="priority-no-priorities" @if(!priorities.isEmpty){ style="display:none" }>
+          <td style="padding: 20px; background-color: #eee; text-align: center;">
+            No priorities to show.
+            @if(hasWritePermission){
+              Click on the "New priority" button above to create one.
+            }
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  }
+}
+<script>
+$(function(){
+  $('#new-priority-button').click(function(e){
+    if($('#edit-priority-area-new').size() != 0){
+      $('div#edit-priority-area-new').remove();
+      $('#new-priority-table').hide();
+    } else {
+      $.get('@helpers.url(repository)/issues/priorities/new',
+        function(data){
+          $('#new-priority-table').show().find('tr td').append(data);
+        }
+      );
+    }
+  });
+  @if(hasWritePermission){
+    $('#priorities-table tbody').sortable({
+      axis: 'y',
+      cursor: 'move',
+      helper: function (e, ui) {
+        ui.children().each(function() {
+          $(this).width($(this).width());
+        });
+        return ui;
+      },
+      handle: '.priority-sort-handle',
+      update: function() {
+        var ids = [];
+        $('tr.priority-row').each(function(idx, elem) {
+          ids.push($(elem).attr('id').replace('priority-row-', ''));
+        });
+        $.post('@helpers.url(repository)/issues/priorities/reorder', {
+          'order' : ids.join(',')
+        }).fail(function(xhr, status, error){
+          alert('Unable to reorder priorities.');
+        });
+      }
+    });
+  }
+});
+
+function deletePriority(priorityId){
+  if(confirm('Once you delete this priority, there is no going back.\nAre you sure?')){
+    $.post('@helpers.url(repository)/issues/priorities/' + priorityId + '/delete', function(){
+      $('tr#priority-row-' + priorityId).remove();
+      if ($('tr.priority-row').size() == 0) {
+        $('#priority-no-priorities').show();
+      }
+      updatePriorityCount();
+    });
+  }
+}
+
+function editPriority(priorityId){
+  $.get('@helpers.url(repository)/issues/priorities/' + priorityId + '/edit',
+    function(data){
+      $('#priority-' + priorityId).hide().parent().append(data);
+    }
+  );
+}
+
+function updatePriorityCount() {
+  var $counter = $('#priority-row-header span');
+  $counter.text($counter.text().replace(/\d+/, $('tr.priority-row').size()));
+}
+
+function setDefaultPriority(priorityId){
+  var $a = $('a[data-id="' + priorityId + '"].priority-default');
+  var isDefault = $a.data('default');
+  $.post('@helpers.url(repository)/issues/priorities/default',
+    { priorityId: isDefault ? '' : priorityId },
+    function(){
+      $('.priority-default')
+        .removeClass('priority-default-selected')
+        .data('default', false)
+        .attr('title', 'Set as default');
+      if (!isDefault) {
+        $a
+          .addClass('priority-default-selected')
+          .data('default', true)
+          .attr('title', 'Unset as default');
+      }
+    }
+  );
+}
+</script>

src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html

@@ -0,0 +1,49 @@
+@(priority: gitbucket.core.model.Priority,
+  counts: Map[String, Int],
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+<tr id="priority-row-@priority.priorityId" class="priority-row">
+  <td style="padding-top: 15px; padding-bottom: 15px;">
+    <div class="milestone row" id="priority-@priority.priorityId">
+      <div class="col-md-2">
+        @if(hasWritePermission) {
+        <div class="pull-left priority-sort-handle" style="margin-top: 3px"><i class="octicon octicon-grabber"></i></div>
+        }
+        <div style="margin-top: 6px">
+          <a href="@helpers.url(repository)/issues?priority=@helpers.urlEncode(priority.priorityName)&state=open" id="priority-row-content-@priority.priorityId">
+            <span style="background-color: #@priority.color; color: #@priority.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
+              <i class="octicon octicon-flame" style="color: #@priority.fontColor;"></i>&nbsp;@priority.priorityName
+            </span>
+          </a>
+        </div>
+      </div>
+      <div class="@if(hasWritePermission){col-md-6} else {col-md-8}">
+        <span>@priority.description.getOrElse("")</span>
+      </div>
+      <div class="col-md-1">
+        <div class="pull-right">
+          @if(hasWritePermission){
+            <a href="javascript:void(0);" onclick="setDefaultPriority(@priority.priorityId)" data-id="@priority.priorityId" data-default="@priority.isDefault" class="priority-default@if(priority.isDefault){ priority-default-selected}" title="@if(priority.isDefault){Unset as default} else {Set as default}"><i class="octicon octicon-star"></i></a>
+          } else if(priority.isDefault) {
+            <i class="octicon octicon-star priority-default priority-default-selected" title="Default"></i>
+          }
+        </div>
+      </div>
+      <div class="col-md-1">
+        <div class="pull-right">
+          <span class="muted">@counts.get(priority.priorityName).getOrElse(0) open issues</span>
+        </div>
+      </div>
+      @if(hasWritePermission){
+        <div class="col-md-2">
+          <div class="pull-right">
+            <a href="javascript:void(0);" onclick="editPriority(@priority.priorityId)">Edit</a>
+            &nbsp;&nbsp;
+            <a href="javascript:void(0);" onclick="deletePriority(@priority.priorityId)">Delete</a>
+          </div>
+        </div>
+      }
+    </div>
+  </td>
+</tr>

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

@@ -15,11 +15,15 @@
     <link href="@helpers.assets("/vendors/colorpicker/css/bootstrap-colorpicker.css")" rel="stylesheet">
     <link href="@helpers.assets("/vendors/google-code-prettify/prettify.css")" type="text/css" rel="stylesheet"/>
     <link href="@helpers.assets("/vendors/facebox/facebox.css")" rel="stylesheet"/>
-    <link href="@helpers.assets("/vendors/AdminLTE-2.3.8/css/AdminLTE.min.css")" rel="stylesheet">
-    <link href="@helpers.assets("/vendors/AdminLTE-2.3.8/css/skins/skin-blue.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/AdminLTE-2.3.11/css/AdminLTE.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/AdminLTE-2.3.11/css/skins/skin-blue.min.css")" rel="stylesheet">
     <link href="@helpers.assets("/vendors/font-awesome-4.6.3/css/font-awesome.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/jquery-ui/jquery-ui.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/jquery-ui/jquery-ui.structure.min.css")" rel="stylesheet">
+    <link href="@helpers.assets("/vendors/jquery-ui/jquery-ui.theme.min.css")" rel="stylesheet">
     <link href="@helpers.assets("/common/css/gitbucket.css")" rel="stylesheet">
     <script src="@helpers.assets("/vendors/jquery/jquery-1.12.2.min.js")"></script>
+    <script src="@helpers.assets("/vendors/jquery-ui/jquery-ui.min.js")"></script>
     <script src="@helpers.assets("/vendors/dropzone/dropzone.js")"></script>
     <script src="@helpers.assets("/common/js/validation.js")"></script>
     <script src="@helpers.assets("/common/js/gitbucket.js")"></script>
@@ -36,9 +40,9 @@
     @repository.map { repository =>
       <meta name="go-import" content="@context.baseUrl.replaceFirst("^https?://", "")/@repository.owner/@repository.name git @repository.httpUrl" />
     }
-    <script src="@helpers.assets("/vendors/AdminLTE-2.3.8/js/app.js")" type="text/javascript"></script>
+    <script src="@helpers.assets("/vendors/AdminLTE-2.3.11/js/app.js")" type="text/javascript"></script>
   </head>
-  <body class="skin-blue page-load @if(context.sidebarCollapse){sidebar-collapse}">
+  <body class="skin-blue page-load @if(body.toString.contains("menu-item-hover")){sidebar-mini} @if(context.sidebarCollapse){sidebar-collapse}">
     <div class="wrapper">
       <header class="main-header">
         <a href="@context.path/" class="logo">
@@ -72,20 +76,26 @@
           <div class="navbar-custom-menu">
             <ul class="nav navbar-nav">
               @if(context.loginAccount.isDefined){
-                <li class="dropdown">
+                <li class="dropdown notifications-menu">
                   <a class="dropdown-toggle menu" data-toggle="dropdown" href="#">
                     <i class="octicon octicon-plus" style="color: black;"></i><span class="caret" style="color: black; vertical-align: middle;"></span>
                   </a>
-                  <ul class="dropdown-menu pull-right">
+                  <ul class="dropdown-menu pull-right" style="width: auto;">
+                    <li>
+                      <ul class="menu">
                         <li><a href="@context.path/new">New repository</a></li>
                         <li><a href="@context.path/groups/new">New group</a></li>
                       </ul>
                     </li>
-                <li class="dropdown">
+                  </ul>
+                </li>
+                <li class="dropdown notifications-menu">
                   <a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @context.loginAccount.get.userName">
                     @helpers.avatar(context.loginAccount.get.userName, 16)<span class="caret" style="color: black; vertical-align: middle;"></span>
                   </a>
-                  <ul class="dropdown-menu pull-right">
+                  <ul class="dropdown-menu pull-right" style="width: auto;">
+                    <li>
+                      <ul class="menu">
                         <li><a href="@helpers.url(context.loginAccount.get.userName)">Your profile</a></li>
                         <li><a href="@helpers.url(context.loginAccount.get.userName)/_edit">Account settings</a></li>
                         @if(context.loginAccount.get.isAdmin){
@@ -94,6 +104,8 @@
                         <li><a href="@context.path/signout">Sign out</a></li>
                       </ul>
                     </li>
+                  </ul>
+                </li>
               } else {
                 <li>
                   <a href="@context.path/signin?redirect=@helpers.urlEncode(context.currentPath)" class="pull-right" id="signin">Sign in</a>

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

@@ -6,20 +6,28 @@
 @import gitbucket.core.view.helpers
 
 @menuitem(path: String, name: String, label: String, icon: String, count: Int = 0) = {
-  <li @if(active == name){class="active"}>
+  <li class = "menu-item-hover @if(active == name){active}">
     @if(path.startsWith("http")){
       <a href="@path" target="_blank">
-        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right-container">@count</span> }
+        <i class="menu-icon octicon octicon-@icon"></i>
+        <span>@label</span>
+        @if(count > 0){
+          <span class="pull-right-container"><span class="label label-primary pull-right-container">@count</span></span>
+        }
       </a>
     } else {
       <a href="@helpers.url(repository)@path">
-        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right-container">@count</span> }
+        <i class="menu-icon octicon octicon-@icon"></i>
+        <span>@label</span>
+        @if(count > 0) {
+          <span class="pull-right-container"><span class="label label-primary pull-right">@count</span></span>
+        }
       </a>
     }
   </li>
 }
 
-  <div class="main-sidebar">
+<div class="main-sidebar">
   <div class="sidebar">
     <ul class="sidebar-menu">
       @menuitem("", "files", "Files", "code")
@@ -31,6 +39,7 @@
         @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/priorities", "priorities", "Priorities", "flame")
         @menuitem("/issues/milestones", "milestones", "Milestones", "milestone")
       } else {
         @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl =>
@@ -57,8 +66,8 @@
       }
     </ul>
   </div>
-  </div>
-  <div class="content-wrapper">
+</div>
+<div class="content-wrapper">
   <div class="content body clearfix">
     <div class="headbar">
       <div class="container">
@@ -83,6 +92,5 @@
     </div>
     @body
   </div>
-  </div>
 </div>
 

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

@@ -14,29 +14,30 @@
   hasOriginWritePermission: Boolean,
   collaborators: List[String],
   milestones: List[gitbucket.core.model.Milestone],
+  priorities: List[gitbucket.core.model.Priority],
   labels: List[gitbucket.core.model.Label])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"Pull requests - ${repository.owner}/${repository.name}", Some(repository)){
   @gitbucket.core.html.menu("pulls", repository){
     <div class="pullreq-info">
       <div id="compare-edit">
-        @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") {
+        @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork", filter=("origin_repo", "Find Repository...")) {
           @members.map { case (owner, name) =>
             <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
           }
         }
-        @gitbucket.core.helper.html.dropdown(originId, "base") {
+        @gitbucket.core.helper.html.dropdown(originId, "base", filter=("origin_branch", "Find Branch...")) {
           @originRepository.branchList.map { branch =>
             <li><a href="#" class="origin-branch" data-branch="@helpers.encodeRefName(branch)">@gitbucket.core.helper.html.checkicon(branch == originId) @branch</a></li>
           }
         }
         ...
-        @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") {
+        @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork", filter=("forked_repo", "Find Repository...")) {
           @members.map { case (owner, name) =>
             <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
           }
         }
-        @gitbucket.core.helper.html.dropdown(forkedId, "compare") {
+        @gitbucket.core.helper.html.dropdown(forkedId, "compare", filter=("forked_branch", "Find Branch...")) {
           @forkedRepository.branchList.map { branch =>
             <li><a href="#" class="forked-branch" data-branch="@helpers.encodeRefName(branch)">@gitbucket.core.helper.html.checkicon(branch == forkedId) @branch</a></li>
           }
@@ -81,7 +82,7 @@
               </div>
             </div>
             <div class="col-md-3">
-              @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), labels, hasOriginWritePermission, repository)
+              @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), priorities, None, labels, hasOriginWritePermission, repository)
             </div>
           </div>
         </form>
@@ -221,27 +222,3 @@ $(function(){
   }
 });
 </script>
-<script>
-  function dropdownFilter(dropdownItem,placeHolder,id) {
-    $('<li><input id="' + id + '" type="text" class="form-control input-sm dropdown-filter-input" placeholder="' + placeHolder + '"/></li>')
-      .insertBefore($("li:has(a" + dropdownItem + "):first"));
-    $('#'+id).keyup(function() {
-      var inputVal = $('#'+id).val();
-      $.each($('#'+id).parent().parent().find('a'), function(index, elem) {
-        if (!inputVal || !elem.text.trim() || elem.text.trim().toLowerCase().indexOf(inputVal.toLowerCase()) >= 0) {
-          $(elem).parent().show();
-        } else {
-          $(elem).parent().hide();
-        }
-      });
-    });
-  }
-
-  $(function(){
-    dropdownFilter('.origin-owner', 'Find Repository...', 'origin-owner-control-input');
-    dropdownFilter('.origin-branch','Find Branch...',     'origin-branch-control-input');
-    dropdownFilter('.forked-owner', 'Find Repository...', 'forked-owner-control-input');
-    dropdownFilter('.forked-branch','Find Branch...',     'forked-branch-control-input');
-  });
-</script>
-

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

@@ -1,13 +1,17 @@
 @(issue: gitbucket.core.model.Issue,
   pullreq: gitbucket.core.model.PullRequest,
+  commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo],
   comments: List[gitbucket.core.model.Comment],
   issueLabels: List[gitbucket.core.model.Label],
   collaborators: List[String],
   milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+  priorities: List[gitbucket.core.model.Priority],
   labels: List[gitbucket.core.model.Label],
   isEditable: Boolean,
   isManageable: Boolean,
-  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+  isManageableForkedRepository: Boolean,
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 <div class="col-md-9">
   <div id="comment-list">
@@ -26,11 +30,11 @@
         </div>
       </div>
     }
-    @if(isManageable && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
-      pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
+    @if(isManageableForkedRepository && issue.closed && merged &&
+      forkedRepository.map(r => (r.branchList.contains(pullreq.requestBranch) && r.repository.defaultBranch != pullreq.requestBranch)).getOrElse(false)){
       <div class="issue-comment-box" style="background-color: #d0eeff;">
         <div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">
-          <a href="@helpers.url(repository)/pull/@issue.issueId/delete/@helpers.encodeRefName(pullreq.requestBranch)" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
+          <a href="@helpers.url(repository)/pull/@issue.issueId/delete_branch" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
           <div>
             <span class="strong">Pull request successfully merged and closed</span>
           </div>
@@ -42,25 +46,19 @@
   }
 </div>
 <div class="col-md-3">
-  @gitbucket.core.issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, isManageable, repository)
+  @gitbucket.core.issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, priorities, None, labels, isManageable, repository)
 </div>
 <script>
 $(function(){
-  $('#cancel-merge-pull-request').click(function(){
-    $('#confirm-merge-form').hide();
-    $('#merge-pull-request').show();
-  });
-
+  @if(commits.nonEmpty){
     var checkConflict = $('.check-conflict').show();
     if(checkConflict.length){
       $.get('@helpers.url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); });
     }
-
-  @if(isManageable){
+  }
   $('.delete-branch').click(function(e){
     var branchName = $(e.target).data('name');
     return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
   });
-  }
 });
 </script>

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

@@ -4,12 +4,15 @@
   issueLabels: List[gitbucket.core.model.Label],
   collaborators: List[String],
   milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+  priorities: List[gitbucket.core.model.Priority],
   labels: List[gitbucket.core.model.Label],
   dayByDayCommits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
   diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
   isEditable: Boolean,
   isManageable: Boolean,
+  isManageableForkedRepository: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo],
   flash: Map[String, String])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @import gitbucket.core.model.IssueComment
@@ -83,13 +86,17 @@
           @flash.get("info").map{ info =>
             <div class="alert alert-info">@info</div>
           }
-          @gitbucket.core.pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, isEditable, isManageable, repository)
+          @gitbucket.core.pulls.html.conversation(issue, pullreq, commits, comments, issueLabels, collaborators, milestones, priorities, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository)
         </div>
         <div class="tab-pane" id="commits">
+          @if(commits.nonEmpty){
             @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository)
+          }
         </div>
         <div class="tab-pane" id="files">
-          @gitbucket.core.helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true, Some(pullreq.issueId), isManageable, true)
+          @if(commits.nonEmpty){
+            @gitbucket.core.helper.html.diff(diffs, repository, commits.headOption.map(_.id), commits.lastOption.map(_.id), true, Some(pullreq.issueId), isManageable, true)
+          }
         </div>
       </div>
     }

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

@@ -23,7 +23,7 @@
             </span>
           </td>
           <td class="branch-a-b-count">
-            @if(branch.mergeInfo.isEmpty){
+            @if(repository.repository.defaultBranch == branch.name){
               <span class="badge">Default</span>
             } else {
               @branch.mergeInfo.map{ info =>
@@ -38,6 +38,7 @@
           </td>
           <td>
             <div class="branch-action">
+              @if(repository.repository.defaultBranch != branch.name){
                 @branch.mergeInfo.map{ info =>
                   @prs.map{ case (pull, issue) =>
                     <a href="@helpers.url(repository)/pull/@issue.issueId" title="@issue.title">#@issue.issueId</a>
@@ -56,13 +57,13 @@
                         helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch)
                       }.getOrElse {
                         helpers.encodeRefName(repository.repository.defaultBranch)
-                  }}...@{helpers.encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull request</a>
+                      }}...@{helpers.encodeRefName(branch.name)}?expand=1" class="btn btn-default btn-sm">New Pull request</a>
                     } else {
                       <a href="@helpers.url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
                         helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch)
                       }.getOrElse {
                         helpers.encodeRefName(repository.repository.defaultBranch)
-                  }}...@{helpers.encodeRefName(branch.name)}" class="btn btn-default">Compare</a>
+                      }}...@{helpers.encodeRefName(branch.name)}" class="btn btn-default btn-sm">Compare</a>
                     }
                   }
                   @if(hasWritePermission){
@@ -79,6 +80,7 @@
                     </span>
                   }
                 }
+              }
             </div>
           </td>
         </tr>

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

@@ -8,10 +8,7 @@
 @import gitbucket.core.view.helpers
 @if(context.loginAccount.isDefined){
   @if(!fileName.isDefined){<hr/><br/>}
-  <form method="POST" validate="true" style="max-width: 874px;">
-    @if(!fileName.isDefined){
-      <div class="issue-avatar-image">@helpers.avatarLink(context.loginAccount.get.userName, 48)</div>
-    }
+  <form method="POST" validate="true">
     <div class="panel panel-default issue-comment-box">
       <div class="panel-body">
         @gitbucket.core.helper.html.preview(

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

@@ -2,11 +2,13 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   pathList: List[String],
   fileName: String,
-  content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
+  content: gitbucket.core.util.JGitUtil.ContentInfo,
+  commit: String)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"Deleting ${context.path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("files", repository){
     <form method="POST" action="@helpers.url(repository)/remove" validate="true">
+      <span class="error" id="error-commit"></span>
       <div class="head">
         <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
         @pathList.zipWithIndex.map { case (section, i) =>
@@ -16,14 +18,17 @@
         <input type="hidden" name="fileName" id="fileName" value="@fileName"/>
         <input type="hidden" name="branch" id="branch" value="@branch"/>
         <input type="hidden" name="path" id="path" value="@pathList.mkString("/")"/>
+        <input type="hidden" name="commit" id="commit" value="@commit"/>
       </div>
-      <table class="table table-bordered">
+      <table class="table table-bordered diff-outside">
+        <tr>
           <th style="font-weight: normal;" class="box-header">
-          @fileName
+            <span class="monospace">@fileName</span>
             <div class="pull-right align-right">
-            <a href="@helpers.url(repository)/blob/@branch/@{(pathList ::: List(fileName)).mkString("/")}" class="btn btn-small">View</a>
+              <a href="@helpers.url(repository)/blob/@branch/@{(pathList ::: List(fileName)).mkString("/")}" class="btn btn-default btn-sm">View</a>
             </div>
           </th>
+        </tr>
         <tr>
           <td>
             <div id="diffText"></div>
@@ -32,18 +37,17 @@
           </td>
         </tr>
       </table>
-      <div class="issue-avatar-image">@helpers.avatarLink(context.loginAccount.get.userName, 48)</div>
-        <div class="box issue-comment-box">
-        <div class="box-content">
+      <div class="panel panel-default issue-comment-box">
+        <div class="panel-body">
           <div>
             <strong>Commit changes</strong>
           </div>
-          <div>
-            <input type="text" name="message" style="width: 98%;"/>
+          <div class="form-group">
+            <input type="text" name="message" class="form-control"/>
           </div>
           <div style="text-align: right;">
             <a href="@helpers.url(repository)/blob/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-danger">Cancel</a>
-            <input type="submit" id="commit" class="btn btn-success" value="Commit changes"/>
+            <input type="submit" id="commitButton" class="btn btn-success" value="Commit changes"/>
           </div>
         </div>
       </div>

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

@@ -3,7 +3,8 @@
   pathList: List[String],
   fileName: Option[String],
   content: gitbucket.core.util.JGitUtil.ContentInfo,
-  protectedBranch: Boolean)(implicit context: gitbucket.core.controller.Context)
+  protectedBranch: Boolean,
+  commit: String)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("files", repository){
@@ -12,6 +13,7 @@
     }
     <form method="POST" action="@helpers.url(repository)/@if(fileName.isEmpty){create}else{update}" validate="true">
       <span class="error" id="error-newFileName"></span>
+      <span class="error" id="error-commit"></span>
       <div class="head">
         <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
         @pathList.zipWithIndex.map { case (section, i) =>
@@ -46,7 +48,6 @@
           </td>
         </tr>
       </table>
-      <div class="issue-avatar-image">@helpers.avatarLink(context.loginAccount.get.userName, 48)</div>
       <div class="panel panel-default issue-comment-box">
         <div class="panel-body">
           <div>
@@ -61,11 +62,12 @@
             } else {
               <a href="@helpers.url(repository)/blob/@helpers.encodeRefName(branch)/@{(pathList ++ Seq(fileName.get)).mkString("/")}" class="btn btn-danger">Cancel</a>
             }
-            <input type="submit" id="commit" class="btn btn-success" value="Commit changes" disabled="true"/>
+            <input type="submit" id="commitButton" class="btn btn-success" value="Commit changes" disabled="true"/>
             <input type="hidden" id="charset" name="charset" value="@content.charset"/>
             <input type="hidden" id="lineSeparator" name="lineSeparator" value="@content.lineSeparator"/>
             <input type="hidden" id="content" name="content" value=""/>
             <input type="hidden" id="initial" value="@content.content"/>
+            <input type="hidden" id="commit" name="commit" value="@commit"/>
           </div>
         </div>
       </div>
@@ -95,9 +97,9 @@ $(function(){
 
   function updateCommitButtonStatus(){
     if(editor.getValue() == $('#initial').val() && $('#newFileName').val() == $('#oldFileName').val()){
-      $('#commit').attr('disabled', true);
+      $('#commitButton').attr('disabled', true);
     } else {
-      $('#commit').attr('disabled', false);
+      $('#commitButton').attr('disabled', false);
     }
   }
 
@@ -113,7 +115,7 @@ $(function(){
     updateCommitButtonStatus();
   });
 
-  $('#commit').click(function(){
+  $('#commitButton').click(function(){
     $('#content').val(editor.getValue());
   });
 

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

@@ -22,7 +22,7 @@
     s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}"
   }, Some(repository)) {
   @gitbucket.core.html.menu("files", repository, Some(branch), info, error){
-    <div class="head">
+    <div class="head" style="height: 24px;">
       <div class="pull-right">
         <div class="btn-group">
           <a href="@helpers.url(repository)/find/@helpers.encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t"><i class="octicon octicon-search"></i></a>
@@ -67,27 +67,24 @@
           </div>
         </div>
       }
+      <div class="pull-left">
         @gitbucket.core.helper.html.branchcontrol(branch, repository, hasWritePermission){
           @repository.branchList.map { x =>
             <li><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(x)">@gitbucket.core.helper.html.checkicon(x == branch) @x</a></li>
           }
         }
-      @if(pathList.isEmpty){
-        @*
-        @branchPullRequest.map{ case (pullRequest, issue) =>
-          <a href="@url(repository)/pull/@pullRequest.issueId" class="btn btn-sm btn-pullrequest-branch" title="@issue.title" data-toggle="tooltip">View #@pullRequest.issueId</a>
-        }.getOrElse {
-          <a href="@url(repository)/compare?head=@urlEncode(encodeRefName(branch))" class="btn btn-sm btn-success" @if(loginAccount.isEmpty){disabled}>New pull request</a>
-        }
-        *@
-      } else {
+        @if(pathList.nonEmpty){
           <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
           @pathList.zipWithIndex.map { case (section, i) =>
             <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
           }
         }
+      </div>
       @if(hasWritePermission){
-        <a href="@helpers.url(repository)/new/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default pc" title="Create a new file here"><i class="octicon octicon-plus"></i></a>
+        <div class="btn-group pull-left" style="margin-left: 4px;">
+          <a href="@helpers.url(repository)/new/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default pc" title="Create a new file"><i class="octicon octicon-plus"></i></a>
+          <a href="@helpers.url(repository)/upload/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default pc" title="Upload files"><i class="octicon octicon-cloud-upload"></i></a>
+        </div>
       }
     </div>
     <table class="table table-hover">

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

@@ -0,0 +1,87 @@
+@(branch: String,
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  pathList: List[String],
+  protectedBranch: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@import gitbucket.core.util.FileUtil
+@gitbucket.core.html.main(s"Upload Files at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("files", repository){
+    @if(protectedBranch){
+      <div class="alert alert-danger">branch @branch is protected.</div>
+    }
+    <form method="POST" action="@helpers.url(repository)/upload" id="upload-form">
+      <div class="head">
+        <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
+        @pathList.zipWithIndex.map { case (section, i) =>
+          <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+        }
+        <input type="hidden" name="branch" id="branch" value="@branch"/>
+        <input type="hidden" name="path" id="path" value="@pathList.mkString("/")"/>
+      </div>
+      <table class="table table-bordered">
+        <tr>
+          <td id="upload-td">
+            <div id="upload-area">
+              Drag files here to add them to your repository
+            </div>
+            <ul id="upload-files">
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <div class="panel panel-default issue-comment-box">
+        <div class="panel-body">
+          <div>
+            <strong>Commit changes</strong>
+          </div>
+          <div class="form-group">
+            <input type="text" name="message" class="form-control"/>
+          </div>
+          <div style="text-align: right;">
+            <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@{pathList.mkString("/")}" class="btn btn-danger">Cancel</a>
+            <input type="submit" id="commit" class="btn btn-success" value="Commit changes" disabled="true"/>
+            <input type="hidden" id="upload-files-data" name="uploadFiles" value=""/>
+          </div>
+        </div>
+      </div>
+    </form>
+  }
+}
+<script>
+$(function(){
+  $('#upload-area').dropzone({
+    url: '@context.path/upload/tmp',
+    maxFilesize: 10,
+    clickable: true,
+    previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your files...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
+    success: function(file, id) {
+      file.previewElement.remove();
+      $('#upload-files').append($('<li class="upload-file">')
+        .append($('<span>').data('id', id).text(file.name))
+        .append($('<a class="delete" href="javascript:void(0);" style="margin-left: 4px;">(delete)</a>')));
+      updateCommitButtonStatus();
+    }
+  });
+
+  $('#upload-form').submit(function(){
+    try {
+      var data = '';
+      $.each($('li.upload-file span'), function(i, e){
+        data = data + $(e).data('id') + ':' + $(e).text() + '\n';
+      });
+      $('#upload-files-data').val(data);
+    } catch(e){
+      console.log(e);
+    }
+  });
+
+  $(document).on('click', 'a.delete', function(e){
+     $(e.target).parent().remove();
+    updateCommitButtonStatus();
+  });
+
+  function updateCommitButtonStatus(){
+    $('#commit').attr('disabled', $('.upload-file').length == 0);
+  }
+});
+</script>

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

@@ -0,0 +1,18 @@
+@(webHook: gitbucket.core.model.WebHook,
+  events: Set[gitbucket.core.model.WebHook.Event],
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  create: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Settings", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("hooks", repository){
+      @gitbucket.core.settings.html.edithookform(
+        webHook, events, create,
+        helpers.url(repository) + "/settings/hooks/new",
+        helpers.url(repository) + "/settings/hooks/edit",
+        helpers.url(repository) + "/settings/hooks/delete",
+        helpers.url(repository) + "/settings/hooks/test"
+      )
+    }
+  }
+}

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

@@ -0,0 +1,192 @@
+@(webHook: gitbucket.core.model.WebHook,
+  events: Set[gitbucket.core.model.WebHook.Event],
+  create: Boolean,
+  newButtonUrl: String,
+  editButtonUrl: String,
+  deleteButtonUrl: String,
+  testButtonUrl: String)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@import gitbucket.core.model.WebHook._
+@import gitbucket.core.model.WebHookContentType
+@check(name: String, event: Event) = {
+  name="@(name).@event.name" value="on" @if(events(event)){checked}
+}
+<div class="panel panel-default">
+  <div class="panel-heading strong">Webhook / Manage webhook</div>
+  <div class="panel-body">
+    <form method="POST" validate="true">
+      <fieldset class="form-group">
+        <label class="strong">Payload URL</label>
+        <div>
+          <span class="error" id="error-url"></span>
+        </div>
+        @if(create){
+          <input type="text" name="url" id="url" value="@webHook.url" class="form-control" style="display: inline; width: 500px; vertical-align: middle;" required />
+        } else {
+          <input type="text" value="@webHook.url" class="form-control" style="display: inline; width: 500px; vertical-align: middle;" disabled />
+          <input type="hidden" value="@webHook.url" name="url" />
+        }
+        <button class="btn btn-default" id="test">Test Hook</button>
+      </fieldset>
+      <fieldset class="form-group">
+        <label class="strong">Content type</label>
+        <div></div>
+        <select name="ctype" class="form-control" style="width: 500px;">
+          <option value="@WebHookContentType.FORM.code" @if(webHook.ctype == WebHookContentType.FORM){selected}>@WebHookContentType.FORM.ctype</option>
+          <option value="@WebHookContentType.JSON.code" @if(webHook.ctype == WebHookContentType.JSON){selected}>@WebHookContentType.JSON.ctype</option>
+        </select>
+      </fieldset>
+      <fieldset class="form-group">
+        <label class="strong">Security Token</label>
+        <div></div>
+        <input type="text" name="token" id="token" placeholder="leave blank for no X-Hub-Signature usage" value="@webHook.token" class="form-control" style="display: inline; width: 500px; vertical-align: middle;" />
+      </fieldset>
+      <hr />
+      <label class="strong">Which events would you like to trigger this webhook?</label>
+      <div>
+        <span class="error" id="error-events"></span>
+      </div>
+      <!--
+      <label class="checkbox"><input type="checkbox" @check("events",CommitComment) />Commit comment <small class="help-block">Commit or diff commented on. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Create) />Create <small class="help-block">Branch, or tag created. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Delete) />Delete <small class="help-block">Branch, or tag deleted. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Deployment) />Deployment <small class="help-block">Repository deployed. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",DeploymentStatus) />Deployment status <small class="help-block">Deployment status updated from the API. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Fork) />Fork <small class="help-block">Repository forked. </small> </label>
+      -->
+      <label class="checkbox"><input type="checkbox" @check("events",Gollum) />Gollum <span class="help-block normal">Wiki page updated. </span> </label>
+      <!--
+      <label class="checkbox"><input type="checkbox" @check("events",Member) />Member <small class="help-block">Collaborator added to a non-organization repository. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",PageBuild) />Page build <small class="help-block">Pages site built. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Public) />Public <small class="help-block">Repository changes from private to public. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Release) />Release <small class="help-block">Release published in a repository. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",TeamAdd) />Team add <small class="help-block">Team added or modified on a repository. </small> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Watch) />Watch <small class="help-block">User stars a repository.</small></label>
+      <label class="checkbox"><input type="checkbox" @check("events",Status) />Status <small class="help-block">Commit status updated from the API. </small> </label>
+      -->
+      <label class="checkbox"><input type="checkbox" @check("events",IssueComment) />Issue comment <span class="help-block normal">Issue commented on. </span> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Issues) />Issues <span class="help-block normal">Issue opened, closed<!-- , assigned, or labeled -->. </span> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",PullRequest) />Pull request <span class="help-block normal">Pull request opened, closed<!-- , assigned, labeled -->, or synchronized. </span> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",PullRequestReviewComment) />Pull request review comment <span class="help-block normal">Pull request diff commented on. </span> </label>
+      <label class="checkbox"><input type="checkbox" @check("events",Push) />Push <span class="help-block normal">Git push to a repository. </span> </label>
+      <div class="text-right">
+      @if(!create){
+        <input type="submit" class="btn btn-success" value="Update webhook" formaction="@editButtonUrl" />
+        <a href="@deleteButtonUrl?url=@helpers.urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
+          Delete webhook
+        </a>
+      } else {
+        <input type="submit" class="btn btn-success" value="Add webhook" formaction="@newButtonUrl" />
+      }
+      </div>
+    </form>
+  </div>
+</div>
+<div class="modal" id="test-report-modal" role="dialog" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>WebHook Test</h3>
+      </div>
+      <div class="modal-body" style="max-height: 300px; overflow: auto;">
+        <p>request to <span id="test-modal-url" style="word-break: break-all; word-wrap: break-word; white-space: pre; white-space: pre-wrap;"></span></p>
+        <div id="test-report" style="display:none">
+          <ul class="nav nav-tabs" id="test-report-tab">
+            <li class="active"><a href="#request">Request</a></li>
+            <li><a href="#response">Response <span class="badge badge-success" id="res-status"></span></a></li>
+          </ul>
+          <div class="tab-content">
+            <div class="tab-pane active" id="request">
+              <div id="req-errors" class="alert alert-error">
+                      ERROR<span id="req-errors-body"></span>
+                    </div>
+              <div id="req-success" style="display:none">
+                      Headers
+                <pre id="req-headers"></pre>
+                Payload
+                <pre id="req-payload"></pre>
+              </div>
+            </div>
+            <div class="tab-pane" id="response">
+              <div id="res-errors" class="alert alert-error">
+                      ERROR<span id="res-errors-body"></span>
+                    </div>
+              <div id="res-success" style="display:none">
+                      Headers
+                <pre id="res-headers"></pre>
+                Body
+                <pre id="res-body"></pre>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+<script>
+$(function(){
+  $('#test-report-tab a').click(function (e) {
+    e.preventDefault();
+    $(this).tab('show');
+  });
+  $('#test').click(function(e){
+    e.stopPropagation();
+    e.stopImmediatePropagation();
+    e.preventDefault();
+    var url = this.form.url.value;
+    var token = this.form.token.value;
+    var ctype = this.form.ctype.value;
+    if(!/^https?:\/\/.+/.test(url)){
+      alert("invalid url");
+      return;
+    }
+    $("#test-modal-url").text(url)
+    $("#test-report-modal").modal('show')
+    $("#test-report").hide();
+    var targetUrl = '@testButtonUrl?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token=';
+    if (token) {
+      targetUrl = targetUrl + encodeURIComponent(token);
+    }
+    $.ajax({
+      method:'POST',
+      url:targetUrl,
+      success: function(e){
+        //console.log(e);
+        $('#test-report-tab a:first').tab('show');
+        $("#test-report").show();
+        $("#req-success").toggle(e.request&&!e.request.error);
+        $("#req-errors").toggle(e.request&&!!e.request.error);
+        $("#req-errors-body").text(e.request.error);
+        function headers(h){
+          h = h["headers"];
+          return h ? $.map(h, function(h){
+            return $("<div>").append($('<b>').text(h[0] + ":"),$('<span>').text(" " + h[1]))
+          }):"";
+        }
+        $("#req-headers").html(headers(e.request));
+        $("#req-payload").text(e.request && e.request.payload ? JSON.stringify(JSON.parse(e.request.payload),undefined,4) : "");
+        $("#res-success").toggle(e.response && !e.response.error);
+        $("#res-errors").toggle(e.response && !!e.response.error);
+        $("#res-errors-body").text(e.response.error);
+        var success = !!(e.response && e.response.status && /^2\d\d$/.test(e.response.status.statusCode));
+        $("#res-status").text((e.response && e.response.status && e.response.status.statusCode) || "ERROR");
+        $("#res-status").toggleClass("badge-success", success).toggleClass("badge-important", !success);
+        $("#res-headers").html(headers(e.response));
+        $("#res-body").text(e.response && e.response.body ? e.response.body : "");
+      },
+      error:function (e) {
+        if(e) {
+          console.log(e.responseText, e);
+          alert("request error ( http status " + e.status + " error on gitbugket or browser to gitbucket. show details on your javascript console )");
+        }else{
+          alert("unknown javascript error (please report to gitbucket team)");
+        }
+        $("#test-report-modal").modal('hide')
+      }
+    });
+    return false;
+  });
+})
+</script>

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

@@ -1,195 +0,0 @@
-@(webHook: gitbucket.core.model.WebHook,
-  events: Set[gitbucket.core.model.WebHook.Event],
-  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  info: Option[Any],
-  create: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.view.helpers
-@import gitbucket.core.model.WebHook._
-@import gitbucket.core.model.WebHookContentType
-@check(name: String, event: Event) = {
-  name="@(name).@event.name" value="on" @if(events(event)){checked}
-}
-@gitbucket.core.html.main("Settings", Some(repository)){
-  @gitbucket.core.html.menu("settings", repository){
-    @gitbucket.core.settings.html.menu("hooks", repository){
-      @gitbucket.core.helper.html.information(info)
-      <div class="panel panel-default">
-        <div class="panel-heading strong">Webhook / Manage webhook</div>
-        <div class="panel-body">
-          <form method="POST" validate="true">
-            <fieldset class="form-group">
-              <label class="strong">Payload URL</label>
-              <div>
-                <span class="error" id="error-url"></span>
-              </div>
-              @if(create){
-                <input type="text" name="url" id="url" value="@webHook.url" class="form-control" style="display: inline; width: 500px; vertical-align: middle;" required />
-              } else {
-                <input type="text" value="@webHook.url" class="form-control" style="display: inline; width: 500px; vertical-align: middle;" disabled />
-                <input type="hidden" value="@webHook.url" name="url" />
-              }
-              <button class="btn btn-default" id="test">Test Hook</button>
-            </fieldset>
-            <fieldset class="form-group">
-              <label class="strong">Content type</label>
-              <div></div>
-              <select name="ctype" class="form-control" style="width: 500px;">
-              	<option value="@WebHookContentType.FORM.code" @if(webHook.ctype == WebHookContentType.FORM){selected}>@WebHookContentType.FORM.ctype</option>
-              	<option value="@WebHookContentType.JSON.code" @if(webHook.ctype == WebHookContentType.JSON){selected}>@WebHookContentType.JSON.ctype</option>
-               </select>
-            </fieldset>
-            <fieldset class="form-group">
-              <label class="strong">Security Token</label>
-              <div></div>
-              <input type="text" name="token" id="token" placeholder="leave blank for no X-Hub-Signature usage" value="@webHook.token" class="form-control" style="display: inline; width: 500px; vertical-align: middle;" />
-            </fieldset>
-            <hr />
-            <label class="strong">Which events would you like to trigger this webhook?</label>
-            <div>
-              <span class="error" id="error-events"></span>
-            </div>
-            <!--
-            <label class="checkbox"><input type="checkbox" @check("events",CommitComment) />Commit comment <small class="help-block">Commit or diff commented on. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Create) />Create <small class="help-block">Branch, or tag created. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Delete) />Delete <small class="help-block">Branch, or tag deleted. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Deployment) />Deployment <small class="help-block">Repository deployed. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",DeploymentStatus) />Deployment status <small class="help-block">Deployment status updated from the API. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Fork) />Fork <small class="help-block">Repository forked. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Gollum) />Gollum <small class="help-block">Wiki page updated. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Member) />Member <small class="help-block">Collaborator added to a non-organization repository. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",PageBuild) />Page build <small class="help-block">Pages site built. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Public) />Public <small class="help-block">Repository changes from private to public. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Release) />Release <small class="help-block">Release published in a repository. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",TeamAdd) />Team add <small class="help-block">Team added or modified on a repository. </small> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Watch) />Watch <small class="help-block">User stars a repository.</small></label>
-            <label class="checkbox"><input type="checkbox" @check("events",Status) />Status <small class="help-block">Commit status updated from the API. </small> </label>
-            -->
-            <label class="checkbox"><input type="checkbox" @check("events",IssueComment) />Issue comment <span class="help-block normal">Issue commented on. </span> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Issues) />Issues <span class="help-block normal">Issue opened, closed<!-- , assigned, or labeled -->. </span> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",PullRequest) />Pull request <span class="help-block normal">Pull request opened, closed<!-- , assigned, labeled -->, or synchronized. </span> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",PullRequestReviewComment) />Pull request review comment <span class="help-block normal">Pull request diff commented on. </span> </label>
-            <label class="checkbox"><input type="checkbox" @check("events",Push) />Push <span class="help-block normal">Git push to a repository. </span> </label>
-            <div class="text-right">
-              @if(!create){
-                <input type="submit" class="btn btn-success" value="Update webhook" formaction="@helpers.url(repository)/settings/hooks/edit" />
-                <a href="@helpers.url(repository)/settings/hooks/delete?url=@helpers.urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
-                  Delete webhook
-                </a>
-              } else {
-                <input type="submit" class="btn btn-success" value="Add webhook" formaction="@helpers.url(repository)/settings/hooks/new" />
-              }
-            </div>
-          </form>
-        </div>
-      </div>
-      <div class="modal" id="test-report-modal" role="dialog" tabindex="-1">
-        <div class="modal-dialog">
-          <div class="modal-content">
-            <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-              <h3>WebHook Test</h3>
-            </div>
-            <div class="modal-body" style="max-height: 300px; overflow: auto;">
-              <p>request to <span id="test-modal-url" style="word-break: break-all; word-wrap: break-word; white-space: pre; white-space: pre-wrap;"></span></p>
-              <div id="test-report" style="display:none">
-                <ul class="nav nav-tabs" id="test-report-tab">
-                  <li class="active"><a href="#request">Request</a></li>
-                  <li><a href="#response">Response <span class="badge badge-success" id="res-status"></span></a></li>
-                </ul>
-                <div class="tab-content">
-                  <div class="tab-pane active" id="request">
-                    <div id="req-errors" class="alert alert-error">
-                      ERROR<span id="req-errors-body"></span>
-                    </div>
-                    <div id="req-success" style="display:none">
-                      Headers
-                      <pre id="req-headers"></pre>
-                      Payload
-                      <pre id="req-payload"></pre>
-                    </div>
-                  </div>
-                  <div class="tab-pane" id="response">
-                    <div id="res-errors" class="alert alert-error">
-                      ERROR<span id="res-errors-body"></span>
-                    </div>
-                    <div id="res-success" style="display:none">
-                      Headers
-                      <pre id="res-headers"></pre>
-                      Body
-                      <pre id="res-body"></pre>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div><!-- /.modal-content -->
-        </div><!-- /.modal-dialog -->
-      </div><!-- /.modal -->
-<script>
-$(function(){
-  $('#test-report-tab a').click(function (e) {
-    e.preventDefault();
-    $(this).tab('show');
-  });
-  $('#test').click(function(e){
-    e.stopPropagation();
-    e.stopImmediatePropagation();
-    e.preventDefault();
-    var url = this.form.url.value;
-    var token = this.form.token.value;
-    var ctype = this.form.ctype.value;
-    if(!/^https?:\/\/.+/.test(url)){
-      alert("invalid url");
-      return;
-    }
-    $("#test-modal-url").text(url)
-    $("#test-report-modal").modal('show')
-    $("#test-report").hide();
-    var targetUrl = '@helpers.url(repository)/settings/hooks/test?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token=';
-    if (token) {
-      targetUrl = targetUrl + encodeURIComponent(token);
-    }
-    $.ajax({
-      method:'POST',
-      url:targetUrl,
-      success: function(e){
-        //console.log(e);
-        $('#test-report-tab a:first').tab('show');
-        $("#test-report").show();
-        $("#req-success").toggle(e.request&&!e.request.error);
-        $("#req-errors").toggle(e.request&&!!e.request.error);
-        $("#req-errors-body").text(e.request.error);
-        function headers(h){
-          h = h["headers"];
-          return h ? $.map(h, function(h){
-            return $("<div>").append($('<b>').text(h[0] + ":"),$('<span>').text(" " + h[1]))
-          }):"";
-        }
-        $("#req-headers").html(headers(e.request));
-        $("#req-payload").text(e.request && e.request.payload ? JSON.stringify(JSON.parse(e.request.payload),undefined,4) : "");
-        $("#res-success").toggle(e.responce && !e.responce.error);
-        $("#res-errors").toggle(e.responce && !!e.responce.error);
-        $("#res-errors-body").text(e.responce.error);
-        var success = !!(e.responce && e.responce.status && /^2\d\d$/.test(e.responce.status.statusCode));
-        $("#res-status").text((e.responce && e.responce.status && e.responce.status.statusCode) || "ERROR");
-        $("#res-status").toggleClass("badge-success", success).toggleClass("badge-important", !success);
-        $("#res-headers").html(headers(e.responce));
-        $("#res-body").text(e.responce && e.responce.body ? e.responce.body : "");
-      },
-      error:function (e) {
-        if(e) {
-            console.log(e.responseText, e);
-            alert("request error ( http status " + e.status + " error on gitbugket or browser to gitbucket. show details on your javascript console )");
-        }else{
-            alert("unknown javascript error (please report to gitbucket team)");
-        }
-        $("#test-report-modal").modal('hide')
-      }
-    });
-    return false;
-  });
-})
-</script>
-    }
-  }
-}

src/main/webapp/assets/common/css/gitbucket.css

@@ -36,29 +36,29 @@ h6 {
   font-size: 18px;
 }
 
-.octicon,.mega-octicon{
+.octicon {
   color : #999;
-  width: 14px;
-  height: 14px;
-  /*font-size: 14px;*/
+  font-size: 14px;
   text-align: center;
 }
 
-.mega-octicon{
+.mega-octicon {
+  color : #999;
+  text-align: center;
   width: 32px;
   height: 32px;
 }
 
-.octicon.active,.mega-octicon.active{
+.octicon.active,.mega-octicon.active {
   color : #333;
 }
 
-.octicon-cloud-download{
+.octicon-cloud-download {
   color: #333;
   margin-right: 5px;
 }
 
-.head .octicon, .head .mega-octicon{
+.head .octicon, .head .mega-octicon {
   color : #BBB;
 }
 
@@ -264,14 +264,6 @@ div.box-content {
   border-radius: 3px;
 }
 
-li.repo-link, li.page-link {
-  padding-top: 4px;
-  padding-bottom: 4px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
 div.box-content-bottom {
   background-color: white;
   border: 1px solid #d8d8d8;
@@ -413,7 +405,7 @@ div.headbar {
 /* Sign-in form */
 /****************************************************************************/
 div.signin-form {
-  width: 350px;
+  width: 300px;
   margin: 30px auto;
 }
 
@@ -443,22 +435,19 @@ div.repository-icon {
 div.repository-content {
   margin-left: 40px;
 }
+
 table.branches>thead>tr>th, table.branches>tbody>tr>td{
   padding: 12px;
 }
+
 .branches .muted-link{
   color: #777;
 }
+
 .branches .muted-link:hover{
   color: #4183c4;
 }
-/*
-.branches .branch-details{
-  display: inline-block;
-  width: 490px;
-  margin-right: 10px;
-}
-*/
+
 .branches .branch-name{
   color: #4183c4;
   display: inline-block;
@@ -467,10 +456,12 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{
   background-color: rgba(209,227,237,0.5);
   border-radius: 3px;
 }
+
 .branches .branch-meta{
   color: #aaa;
   line-height: 20px;
 }
+
 .branches .branch-a-b-count{
   color: rgba(0,0,0,0.5);
 }
@@ -481,14 +472,49 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{
   text-align: right;
   float: left;
 }
+
 .branches .a-b-count-widget .count-half:last-child {
   text-align: left;
   border-left: 1px solid #bbb;
 }
+
 .branches .a-b-count-widget .count-half .count-value{
   padding: 0 3px;
 }
 
+.branches .branch-a-b-count span.badge {
+  font-size: 100%;
+}
+
+div.branch-action a.label {
+  font-size: 100%;
+}
+
+td#upload-td {
+  padding: 0px;
+  background-color: #f4f4f4;
+  border: 1px #ddd solid;
+}
+
+div#upload-area {
+  text-align: center;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  font-size: 120%;
+}
+
+ul#upload-files {
+  list-style: none;
+  padding-left: 0px;
+  margin-bottom: 0px;
+}
+
+li.upload-file {
+  border-top: 1px #f4f4f4 solid;
+  background-color: white;
+  padding: 4px;
+}
+
 /****************************************************************************/
 /* Activity */
 /****************************************************************************/
@@ -503,39 +529,6 @@ p.description {
   color: gray;
 }
 
-a.header-link {
-  color: #888;
-  font-size: 90%;
-}
-
-a.header-link strong {
-  color: black;
-}
-
-a.header-link:hover {
-  color: #4183c4;
-  text-decoration: none;
-}
-
-a.header-link:hover i.octicon, a.header-link:hover strong{
-  color: inherit;
-}
-
-a.header-link i.octicon-x{
-    opacity: 1;
-    width: 20px;
-    height: 20px;
-    margin-right: 3px;
-    color: #FFF;
-    line-height: 20px;
-    background-color: #777;
-    border-radius: 3px;
-}
-a.header-link:hover i.octicon-x{
-    background-color: #4183c4;
-    color: #FFF;
-}
-
 table.table-file-list td.latest-commit {
   padding-top: 4px;
   padding-bottom: 4px;
@@ -670,6 +663,7 @@ a.button-link {
 a.button-link i {
     color: inherit;
 }
+
 a.selected {
     font-weight: bold;
     color: black;
@@ -684,11 +678,13 @@ table.table-issues {
   margin-top: 12px;
 }
 
-table.table-issues td .octicon-issue-opened, table.table-issues td .octicon-git-pull-request .open {
+table.table-issues td .octicon-issue-opened,
+table.table-issues td .octicon-git-pull-request .open {
   color: #6CC644;
 }
 
-table.table-issues td .octicon-issue-closed, table.table-issues td .octicon-git-pull-request .closed{
+table.table-issues td .octicon-issue-closed,
+table.table-issues td .octicon-git-pull-request .closed{
   color : #BD2C00;;
 }
 
@@ -827,7 +823,7 @@ div.issue-comment-action .octicon.danger {
   color: #fff;
 }
 
-.nav-pills > li > span.issue-label {
+.nav-pills > li > span.issue-label, .issue-priority {
   display: block;
   padding: 0px 8px 2px 8px;
   margin-top: 2px;
@@ -836,6 +832,15 @@ div.issue-comment-action .octicon.danger {
           border-radius: 5px;
 }
 
+.issue-priority {
+  font-size: 90%;
+}
+
+.issue-priority-inline {
+  font-size: 100%;
+  display: inline;
+}
+
 div.attachable {
   margin-bottom: 10px;
 }
@@ -896,48 +901,79 @@ li.task-list-item input.task-list-item-checkbox {
     border: 2px solid #fff;
     border-radius: 50%;
 }
+
 .discussion-item-content {
   margin-left:36px;
 }
+
 .discussion-item-content-head{
   padding-right:20px;
   background-color: white;
   float:left
 }
+
 pre.reset.discussion-item-content-text{
   border-left: 1px solid rgb(238, 238, 238);
   margin: 0 0 0 5px;
   padding-left: 25px;
 }
+
 .discussion-item-commit .discussion-item-content {
     font-size:12px;
 }
+
 .discussion-item-icon .octicon {
   color: inherit;
 }
+
 .discussion-item-merge .discussion-item-icon {
   background-color: #6e5494;
   color: white;
   padding-top: 1px;
   padding-left: 3px;
 }
+
 .discussion-item-close .discussion-item-icon {
   background-color: #bd2c00;
   color: white;
   padding-top: 1px;
 }
+
 .discussion-item-delete_branch .discussion-item-icon {
   padding-left: 2px;
   padding-top: 1px;
   background-color: #767676;
   color: white;
 }
+
 .discussion-item-reopen .discussion-item-icon {
   background-color: #6cc644;
   padding-top: 1px;
   color: white;
 }
 
+.priority-sort-handle {
+  margin-top: 3px;
+  padding-right: 10px;
+}
+
+.priority-sort-handle i::before {
+  cursor: move;
+  display: block;
+  width: 0.5em;
+  overflow: hidden;
+  font-size: 2em;
+}
+
+.priority-default .octicon {
+  font-size: 1.5em;
+  color: #ccc;
+}
+
+.priority-default-selected .octicon {
+  color: #3c8dbc;
+}
+
 /****************************************************************************/
 /* Pull request */
 /****************************************************************************/
@@ -1004,6 +1040,7 @@ div.author-info div.committer {
 .text-pending {
   color: #cea61b;
 }
+
 .text-failure {
   color: #bd2c00;
 }
@@ -1012,13 +1049,14 @@ div.author-info div.committer {
   padding: 10px 15px 10px 15px;
   border-bottom: 1px solid #eee;
 }
+
 .build-statuses-list .build-status-item {
   background-color: #fafafa;
   padding: 10px 15px 10px 15px;
   border-bottom: 1px solid #eee;
 }
 
-.merge-indicator{
+.merge-indicator {
   float:left;
   border-radius: 50%;
   width: 30px;
@@ -1028,22 +1066,27 @@ div.author-info div.committer {
   vertical-align: middle;
   margin-right: 10px;
 }
-.merge-indicator-success{
+
+.merge-indicator-success {
   background-color: #6cc644;
 }
-.merge-indicator-warning{
+
+.merge-indicator-warning {
   background-color: #cea61b;
 }
-.merge-indicator-alert{
+
+.merge-indicator-alert {
   background-color: #888;
 }
-.merge-indicator .octicon{
+
+.merge-indicator .octicon {
   color: white;
   font-size: 16px;
   width: 15px;
   height: 15px;
 }
-.merge-indicator-warning .octicon{
+
+.merge-indicator-warning .octicon {
   color: white;
   font-size: 30px;
 }
@@ -1061,7 +1104,9 @@ table.diff thead {
   display: none;
 }
 
-table.inlinediff td.insert, table.inlinediff td.equal, table.inlinediff td.delete {
+table.inlinediff td.insert,
+table.inlinediff td.equal,
+table.inlinediff td.delete {
   width: 900px;
 }
 
@@ -1069,11 +1114,11 @@ td.insert, td.equal, td.delete, td.empty {
   width: 50%;
 }
 
-table.diff td.body{
+table.diff td.body {
   position: relative;
 }
 
-table.diff th.line-num{
+table.diff th.line-num {
   /*min-width: 20px;*/
   width: 20px;
 }
@@ -1096,20 +1141,20 @@ table.diff .add-comment:hover {
   top: -1px;
 }
 
-table.diff tr td.body b.add-comment{
+table.diff tr td.body b.add-comment {
   display: none;
 }
 
-table.diff tr:hover td.body b.add-comment{
+table.diff tr:hover td.body b.add-comment {
   display: inline-block;
 }
 
-.container-wide table.diff tr:hover td.body b.add-comment{
+.container-wide table.diff tr:hover td.body b.add-comment {
   display: none;
 }
 
 .container-wide table.diff tr:hover td.body:hover b.add-comment,
-.container-wide table.diff tr:hover th.line-num:hover + td b.add-comment{
+.container-wide table.diff tr:hover th.line-num:hover + td b.add-comment {
   display: inline-block;
 }
 
@@ -1126,7 +1171,7 @@ table.diff tbody tr.not-diff:hover {
   background-color: #fff;
 }
 
-table.diff tbody tr.not-diff:hover td{
+table.diff tbody tr.not-diff:hover td {
   background-color: #fff;
 }
 
@@ -1157,12 +1202,15 @@ table.diff tbody tr.not-diff:hover td{
   text-decoration: none;
   -webkit-font-smoothing: antialiased;
 }
+
 .text-diff-added {
   color: #55a532;
 }
+
 .text-diff-deleted {
   color: #bd2c00;
 }
+
 .diffstat {
   font-size: 12px;
   font-weight: bold;
@@ -1170,7 +1218,8 @@ table.diff tbody tr.not-diff:hover td{
   white-space: nowrap;
   letter-spacing: 0px;
 }
-.diff-same{
+
+.diff-same {
   background: #DDD;
   color: #BBB;
   font-size: 16px;
@@ -1178,76 +1227,93 @@ table.diff tbody tr.not-diff:hover td{
   font-weight: bold;
   text-align: center;
 }
+
 /* ------- for imageDiff */
-.diff-image-frame{
+.diff-image-frame {
   display: table-cell;
   *float: left; /* for ie7 */
   vertical-align: middle;
   padding: 20px;
   background-color: #eee;
 }
-.diff-image-frame.diff-old{
+
+.diff-image-frame.diff-old {
   padding-right: 2px;
 }
-.diff-image-frame.diff-new{
+
+.diff-image-frame.diff-new {
   padding-left: 2px;
 }
-.diff-image-frame .diff-meta{
+
+.diff-image-frame .diff-meta {
   margin-top: 12px;
   color: #999;
   font-family: Helvetica,arial,freesans,clean,sans-serif;
   font-size: 12px;
 }
-.diff-image-frame.diff-old .diff-meta .diff{
+
+.diff-image-frame.diff-old .diff-meta .diff {
   color: #bd2c00;
 }
-.diff-image-frame.diff-new .diff-meta .diff{
+
+.diff-image-frame.diff-new .diff-meta .diff {
   color: #55a532;
 }
-.diff-image-frame img{
+
+.diff-image-frame img {
   max-height: 410px;
   max-width: 410px;
   background: url(../images/checker.png);
 }
-.diff-image-render.diff2up{
+
+.diff-image-render.diff2up {
   width:100%;
   text-align: center;
   display: table;
 }
-.diff-image-frame.diff-new img{
+
+.diff-image-frame.diff-new img {
     border: 1px solid #55a532;
 }
-.diff-image-frame.diff-old img{
+
+.diff-image-frame.diff-old img {
   border: 1px solid #bd2c00;
 }
-.diff-image-stack{
+
+.diff-image-stack {
   position: relative;
   background: #EEE;
   padding-top: 20px;
 }
+
 .diff-image-stack .diff-old,
-.diff-image-stack .diff-new{
+.diff-image-stack .diff-new {
   position:absolute;
   overflow: hidden;
   margin:0 20px;
 }
+
 .diff-image-stack img {
   max-width: none;
   background: url(../images/checker.png);
 }
-.diff-image-stack .diff-new{
+
+.diff-image-stack .diff-new {
   border: 1px solid #55a532;
   background: #EEE;
 }
-.diff-image-stack .diff-old{
+
+.diff-image-stack .diff-old {
   border: 1px solid #bd2c00;
 }
-.diff-swipe-handle{
+
+.diff-swipe-handle {
   position:absolute;
   margin-left: 325px;
   left: 100px;
 }
-.diff-silde-bar{
+
+.diff-silde-bar {
   width: 200px;
   position: absolute;
   left: 325px;
@@ -1256,19 +1322,22 @@ table.diff tbody tr.not-diff:hover td{
   border: 1px solid gray;
   height: 8px;
 }
-.image-diff-tools{
+
+.image-diff-tools {
   text-align: center;
   padding: 4px;
   background: #f7f7f7;
 }
-.image-diff-tools{
+
+.image-diff-tools {
   font-family: 'Helvetica Neue', Helvetica, arial, freesans, clean, sans-serif;
   font-size: 12px;
   background: #f7f7f7;
   margin: 0;
   text-align: center;
 }
-.image-diff-tools li{
+
+.image-diff-tools li {
   background: none;
   display: inline;
   cursor: pointer;
@@ -1277,33 +1346,39 @@ table.diff tbody tr.not-diff:hover td{
   position: relative;
   color: #666;
 }
-.image-diff-tools li:last-child{
+
+.image-diff-tools li:last-child {
   border-right: none;
 }
+
 .image-diff-tools li.active {
   font-weight: bold;
 }
-.no-canvas .need-canvas{
-  display: none;
-}
-.diff-image-stack.swipe .diff-new{
-  border-right: 1px solid #888;
-}
-.diff-image-stack.swipe .diff-swipe-handle{
-  margin-left: 15px;
-  left: 410px;
-}
-.diff-image-stack.swipe .diff-silde-bar{
+
+.no-canvas .need-canvas {
   display: none;
 }
 
-.diff-image-stack.onion .diff-silde-bar{
+.diff-image-stack.swipe .diff-new {
+  border-right: 1px solid #888;
+}
+
+.diff-image-stack.swipe .diff-swipe-handle {
+  margin-left: 15px;
+  left: 410px;
+}
+
+.diff-image-stack.swipe .diff-silde-bar {
+  display: none;
+}
+
+.diff-image-stack.onion .diff-silde-bar {
   background: -ms-linear-gradient(left,  #bd2c00 0%,#55a532 100%); /* IE10+ */
   background: linear-gradient(to right,  #bd2c00 0%,#55a532 100%);
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bd2c00', endColorstr='#55a532',GradientType=1 ); /* IE6-9 */
 }
 
-.diff-image-stack.blink .diff-silde-bar{
+.diff-image-stack.blink .diff-silde-bar {
   border-style: dotted;
   background-image: linear-gradient(to right, #bd2c00, #bd2c00 50%, #55a532 50%, #55a532 100%);
   background-size: 2px 2px;
@@ -1573,7 +1648,7 @@ a.markdown-anchor-link span.octicon {
 /****************************************************************************/
 /* File finder */
 /****************************************************************************/
-#tree-finder-field{
+#tree-finder-field {
   border: none;
   box-shadow: none;
   padding: 0;
@@ -1583,33 +1658,40 @@ a.markdown-anchor-link span.octicon {
   height: inherit;
   width: 300px;
 }
-.find-input{
+
+.find-input {
   font-size: 18px;
   margin-bottom: 20px;
 }
-#tree-finder-results td{
+
+#tree-finder-results td {
   padding:7px 6px;
 }
-#tree-finder-results td.icon{
+
+#tree-finder-results td.icon {
   width:16px; padding: 7px 2px 7px 6px;
 }
-#tree-finder-results .tree-browser-result .icon-chevron-right{
+
+#tree-finder-results .tree-browser-result .icon-chevron-right {
   visibility: hidden;
 }
-#tree-finder-results .tree-browser-result.navigation-focus .icon-chevron-right{
+
+#tree-finder-results .tree-browser-result.navigation-focus .icon-chevron-right {
   visibility: visible;
 }
-#tree-finder-results .navigation-focus td{
+
+#tree-finder-results .navigation-focus td {
   background: #fff;
 }
 
 /****************************************************************************/
 /* blame */
 /****************************************************************************/
-.blobview pre.blob{
+.blobview pre.blob {
   padding-left: 0;
 }
-.blobview ol.linenums{
+
+.blobview ol.linenums {
   margin-left: 0;
   padding-left: 50px;
 }
@@ -1623,12 +1705,14 @@ div.container.blame-container{
 .line-age-legend {
   display: none;
 }
+
 .blame-container .line-age-legend {
   display: block;
   float: right;
   font-size: 12px;
   color: #777;
 }
+
 .blame-container .line-age-legend ol {
   display: inline-block;
   *display: inline;
@@ -1636,6 +1720,7 @@ div.container.blame-container{
   list-style: none;
   margin: 0 5px;
 }
+
 .blame-container .line-age-legend ol li {
   display: inline-block;
   *display: inline;
@@ -1643,17 +1728,21 @@ div.container.blame-container{
   width: 8px;
   height: 10px;
 }
+
 .blame-container pre.blob{
   margin-left: 350px;
 }
-.blame-container pre.prettyprint ol.linenums li.blame-sep{
+
+.blame-container pre.prettyprint ol.linenums li.blame-sep {
   border-top: 1px solid rgb(219, 219, 219);
   margin-top: -1px;
 }
+
 .blame-container .hide-if-blame {
   display: none;
 }
-.blame{
+
+.blame {
   font-size: 12px;
   white-space: normal;
   width: 340px;
@@ -1661,19 +1750,23 @@ div.container.blame-container{
   min-height: 100px;
   display: none;
 }
-.blame-container .blame{
+
+.blame-container .blame {
   display: block;
 }
-.blame .blame-commit-title{
+
+.blame .blame-commit-title {
   font-weight: bold;
   color: #333;
   line-height: 1.1;
 }
-.blame .avatar{
+
+.blame .avatar {
   margin-right: 4px;
   margin-bottom: 4px;
 }
-.blame .blame-info{
+
+.blame .blame-info {
   background: white;
   box-shadow:rgba(113, 135, 164, 0.65098) 0px 0px 4px 0px;
   position: absolute;
@@ -1681,51 +1774,57 @@ div.container.blame-container{
   padding: 2px;
   border-right: 2px solid;
 }
-.no-box-shadow .blame .blame-info{
+
+.no-box-shadow .blame .blame-info {
   border-top: 1px solid #888;
   border-bottom: 1px solid #888;
   border-left: 1px solid #888;
 }
-.blame-sha{
+
+.blame-sha {
   font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
   float: right;
   text-align: right;
 }
-.blame-sha .muted-link{
+
+.blame-sha .muted-link {
   color: #777;
 }
-.blame-sha .muted-link:hover{
+
+.blame-sha .muted-link:hover {
   color: #4183c4;
 }
 
-.blame .blame-info:hover{
+.blame .blame-info:hover {
   z-index: 100;
   box-shadow:rgba(113, 135, 164, 0.65098) 0px 0px 4px 3px;
 }
-.blame .blame-info.blame-last{
+
+.blame .blame-info.blame-last {
   background: #FDFCED;
 }
-.blame-info.heat1{ border-right-color:#ffeca7}
-.blame-info.heat2{ border-right-color:#ffdd8c}
-.blame-info.heat3{ border-right-color:#ffdd7c}
-.blame-info.heat4{ border-right-color:#fba447}
-.blame-info.heat5{ border-right-color:#f68736}
-.blame-info.heat6{ border-right-color:#f37636}
-.blame-info.heat7{ border-right-color:#ca6632}
-.blame-info.heat8{ border-right-color:#c0513f}
-.blame-info.heat9{ border-right-color:#a2503a}
-.blame-info.heat10{border-right-color:#793738}
 
-.heat1{background-color:#ffeca7}
-.heat2{background-color:#ffdd8c}
-.heat3{background-color:#ffdd7c}
-.heat4{background-color:#fba447}
-.heat5{background-color:#f68736}
-.heat6{background-color:#f37636}
-.heat7{background-color:#ca6632}
-.heat8{background-color:#c0513f}
-.heat9{background-color:#a2503a}
-.heat10{background-color:#793738}
+.blame-info.heat1 { border-right-color:#ffeca7 }
+.blame-info.heat2 { border-right-color:#ffdd8c }
+.blame-info.heat3 { border-right-color:#ffdd7c }
+.blame-info.heat4 { border-right-color:#fba447 }
+.blame-info.heat5 { border-right-color:#f68736 }
+.blame-info.heat6 { border-right-color:#f37636 }
+.blame-info.heat7 { border-right-color:#ca6632 }
+.blame-info.heat8 { border-right-color:#c0513f }
+.blame-info.heat9 { border-right-color:#a2503a }
+.blame-info.heat10{ border-right-color:#793738 }
+
+.heat1 { background-color:#ffeca7 }
+.heat2 { background-color:#ffdd8c }
+.heat3 { background-color:#ffdd7c }
+.heat4 { background-color:#fba447 }
+.heat5 { background-color:#f68736 }
+.heat6 { background-color:#f37636 }
+.heat7 { background-color:#ca6632 }
+.heat8 { background-color:#c0513f }
+.heat9 { background-color:#a2503a }
+.heat10{ background-color:#793738 }
 
 /****************************************************************************/
 /* Mobile */
@@ -1766,3 +1865,15 @@ body.page-load * {
   -o-transition: none !important;
   transition: none !important;
 }
+
+body.sidebar-collapse .main-sidebar li.menu-item-hover:not(:hover) span.pull-right-container {
+  display: inline !important;
+  position: absolute;
+  top: 8px;
+  right: 0px;
+  font-size: 9px;
+}
+
+body.sidebar-collapse .main-sidebar li.treeview:not(:hover) span.pull-right-container span.label {
+  padding: 2px 4px;
+}