Update README.md

Add local version of Source Sans Pro

.github/CONTRIBUTING.md

@@ -1,7 +1,6 @@
-# Guideline for Issues
+# The guidelines for contributing
 
-- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
-- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
-- We can also support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- Write an issue in English. At least, write subject in English.
-- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
+- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
+- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before staring your work.
+- You can edit the GitBucket documentation on Wiki if you have a GitHub account. When you find any mistakes or lacks in the documentation, please update it directly.
+- All your contributions are handled as [Apache Software License, Version 2.0](https://github.com/gitbucket/gitbucket/blob/master/LICENSE). When you create a pull request or update the documentation, we assume you agreed this clause.

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-### Before submitting an issue to Gitbucket I have first:
+### Before submitting an issue to GitBucket I have first:
 
 - [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
 - [] searched for similar already existing issue
@@ -9,11 +9,10 @@
 ## Issue
 **Impacted version**: xxxx
 
-**Deployment mode**: *explain here how you use gitbucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
+**Deployment mode**: *explain here how you use GitBucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
 
 **Problem description**:
 - *be as explicit has you can*
 - *describe the problem and its symptoms*
 - *explain how to reproduce*
 - *attach whatever information that can help understanding the context (screen capture, log files)*
-- *do your best to use a correct english (re-read yourself)*

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-### Before submitting a pull-request to Gitbucket I have first:
+### Before submitting a pull-request to GitBucket I have first:
 
 - [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
 - [] rebased my branch over master

.github/SUPPORT.md

@@ -0,0 +1,5 @@
+# The support guidelines
+
+- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
+- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
+- Write issues in English if it's possible. It enables many of contributors to help you.

.travis.yml

@@ -1,5 +1,7 @@
 language: scala
 sudo: true
+jdk: 
+  - oraclejdk8
 script:
   - sbt test
 before_script:
@@ -14,40 +16,3 @@ cache:
     - $HOME/.coursier
     - $HOME/.embedmysql
     - $HOME/.embedpostgresql
-matrix:
-  include:
-  - jdk: oraclejdk8
-    addons:
-      apt:
-        packages:
-        - libaio1
-  - dist: trusty
-    group: edge
-    sudo: required
-    jdk: oraclejdk9
-    addons:
-      apt:
-        packages:
-        - libaio1
-    before_install:
-    - cd ~
-    - JDK9_URL=`curl http://jdk.java.net/9/ | grep "lin64JDK" | grep "tar.gz\"" | sed -e "s/\"/ /g" | awk '{print $5}'`
-    - wget -O jdk-9_linux-x64_bin.tar.gz $JDK9_URL
-    - tar -xzf jdk-9_linux-x64_bin.tar.gz
-    - cd -
-    script:
-    # https://github.com/sbt/sbt/pull/2951
-    - git clone https://github.com/retronym/java9-rt-export
-    - cd java9-rt-export/
-    - git checkout 1019a2873d057dd7214f4135e84283695728395d
-    - jdk_switcher use oraclejdk8
-    - sbt package
-#    - jdk_switcher use oraclejdk9
-    - export JAVA_HOME=~/jdk-9
-    - PATH=$JAVA_HOME/bin:$PATH
-    - java -version
-    - mkdir -p $HOME/.sbt/0.13/java9-rt-ext; java -jar target/java9-rt-export-*.jar $HOME/.sbt/0.13/java9-rt-ext/rt.jar
-    - jar tf $HOME/.sbt/0.13/java9-rt-ext/rt.jar | grep java/lang/Object
-    - cd ..
-    - wget https://raw.githubusercontent.com/paulp/sbt-extras/9ade5fa54914ca8aded44105bf4b9a60966f3ccd/sbt && chmod +x ./sbt
-    - ./sbt -Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext test

README.md

@@ -59,19 +59,35 @@ GitBucket has a plug-in system that allows extra functionality. Officially the f
 - [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin)
 - [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin)
 
-You can find more plugins made by the community at [GitBucket community plugins](http://gitbucket-plugins.github.io/).
+You can find more plugins made by the community at [GitBucket community plugins](https://gitbucket-plugins.github.io/).
 
 Support
 --------
 
 - If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
 - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
-- We can also provide support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- Write an issue in English. At least, write subject in English.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
 
 Release Notes
 -------------
+### 4.18.0 - 14 Oct 2017
+- Form to reply to review comment
+- Display fullname in username suggestion
+- Commit hook plugins are applied to online editing
+- Improve gitbucket-ci-plugin
+
+### 4.17.0 - 30 Sep 2017
+- [gitbucket-ci-plugin](https://github.com/takezoe/gitbucket-ci-plugin) is available
+- Transferring to URL with commit ID
+- Drop uploadable file type limitation
+- Improve Mailer API
+- Web API and webhook enhancement
+
+### 4.16.0 - 2 Sep 2017
+- Support AdminLTE color skin
+- Improve unexpected error handling
+- Show commit status on the commits list
+
 ### 4.15.0 - 5 Aug 2017
 - Bundle GitBucket organization plugins
 - Notifications plugin

build.sbt

@@ -1,6 +1,8 @@
+import com.typesafe.sbt.license.{LicenseInfo, DepModuleInfo}
+
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.15.0"
+val GitBucketVersion = "4.18.0"
 val ScalatraVersion = "2.5.0"
 val JettyVersion = "9.3.19.v20170502"
 
@@ -29,13 +31,13 @@ libraryDependencies ++= Seq(
   "io.github.gitbucket"             %% "scalatra-forms"               % "1.1.0",
   "commons-io"                      %  "commons-io"                   % "2.5",
   "io.github.gitbucket"             %  "solidbase"                    % "1.0.2",
-  "io.github.gitbucket"             %  "markedj"                      % "1.0.13",
+  "io.github.gitbucket"             %  "markedj"                      % "1.0.15",
   "org.apache.commons"              %  "commons-compress"             % "1.13",
   "org.apache.commons"              %  "commons-email"                % "1.4",
   "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.3",
   "org.apache.sshd"                 %  "apache-sshd"                  % "1.4.0" exclude("org.slf4j","slf4j-jdk14"),
   "org.apache.tika"                 %  "tika-core"                    % "1.14",
-  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.9",
+  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.10",
   "joda-time"                       %  "joda-time"                    % "2.9.9",
   "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
   "com.h2database"                  %  "h2"                           % "1.4.195",
@@ -237,3 +239,8 @@ pomExtra := (
     </developer>
   </developers>
 )
+
+licenseOverrides := {
+  case DepModuleInfo("com.github.bkromhout", "java-diff-utils", _) =>
+    LicenseInfo(LicenseCategory.Apache, "Apache-2.0", "http://www.apache.org/licenses/LICENSE-2.0")
+}

doc/jrebel.md

@@ -1,35 +1,25 @@
 JRebel integration (optional)
 =============================
 
-[JRebel](http://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
-JRebel is generally able to eliminate the need for the following slow "app restart" in sbt following a code change:
+[JRebel](https://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
+JRebel is generally able to eliminate the need for the slow "app restart" per modification of codes. Alsp it's only used during development, and doesn't change your deployed app in any way.
 
-```
-> jetty:start
-```
-
-While JRebel is not open source, it does reload your code faster than the `~;copy-resources;aux-compile` way of doing things using `sbt`.
-
-It's only used during development, and doesn't change your deployed app in any way.
-
-JRebel used to be free for Scala developers, but that changed recently, and now there's a cost associated with usage for Scala. There are trial plans and free non-commercial licenses available if you just want to try it out.
+JRebel is not open source, but we can use it free for non-commercial use.
 
 ----
 
 ## 1. Get a JRebel license
 
-Sign up for a [usage plan](https://my.jrebel.com/). You will need to create an account.
+Sign up for a [myJRebel](https://my.jrebel.com/register). You will need to create an account.
 
 ## 2. Download JRebel
 
-Download the most recent ["nosetup" JRebel zip](http://zeroturnaround.com/software/jrebel/download/prev-releases/).
+Download the most recent ["nosetup" JRebel zip](https://zeroturnaround.com/software/jrebel/download/prev-releases/).
 Next, unzip the downloaded file.
 
 ## 3. Activate
 
-Follow the [instructions on the JRebel website](http://zeroturnaround.com/software/jrebel/download/prev-releases/) to activate your downloaded JRebel.
-
-You can use the default settings for all the configurations.
+Follow `readme.txt` in the extracted directory to activate your downloaded JRebel.
 
 You don't need to integrate with your IDE, since we're using sbt to do the servlet deployment.
 
@@ -41,13 +31,13 @@ You only need to tell jvm where to find the jrebel jar.
 To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux), and add the following line:
 
 ```bash
-export JREBEL=/path/to/jrebel/jrebel.jar
+export JREBEL=/path/to/jrebel/legacy/jrebel.jar
 ```
 
 For example, if you unzipped your JRebel download in your home directory, you whould use:
 
 ```bash
-export JREBEL=~/jrebel/jrebel.jar
+export JREBEL=~/jrebel/legacy/jrebel.jar
 ```
 
 Now reload your shell:
@@ -73,39 +63,26 @@ $ ./sbt
 You will start the servlet container slightly differently now that you're using sbt.
 
 ```
-> jetty:start
+> jetty:quickstart
 :
-[info] starting server ...
-[success] Total time: 3 s, completed Jan 3, 2016 9:47:55 PM
-2016-01-03 21:47:57 JRebel:
-2016-01-03 21:47:57 JRebel: A newer version '6.3.1' is available for download
-2016-01-03 21:47:57 JRebel: from http://zeroturnaround.com/software/jrebel/download/
-2016-01-03 21:47:57 JRebel:
-2016-01-03 21:47:58 JRebel: Contacting myJRebel server ..
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/classes' will be monitored for changes.
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/test-classes' will be monitored for changes.
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/webapp' will be monitored for changes.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  JRebel Legacy Agent 6.2.5 (201509291538)
-2016-01-03 21:48:00 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 30 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 182 redeploys/restarts saving you about 7.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 324 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 1538 redeploys/restarts saving you about 62.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Licensed to nazo king (using myJRebel).
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  #############################################################
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  Legacy Agent 7.0.15 (201709080836)
+2017-09-21 15:46:35 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  Over the last 2 days JRebel prevented
+2017-09-21 15:46:35 JRebel:  at least 8 redeploys/restarts saving you about 0.3 hours.
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  Licensed to Naoki Takezoe (using myJRebel).
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:
+2017-09-21 15:46:35 JRebel:  #############################################################
+2017-09-21 15:46:35 JRebel:
 :
 
-> ~ copy-resources
-[success] Total time: 0 s, completed Jan 3, 2016 9:13:54 PM
+> ~compile
+[success] Total time: 2 s, completed 2017/09/21 15:50:06
 1. Waiting for source changes... (press enter to interrupt)
 ```
 
@@ -114,12 +91,11 @@ For example, you can change the title on `src/main/twirl/gitbucket/core/main.sca
 
 ```html
 :
-  <a class="navbar-brand" href="@path/">
-    <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px;"/>GitBucket
-    @defining(AutoUpdate.getCurrentVersion){ version =>
-      <span class="header-version">@version.majorVersion.@version.minorVersion</span>
-    }
+  <a href="@context.path/" class="logo">
+    <img src="@helpers.assets("/common/images/gitbucket.svg")" style="width: 24px; height: 24px; display: inline;"/>
+    GitBucket
     change code !!!!!!!!!!!!!!!!
+    <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span>
   </a>
 :
 ```
@@ -128,21 +104,17 @@ If JRebel is doing is correctly installed you will see a notice for you:
 
 ```
 1. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:48:42 JRebel: Reloading class 'gitbucket.core.html.main$'.
-[info] Wrote rebel.xml to /git/gitbucket/target/scala-2.11/resource_managed/main/rebel.xml
-[info] Compiling 1 Scala source to /git/gitbucket/target/scala-2.11/classes...
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
-2. Waiting for source changes... (press enter to interrupt)
+[info] Compiling 1 Scala source to /Users/naoki.takezoe/gitbucket/target/scala-2.12/classes...
+[success] Total time: 1 s, completed 2017/09/21 15:55:40
 ```
 
 And you reload browser, JRebel give notice of that it has reloaded classes:
 
 ```
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
 2. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:49:13 JRebel: Reloading class 'gitbucket.core.html.main$'.
+2017-09-21 15:55:40 JRebel: Reloading class 'gitbucket.core.html.main$'.
 ```
 
 ## 6. Limitations
 
-JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routes patterns, there is nothing JRebel can do, you will have to run `jetty:start`.
+JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routing patterns, there is nothing JRebel can do, you will have to restart by `jetty:quickstart`.

doc/licenses.md

@@ -0,0 +1,102 @@
+# gitbucket-licenses
+
+Category | License | Dependency | Notes
+--- | --- | --- | ---
+Apache | [         Apache License, Version 2.0       ](         http://opensource.org/licenses/apache2.0.php       ) | org.osgi # org.osgi.core # 4.3.1 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.googlecode.javaewah # JavaEWAH # 1.1.6 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | joda-time # joda-time # 2.9.9 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-all # 1.0.0.CR1 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.objenesis # objenesis # 2.5 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # apache-sshd # 1.4.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-core # 1.4.0 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.typesafe # config # 1.3.1 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.typesafe.akka # akka-actor_2.12 # 2.5.0 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | commons-io # commons-io # 2.5 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | fr.brouillard.oss.security.xhub # xhub4j-core # 1.0.0 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-compress # 1.13 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-email # 1.4 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-lang3 # 3.5 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpclient # 4.5.3 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpcore # 4.4.6 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpmime # 4.5.2 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.tika # tika-core # 1.14 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.liquibase # liquibase-core # 3.4.1 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-http # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-io # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-security # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-server # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-servlet # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-util # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-webapp # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-xml # 9.2.19.v20160908 | <notextile></notextile>
+Apache | [Apache Software License, Version 1.1](http://www.apache.org/licenses/LICENSE-1.1) | org.bouncycastle # bcpg-jdk15on # 1.56 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.github.bkromhout # java-diff-utils # 2.1.1 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0.html) | com.typesafe.play # twirl-api_2.12 # 1.3.7 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-ast_2.12 # 3.5.1 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-core_2.12 # 3.5.1 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-jackson_2.12 # 3.5.1 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-scalap_2.12 # 3.5.1 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.enragedginger # akka-quartz-scheduler_2.12 # 1.6.0-akka-2.4.x | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-annotations # 2.8.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-core # 2.8.4 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-databind # 2.8.4 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.github.takezoe # blocking-slick-32_2.12 # 0.0.10 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.google.code.findbugs # jsr305 # 3.0.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.zaxxer # HikariCP # 2.6.1 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | commons-codec # commons-codec # 1.9 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | commons-logging # commons-logging # 1.2 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | de.flapdoodle.embed # de.flapdoodle.embed.process # 2.0.1 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | eu.medsea.mimeutil # mime-util # 2.1.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # markedj # 1.0.15 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # scalatra-forms_2.12 # 1.1.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # solidbase # 1.0.2 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy # 1.6.11 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy-agent # 1.6.11 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.quartz-scheduler # quartz # 2.2.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | ru.yandex.qatools.embed # postgresql-embedded # 2.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | tomcat # tomcat-apr # 5.5.23 | <notextile></notextile>
+Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalactic # scalactic_2.12 # 3.0.0 | <notextile></notextile>
+Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalatest # scalatest_2.12 # 3.0.0 | <notextile></notextile>
+BSD | [BSD](LICENSE.txt) | com.thoughtworks.paranamer # paranamer # 2.8 | <notextile></notextile>
+BSD | [BSD](http://software.clapper.org/grizzled-slf4j/license.html) | org.clapper # grizzled-slf4j_2.12 # 1.3.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-common_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-json_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-scalatest_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-test_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra_2.12 # 2.5.0 | <notextile></notextile>
+BSD | [BSD 3-Clause](http://www.scala-lang.org/license.html) | org.scala-lang # scala-library # 2.12.3 | <notextile></notextile>
+BSD | [BSD 3-Clause](http://www.scala-lang.org/license.html) | org.scala-lang # scala-reflect # 2.12.3 | <notextile></notextile>
+BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-java8-compat_2.12 # 0.8.0 | <notextile></notextile>
+BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-parser-combinators_2.12 # 1.0.4 | <notextile></notextile>
+BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-xml_2.12 # 1.0.6 | <notextile></notextile>
+BSD | [BSD License](http://www.opensource.org/licenses/bsd-license.php) | com.wix # wix-embedded-mysql # 2.1.4 | <notextile></notextile>
+BSD | [BSD-2-Clause](https://jdbc.postgresql.org/about/license.html) | org.postgresql # postgresql # 42.0.0 | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit # 4.8.0.201706111038-r | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.archive # 4.8.0.201706111038-r | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.http.server # 4.8.0.201706111038-r | <notextile></notextile>
+BSD | [New BSD License](http://www.opensource.org/licenses/bsd-license.php) | org.hamcrest # hamcrest-core # 1.3 | <notextile></notextile>
+BSD | [Revised BSD](http://www.jcraft.com/jsch/LICENSE.txt) | com.jcraft # jsch # 0.1.54 | <notextile></notextile>
+BSD | [Two-clause BSD-style license](http://github.com/slick/slick/blob/master/LICENSE.txt) | com.typesafe.slick # slick_2.12 # 3.2.1 | <notextile></notextile>
+CC0 | [CC0](http://creativecommons.org/publicdomain/zero/1.0/) | org.reactivestreams # reactive-streams # 1.0.0 | <notextile></notextile>
+CDDL | [COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0](https://glassfish.dev.java.net/public/CDDLv1.0.html) | javax.activation # activation # 1.1.1 | <notextile></notextile>
+GPL | [CDDL/GPLv2+CE](https://glassfish.java.net/public/CDDL+GPL_1_1.html) | com.sun.mail # javax.mail # 1.5.2 | <notextile></notextile>
+GPL with Classpath Extension | [CDDL + GPLv2 with classpath exception](https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html) | javax.servlet # javax.servlet-api # 3.1.0 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-classic # 1.2.3 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-core # 1.2.3 | <notextile></notextile>
+LGPL | [LGPL, version 2.1](http://www.gnu.org/licenses/licenses.html) | net.java.dev.jna # jna # 4.0.0 | <notextile></notextile>
+LGPL | [LGPL, version 2.1](http://www.gnu.org/licenses/licenses.html) | net.java.dev.jna # jna-platform # 4.0.0 | <notextile></notextile>
+LGPL | [LGPL-2.1](null) | org.mariadb.jdbc # mariadb-java-client # 2.0.3 | <notextile></notextile>
+MIT | [MIT License](http://www.opensource.org/licenses/mit-license.php) | org.slf4j # slf4j-api # 1.7.25 | <notextile></notextile>
+MIT | [The MIT License](http://www.opensource.org/licenses/mit-license.php) | com.github.zafarkhaja # java-semver # 0.9.0 | <notextile></notextile>
+MIT | [The MIT License](https://jsoup.org/license) | org.jsoup # jsoup # 1.10.2 | <notextile></notextile>
+MIT | [The MIT License](http://github.com/mockito/mockito/blob/master/LICENSE) | org.mockito # mockito-all # 1.10.19 | <notextile></notextile>
+MIT | [The MIT License](http://github.com/mockito/mockito/blob/master/LICENSE) | org.mockito # mockito-core # 2.7.22 | <notextile></notextile>
+MIT | [The MIT License (MIT)](http://www.opensource.org/licenses/mit-license.html) | net.coobird # thumbnailator # 0.4.8 | <notextile></notextile>
+Mozilla | [MPL 2.0 or EPL 1.0](http://h2database.com/html/license.html) | com.h2database # h2 # 1.4.195 | <notextile></notextile>
+Mozilla | [Mozilla Public License 1.1 (MPL 1.1)](http://www.mozilla.org/MPL/MPL-1.1.html) | com.googlecode.juniversalchardet # juniversalchardet # 1.0.3 | <notextile></notextile>
+Public Domain | [Public Domain](http://en.wikipedia.org/wiki/Public_domain) | net.i2p.crypto # eddsa # 0.1.0 | <notextile></notextile>
+unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcpkix-jdk15on # 1.56 | <notextile></notextile>
+unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcprov-jdk15on # 1.56 | <notextile></notextile>
+unrecognized | [Eclipse Public License 1.0](http://www.eclipse.org/legal/epl-v10.html) | junit # junit # 4.12 | <notextile></notextile>
+unrecognized | [The OpenLDAP Public License](http://www.openldap.org/software/release/license.html) | com.novell.ldap # jldap # 2009-10-07 | <notextile></notextile>
+

doc/readme.md

@@ -9,3 +9,4 @@ Developer's Guide
  * [Automatic Schema Updating](auto_update.md)
  * [Release Operation](release.md)
  * [JRebel integration (optional)](jrebel.md)
+ * [Licenses](licenses.md)

plugins.json

@@ -5,9 +5,9 @@
     "description": "Provides notifications feature on GitBucket.",
     "versions": [
       {
-        "version": "1.0.0",
-        "range": ">=4.15.0",
-        "file": "gitbucket-notifications-plugin_2.12-1.0.0.jar"
+        "version": "1.2.0",
+        "range": ">=4.17.0",
+        "file": "gitbucket-notifications-plugin_2.12-1.2.0.jar"
       }
     ],
     "default": true
@@ -18,9 +18,9 @@
     "description": "Provides Emoji support for GitBucket.",
     "versions": [
       {
-        "version": "4.4.0",
-        "range": ">=4.10.0",
-        "file": "gitbucket-emoji-plugin_2.12-4.4.0.jar"
+        "version": "4.5.0",
+        "range": ">=4.18.0",
+        "file": "gitbucket-emoji-plugin_2.12-4.5.0.jar"
       }
     ],
     "default": false

project/plugins.sbt

@@ -1,8 +1,9 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"         % "1.3.0")
-addSbtPlugin("com.eed3si9n"         % "sbt-assembly"      % "0.14.3")
-addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"   % "2.1.1")
-addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
-addSbtPlugin("com.typesafe.sbt"     % "sbt-pgp"           % "0.8.3")
-addSbtPlugin("io.get-coursier"      % "sbt-coursier"      % "1.0.0-M15")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-twirl"          % "1.3.7")
+addSbtPlugin("com.eed3si9n"         % "sbt-assembly"       % "0.14.5")
+addSbtPlugin("com.earldouglas"      % "xsbt-web-plugin"    % "4.0.0")
+addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin"  % "0.10.0")
+addSbtPlugin("com.jsuereth"         % "sbt-pgp"            % "1.1.0")
+addSbtPlugin("io.get-coursier"      % "sbt-coursier"       % "1.0.0-RC11")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-license-report" % "1.2.0")

src/main/java/JettyLauncher.java

@@ -51,6 +51,9 @@ public class JettyLauncher {
                         case "--plugin_dir":
                             System.setProperty("gitbucket.pluginDir", dim[1]);
                             break;
+                        case "--validate_password":
+                            System.setProperty("gitbucket.validate.password", dim[1]);
+                            break;
                     }
                 }
             }

src/main/scala/ScalatraBootstrap.scala

@@ -25,11 +25,9 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
     context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
     context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
-    context.addFilter("ghCompatRepositoryAccessFilter", new GHCompatRepositoryAccessFilter)
-    context.getFilterRegistration("ghCompatRepositoryAccessFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
     // Register controllers
-    context.mount(new AnonymousAccessController, "/*")
+    context.mount(new PreProcessController, "/*")
 
     context.addFilter("pluginControllerFilter", new PluginControllerFilter)
     context.getFilterRegistration("pluginControllerFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")

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

@@ -40,5 +40,8 @@ object GitBucketCoreModule extends Module("gitbucket-core",
     new SqlMigration("update/gitbucket-core_4.14.sql")
   ),
   new Version("4.14.1"),
-  new Version("4.15.0")
+  new Version("4.15.0"),
+  new Version("4.16.0"),
+  new Version("4.17.0"),
+  new Version("4.18.0")
 )

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

@@ -0,0 +1,124 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.Account
+import gitbucket.core.util.JGitUtil.{CommitInfo, DiffInfo}
+import gitbucket.core.util.RepositoryName
+import org.eclipse.jgit.diff.DiffEntry.ChangeType
+import ApiCommits._
+
+case class ApiCommits(
+  url: ApiPath,
+  sha: String,
+  html_url: ApiPath,
+  comment_url: ApiPath,
+  commit: Commit,
+  author: ApiUser,
+  committer: ApiUser,
+  parents: Seq[Tree],
+  stats: Stats,
+  files: Seq[File]
+)
+
+object ApiCommits {
+  case class Commit(
+    url: ApiPath,
+    author: ApiPersonIdent,
+    committer: ApiPersonIdent,
+    message: String,
+    comment_count: Int,
+    tree: Tree
+  )
+
+  case class Tree(
+    url: ApiPath,
+    sha: String
+  )
+
+  case class Stats(
+    additions: Int,
+    deletions: Int,
+    total: Int
+  )
+
+  case class File(
+    filename: String,
+    additions: Int,
+    deletions: Int,
+    changes: Int,
+    status: String,
+    raw_url: ApiPath,
+    blob_url: ApiPath,
+    patch: String
+  )
+
+
+  def apply(repositoryName: RepositoryName, commitInfo: CommitInfo, diffs: Seq[DiffInfo], author: Account, committer: Account,
+            commentCount: Int): ApiCommits = {
+    val files = diffs.map { diff =>
+      var additions = 0
+      var deletions = 0
+
+      diff.patch.getOrElse("").split("\n").foreach { line =>
+        if(line.startsWith("+")) additions = additions + 1
+        if(line.startsWith("-")) deletions = deletions + 1
+      }
+
+      File(
+        filename = if(diff.changeType == ChangeType.DELETE){ diff.oldPath } else { diff.newPath },
+        additions = additions,
+        deletions = deletions,
+        changes = additions + deletions,
+        status = diff.changeType match {
+          case ChangeType.ADD    => "added"
+          case ChangeType.MODIFY => "modified"
+          case ChangeType.DELETE => "deleted"
+          case ChangeType.RENAME => "renamed"
+          case ChangeType.COPY   => "copied"
+        },
+        raw_url = if(diff.changeType == ChangeType.DELETE){
+          ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.parents.head}/${diff.oldPath}")
+        } else {
+          ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.id}/${diff.newPath}")
+        },
+        blob_url = if(diff.changeType == ChangeType.DELETE){
+          ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.parents.head}/${diff.oldPath}")
+        } else {
+          ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.id}/${diff.newPath}")
+        },
+        patch = diff.patch.getOrElse("")
+      )
+    }
+
+    ApiCommits(
+      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
+      sha = commitInfo.id,
+      html_url = ApiPath(s"${repositoryName.fullName}/commit/${commitInfo.id}"),
+      comment_url = ApiPath(""),
+      commit = Commit(
+        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
+        author = ApiPersonIdent.author(commitInfo),
+        committer = ApiPersonIdent.committer(commitInfo),
+        message = commitInfo.shortMessage,
+        comment_count = commentCount,
+        tree = Tree(
+          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${commitInfo.id}"), // TODO This endpoint has not been implemented yet.
+          sha = commitInfo.id
+        )
+      ),
+      author = ApiUser(author),
+      committer = ApiUser(committer),
+      parents = commitInfo.parents.map { parent =>
+        Tree(
+          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${parent}"), // TODO This endpoint has not been implemented yet.
+          sha = parent
+        )
+      },
+      stats = Stats(
+        additions = files.map(_.additions).sum,
+        deletions = files.map(_.deletions).sum,
+        total = files.map(_.additions).sum + files.map(_.deletions).sum
+      ),
+      files = files
+    )
+  }
+}

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

@@ -1,6 +1,13 @@
 package gitbucket.core.api
 
 /**
- * path for api url. if set path '/repos/aa/bb' then, expand 'http://server:post/repos/aa/bb' when converted to json.
+ * Path for API url.
+ * If set path '/repos/aa/bb' then, expand 'http://server:port/repos/aa/bb' when converted to json.
  */
 case class ApiPath(path: String)
+
+/**
+ * Path for git repository via SSH.
+ * If set path '/aa/bb.git' then, expand 'git@server:port/aa/bb.git' when converted to json.
+ */
+case class SshPath(path: String)

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

@@ -3,7 +3,6 @@ package gitbucket.core.api
 import gitbucket.core.model.{Account, Issue, IssueComment, PullRequest}
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/pulls/
  */
@@ -19,7 +18,8 @@ case class ApiPullRequest(
   merged_by: Option[ApiUser],
   title: String,
   body: String,
-  user: ApiUser) {
+  user: ApiUser,
+  assignee: Option[ApiUser]){
   val html_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
   //val diff_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}.diff")
   //val patch_url           = ApiPath(s"${base.repo.html_url.path}/pull/${number}.patch")
@@ -39,6 +39,7 @@ object ApiPullRequest{
     headRepo: ApiRepository,
     baseRepo: ApiRepository,
     user: ApiUser,
+    assignee: Option[ApiUser],
     mergedComment: Option[(IssueComment, Account)]
   ): ApiPullRequest =
     ApiPullRequest(
@@ -59,14 +60,16 @@ object ApiPullRequest{
       merged_by  = mergedComment.map { case (_, account) => ApiUser(account) },
       title      = issue.title,
       body       = issue.content.getOrElse(""),
-      user       = user
+      user       = user,
+      assignee   = assignee
     )
 
   case class Commit(
     sha: String,
     ref: String,
     repo: ApiRepository)(baseOwner:String){
-    val label = if( baseOwner == repo.owner.login ){ ref }else{ s"${repo.owner.login}:${ref}" }
+    val label = if( baseOwner == repo.owner.login ){ ref } else { s"${repo.owner.login}:${ref}" }
     val user = repo.owner
   }
+
 }

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

@@ -24,6 +24,7 @@ case class ApiRepository(
   val http_url  = ApiPath(s"/git/${full_name}.git")
   val clone_url = ApiPath(s"/git/${full_name}.git")
   val html_url  = ApiPath(s"/${full_name}")
+  val ssh_url   = Some(SshPath(s":${full_name}.git"))
 }
 
 object ApiRepository{
@@ -55,12 +56,13 @@ object ApiRepository{
 
   def forDummyPayload(owner: ApiUser): ApiRepository =
     ApiRepository(
-      name="dummy",
-      full_name=s"${owner.login}/dummy",
-      description="",
-      watchers=0,
-      forks=0,
-      `private`=false,
-      default_branch="master",
-      owner=owner)(true)
+      name           = "dummy",
+      full_name      = s"${owner.login}/dummy",
+      description    = "",
+      watchers       = 0,
+      forks          = 0,
+      `private`      = false,
+      default_branch = "master",
+      owner          = owner
+    )(true)
 }

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

@@ -10,7 +10,7 @@ import scala.util.Try
 
 object JsonFormat {
 
-  case class Context(baseUrl: String)
+  case class Context(baseUrl: String, sshUrl: Option[String])
 
   val parserISO = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
@@ -33,23 +33,31 @@ object JsonFormat {
     FieldSerializer[ApiComment]() +
     FieldSerializer[ApiContents]() +
     FieldSerializer[ApiLabel]() +
+    FieldSerializer[ApiCommits]() +
+    FieldSerializer[ApiCommits.Commit]() +
+    FieldSerializer[ApiCommits.Tree]() +
+    FieldSerializer[ApiCommits.Stats]() +
+    FieldSerializer[ApiCommits.File]() +
     ApiBranchProtection.enforcementLevelSerializer
 
-  def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>
-    (
-      {
-        case JString(s) if s.startsWith(c.baseUrl) => ApiPath(s.substring(c.baseUrl.length))
-        case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
-      },
-      {
-        case ApiPath(path) => JString(c.baseUrl + path)
-      }
-    )
-  )
+  def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](_ => ({
+    case JString(s) if s.startsWith(c.baseUrl) => ApiPath(s.substring(c.baseUrl.length))
+    case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
+  }, {
+    case ApiPath(path) => JString(c.baseUrl + path)
+  }))
+
+  def sshPathSerializer(c: Context) = new CustomSerializer[SshPath](_ => ({
+    case JString(s) if c.sshUrl.exists(sshUrl => s.startsWith(sshUrl)) => SshPath(s.substring(c.sshUrl.get.length))
+    case JString(s) => throw new MappingException("Can't convert " + s + " to ApiPath")
+  }, {
+    case SshPath(path) => c.sshUrl.map { sshUrl => JString(sshUrl + path) } getOrElse JNothing
+  }))
 
   /**
    * convert object to json string
    */
-  def apply(obj: AnyRef)(implicit c: Context): String = Serialization.write(obj)(jsonFormats + apiPathSerializer(c))
+  def apply(obj: AnyRef)(implicit c: Context): String =
+    Serialization.write(obj)(jsonFormats + apiPathSerializer(c) + sshPathSerializer(c))
 
 }

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

@@ -1,14 +0,0 @@
-package gitbucket.core.controller
-
-class AnonymousAccessController extends AnonymousAccessControllerBase
-
-trait AnonymousAccessControllerBase extends ControllerBase {
-  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
-    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
-      !context.currentPath.startsWith("/register")) {
-      Unauthorized()
-    } else {
-      pass()
-    }
-  }
-}

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

@@ -5,14 +5,16 @@ import gitbucket.core.model._
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.JGitUtil._
-import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.view.helpers.{renderMarkup, isRenderable}
+import gitbucket.core.util.JGitUtil._
+import gitbucket.core.util.SyntaxSugars._
+import gitbucket.core.util._
+import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
 import org.eclipse.jgit.api.Git
-import org.scalatra.{NoContent, UnprocessableEntity, Created}
+import org.eclipse.jgit.revwalk.RevWalk
+import org.scalatra.{Created, NoContent, UnprocessableEntity}
+
 import scala.collection.JavaConverters._
 
 class ApiController extends ApiControllerBase
@@ -49,6 +51,7 @@ trait ApiControllerBase extends ControllerBase {
     with LabelsService
     with MilestonesService
     with PullRequestService
+    with CommitsService
     with CommitStatusService
     with RepositoryCreationService
     with IssueCreationService
@@ -124,10 +127,10 @@ trait ApiControllerBase extends ControllerBase {
   /**
     * https://developer.github.com/v3/repos/branches/#get-branch
     */
-  get ("/api/v3/repos/:owner/:repo/branches/:branch")(referrersOnly { repository =>
+  get ("/api/v3/repos/:owner/:repo/branches/*")(referrersOnly { repository =>
     //import gitbucket.core.api._
     (for{
-      branch     <- params.get("branch") if repository.branchList.contains(branch)
+      branch <- params.get("splat") if repository.branchList.contains(branch)
       br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
     } yield {
       val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
@@ -286,10 +289,10 @@ trait ApiControllerBase extends ControllerBase {
   /**
    * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
    */
-  patch("/api/v3/repos/:owner/:repo/branches/:branch")(ownerOnly { repository =>
+  patch("/api/v3/repos/:owner/:repo/branches/*")(ownerOnly { repository =>
     import gitbucket.core.api._
     (for{
-      branch     <- params.get("branch") if repository.branchList.contains(branch)
+      branch     <- params.get("splat") if repository.branchList.contains(branch)
       protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
       br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch)
     } yield {
@@ -381,7 +384,7 @@ trait ApiControllerBase extends ControllerBase {
   get("/api/v3/repos/:owner/:repository/issues/:id/comments")(referrersOnly { repository =>
     (for{
       issueId  <- params("id").toIntOpt
-      comments =  getCommentsForApi(repository.owner, repository.name, issueId.toInt)
+      comments =  getCommentsForApi(repository.owner, repository.name, issueId)
     } yield {
       JsonFormat(comments.map{ case (issueComment, user, issue) => ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest) })
     }) getOrElse NotFound()
@@ -498,7 +501,7 @@ trait ApiControllerBase extends ControllerBase {
     val condition = IssueSearchCondition(request)
     val baseOwner = getAccountByUserName(repository.owner).get
 
-    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account)] =
+    val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] =
       searchPullRequestByApi(
         condition = condition,
         offset    = (page - 1) * PullRequestLimit,
@@ -506,13 +509,14 @@ trait ApiControllerBase extends ControllerBase {
         repos     = repository.owner -> repository.name
       )
 
-    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) =>
+    JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) =>
       ApiPullRequest(
         issue         = issue,
         pullRequest   = pullRequest,
         headRepo      = ApiRepository(headRepo, ApiUser(headOwner)),
         baseRepo      = ApiRepository(repository, ApiUser(baseOwner)),
         user          = ApiUser(issueUser),
+        assignee      = assignee.map(ApiUser.apply),
         mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
       )
     })
@@ -529,6 +533,7 @@ trait ApiControllerBase extends ControllerBase {
       baseOwner <- users.get(repository.owner)
       headOwner <- users.get(pullRequest.requestUserName)
       issueUser <- users.get(issue.openedUserName)
+      assignee  =  issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) }
       headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
     } yield {
       JsonFormat(ApiPullRequest(
@@ -537,6 +542,7 @@ trait ApiControllerBase extends ControllerBase {
         headRepo      = ApiRepository(headRepo, ApiUser(headOwner)),
         baseRepo      = ApiRepository(repository, ApiUser(baseOwner)),
         user          = ApiUser(issueUser),
+        assignee      = assignee.map(ApiUser.apply),
         mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId)
       ))
     }) getOrElse NotFound()
@@ -627,6 +633,52 @@ trait ApiControllerBase extends ControllerBase {
     }) getOrElse NotFound()
   })
 
+  /**
+   * https://developer.github.com/v3/repos/commits/#get-a-single-commit
+   */
+  get("/api/v3/repos/:owner/:repo/commits/:sha")(referrersOnly { repository =>
+    val owner = repository.owner
+    val name  = repository.name
+    val sha   = params("sha")
+
+    using(Git.open(getRepositoryDir(owner, name))){ git =>
+      val repo = git.getRepository
+      val objectId = repo.resolve(sha)
+      val commitInfo = using(new RevWalk(repo)){ revWalk =>
+        new CommitInfo(revWalk.parseCommit(objectId))
+      }
+
+      JsonFormat(ApiCommits(
+        repositoryName = RepositoryName(repository),
+        commitInfo     = commitInfo,
+        diffs          = JGitUtil.getDiffs(git, commitInfo.parents.head, commitInfo.id, false, true),
+        author         = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress),
+        committer      = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress),
+        commentCount   = getCommitComment(repository.owner, repository.name, sha).size
+      ))
+    }
+  })
+
+  private def getAccount(userName: String, email: String): Account = {
+    getAccountByMailAddress(email).getOrElse {
+      Account(
+        userName = userName,
+        fullName = userName,
+        mailAddress = email,
+        password = "xxx",
+        isAdmin = false,
+        url = None,
+        registeredDate = new java.util.Date(),
+        updatedDate = new java.util.Date(),
+        lastLoginDate = None,
+        image = None,
+        isGroupAccount = false,
+        isRemoved = true,
+        description = None
+      )
+    }
+  }
+
   private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
     hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 

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

@@ -26,6 +26,7 @@ import org.eclipse.jgit.lib.ObjectId
 import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.treewalk._
 import org.apache.commons.io.IOUtils
+import org.slf4j.LoggerFactory
 
 /**
  * Provides generic features for controller implementations.
@@ -34,6 +35,8 @@ abstract class ControllerBase extends ScalatraFilter
   with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
   with SystemSettingsService {
 
+  private val logger = LoggerFactory.getLogger(getClass)
+
   implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
 
   before("/api/v3/*") {
@@ -147,6 +150,20 @@ abstract class ControllerBase extends ScalatraFilter
       }
     }
 
+  error{
+    case e => {
+      logger.error(s"Catch unhandled error in request: ${request}", e)
+      if(request.hasAttribute(Keys.Request.Ajax)){
+        org.scalatra.InternalServerError()
+      } else if(request.hasAttribute(Keys.Request.APIv3)){
+        contentType = formats("json")
+        org.scalatra.InternalServerError(ApiError("Internal Server Error"))
+      } else {
+        org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
+      }
+    }
+  }
+
   override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
                    includeContextPath: Boolean = true, includeServletPath: Boolean = true,
                    absolutize: Boolean = true, withSessionId: Boolean = true)
@@ -163,7 +180,7 @@ abstract class ControllerBase extends ScalatraFilter
     override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Seq[(String, String)] =
       valueType.validate(name, trim(value), params, messages)
 
-    private def trim(value: String): String = if(value == null) null else value.replaceAll("\r\n", "").trim
+    private def trim(value: String): String = if(value == null) null else value.replace("\r\n", "").trim
   }
 
   /**
@@ -304,7 +321,7 @@ trait AccountManagementControllerBase extends ControllerBase {
         .map    { _ => "Mail address is already registered." }
   }
 
-  val allReservedNames = Set("git", "admin", "upload", "api")
+  val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets", "signin", "signout", "register", "activities.atom", "sidebar-collapse", "groups", "new")
   protected def reservedNames(): Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){
       Some(s"${value} is reserved")

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

@@ -48,7 +48,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
       FileUtils.writeByteArrayToFile(new java.io.File(
         getAttachedDir(params("owner"), params("repository")),
         fileId + "." + FileUtil.getExtension(file.getName)), file.get)
-    }, FileUtil.isUploadableType)
+    }, _ => true)
   }
 
   post("/wiki/:owner/:repository"){
@@ -80,12 +80,12 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
               builder.finish()
 
               val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-                Constants.HEAD, loginAccount.userName, loginAccount.mailAddress, s"Uploaded ${fileName}")
+                Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, s"Uploaded ${fileName}")
 
               fileName
             }
           }
-        }, FileUtil.isUploadableType)
+        }, _ => true)
       }
     } getOrElse BadRequest()
   }
@@ -113,7 +113,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
     }
   }
 
-  private def execute(f: (FileItem, String) => Unit, mimeTypeChcker: (String) => Boolean) = fileParams.get("file") match {
+  private def execute(f: (FileItem, String) => Unit , mimeTypeChcker: (String) => Boolean) = fileParams.get("file") match {
     case Some(file) if(mimeTypeChcker(file.name)) =>
       defining(FileUtil.generateFileId){ fileId =>
         f(file, fileId)

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

@@ -19,11 +19,12 @@ trait IndexControllerBase extends ControllerBase {
   self: RepositoryService with ActivityService with AccountService with RepositorySearchService
     with UsersAuthenticator with ReferrerAuthenticator =>
 
-  case class SignInForm(userName: String, password: String)
+  case class SignInForm(userName: String, password: String, hash: Option[String])
 
   val signinForm = mapping(
     "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required)))
+    "password" -> trim(label("Password", text(required))),
+    "hash" -> trim(optional(text()))
   )(SignInForm.apply)
 
 //  val searchForm = mapping(
@@ -54,7 +55,7 @@ trait IndexControllerBase extends ControllerBase {
 
   post("/signin", signinForm){ form =>
     authenticate(context.settings, form.userName, form.password) match {
-      case Some(account) => signin(account)
+      case Some(account) => signin(account, form.hash)
       case None          => {
         flash += "userName" -> form.userName
         flash += "password" -> form.password
@@ -86,7 +87,7 @@ trait IndexControllerBase extends ControllerBase {
   /**
    * Set account information into HttpSession and redirect.
    */
-  private def signin(account: Account) = {
+  private def signin(account: Account, hash: Option[String]) = {
     session.setAttribute(Keys.Session.LoginAccount, account)
     updateLastLoginDate(account.userName)
 
@@ -98,7 +99,7 @@ trait IndexControllerBase extends ControllerBase {
       if(redirectUrl.stripSuffix("/") == request.getContextPath){
         redirect("/")
       } else {
-        redirect(redirectUrl)
+        redirect(redirectUrl + hash.getOrElse(""))
       }
     }.getOrElse {
       redirect("/")
@@ -120,7 +121,12 @@ trait IndexControllerBase extends ControllerBase {
             case (true, false) => !t.isGroupAccount
             case (false, true) => t.isGroupAccount
             case (false, false) => false
-          }}.map { t => t.userName }
+          }}.map { t =>
+            Map(
+              "label" -> s"<b>@${t.userName}</b> ${t.fullName}",
+              "value" -> t.userName
+            )
+          }
       ))
     )
   })

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

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

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

@@ -0,0 +1,40 @@
+package gitbucket.core.controller
+
+import org.scalatra.MovedPermanently
+
+class PreProcessController extends PreProcessControllerBase
+
+trait PreProcessControllerBase extends ControllerBase {
+
+  /**
+   * Provides GitHub compatible URLs for Git client.
+   *
+   * <ul>
+   *   <li>git clone http://localhost:8080/owner/repo</li>
+   *   <li>git clone http://localhost:8080/owner/repo.git</li>
+   * </ul>
+   *
+   * @see https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols
+   */
+  get("/*/*/info/refs") {
+    val query = Option(request.getQueryString).map("?" + _).getOrElse("")
+    halt(MovedPermanently(baseUrl + "/git" + request.getRequestURI + query))
+  }
+
+  /**
+   * Filter requests from anonymous users.
+   *
+   * If anonymous access is allowed, pass all requests.
+   * But if it's not allowed, demands authentication except some paths.
+   */
+  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
+    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
+      !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs")) {
+      Unauthorized()
+    } else {
+      pass()
+    }
+  }
+
+
+}

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

@@ -251,7 +251,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           using(Git.open(getRepositoryDir(owner, name))) { git =>
             // mark issue as merged and close.
             val loginAccount = context.loginAccount.get
-            createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
+            val commentId = createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
             createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
             updateClosed(owner, name, issueId, true)
 
@@ -282,7 +282,10 @@ trait PullRequestsControllerBase extends ControllerBase {
             callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
 
             // call hooks
-            PluginRegistry().getPullRequestHooks.foreach(_.merged(issue, repository))
+            PluginRegistry().getPullRequestHooks.foreach{ h =>
+              h.addedComment(commentId, form.message, issue, repository)
+              h.merged(issue, repository)
+            }
 
             redirect(s"/${owner}/${name}/pull/${issueId}")
           }
@@ -321,8 +324,8 @@ trait PullRequestsControllerBase extends ControllerBase {
 
   get("/:owner/:repository/compare/*...*")(referrersOnly { forkedRepository =>
     val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, originId) = parseCompareIdentifie(origin, forkedRepository.owner)
-    val (forkedOwner, forkedId) = parseCompareIdentifie(forked, forkedRepository.owner)
+    val (originOwner, originId) = parseCompareIdentifier(origin, forkedRepository.owner)
+    val (forkedOwner, forkedId) = parseCompareIdentifier(forked, forkedRepository.owner)
 
     (for(
       originRepositoryName <- if(originOwner == forkedOwner) {
@@ -408,8 +411,8 @@ trait PullRequestsControllerBase extends ControllerBase {
 
   ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(readableUsersOnly { forkedRepository =>
     val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
-    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifier(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifier(forked, forkedRepository.owner)
 
     (for(
       originRepositoryName <- if(originOwner == forkedOwner){
@@ -502,7 +505,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    * - "owner:branch" to ("owner", "branch")
    * - "branch" to ("defaultOwner", "branch")
    */
-  private def parseCompareIdentifie(value: String, defaultOwner: String): (String, String) =
+  private def parseCompareIdentifier(value: String, defaultOwner: String): (String, String) =
     if(value.contains(':')){
       val array = value.split(":")
       (array(0), array(1))

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

@@ -393,7 +393,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   post("/:owner/:repository/settings/gc")(ownerOnly { repository =>
     LockUtil.lock(s"${repository.owner}/${repository.name}") {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        git.gc()
+        git.gc().call()
       }
     }
     flash += "info" -> "Garbage collection has been executed."

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

@@ -13,7 +13,7 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import gitbucket.core.model.{Account, WebHook}
+import gitbucket.core.model.{Account, CommitState, CommitStatus, WebHook}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers
@@ -24,6 +24,7 @@ import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
 import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib._
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
 import org.scalatra._
 import org.scalatra.i18n.Messages
 
@@ -174,13 +175,24 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val (branchName, path) = repository.splitPath(multiParams("splat").head)
     val page = params.get("page").flatMap(_.toIntOpt).getOrElse(1)
 
+    def getStatuses(sha: String): List[CommitStatus] = {
+      getCommitStatues(repository.owner, repository.name, sha)
+    }
+
+    def getSummary(statuses: List[CommitStatus]): (CommitState, String) = {
+      val stateMap = statuses.groupBy(_.state)
+      val state = CommitState.combine(stateMap.keySet)
+      val summary = stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ")
+      state -> summary
+    }
+
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
         case Right((logs, hasNext)) =>
           html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
             logs.splitWith{ (commit1, commit2) =>
               view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
-            }, page, hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+            }, page, hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), getStatuses, getSummary)
         case Left(_) => NotFound()
       }
     }
@@ -213,7 +225,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
     val files = form.uploadFiles.split("\n").map { line =>
-      val i = line.indexOf(":")
+      val i = line.indexOf(':')
       CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
     }
 
@@ -222,7 +234,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       branch     = form.branch,
       path       = form.path,
       files      = files,
-      message    = form.message.getOrElse(s"Add files via upload")
+      message    = form.message.getOrElse("Add files via upload")
     )
 
     if(form.path.length == 0){
@@ -420,7 +432,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     try {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) { revCommit =>
-          JGitUtil.getDiffs(git, id) match {
+          JGitUtil.getDiffs(git, id, true) match {
             case (diffs, oldCommitId) =>
               html.commit(id, new JGitUtil.CommitInfo(revCommit),
                 JGitUtil.getBranchesOfCommit(git, revCommit.getName),
@@ -467,9 +479,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
     form.issueId match {
       case Some(issueId) =>
-        recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content)
-        callPullRequestReviewCommentWebHook("create", comment, repository, issueId, context.baseUrl, context.loginAccount.get)
-      case None => recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content)
+        getPullRequest(repository.owner, repository.name, issueId).foreach { case (issue, pullRequest) =>
+          recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content)
+          PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId, form.content, issue, repository))
+          callPullRequestReviewCommentWebHook("create", comment, repository, issue, pullRequest, context.baseUrl, context.loginAccount.get)
+        }
+      case None =>
+        recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content)
     }
     helper.html.commitcomment(comment, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
   })
@@ -630,8 +646,8 @@ 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 UploadFiles(branch: String, path: String, fileIds: Map[String,String], message: String) {
+    lazy val isValid: Boolean = fileIds.nonEmpty
   }
 
   case class CommitFile(id: String, name: String)
@@ -702,39 +718,63 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         f(git, headTip, builder, inserter)
 
         val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
-          headName, loginAccount.userName, loginAccount.mailAddress, message)
+          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.update()
+        val receivePack = new ReceivePack(git.getRepository)
+        val receiveCommand = new ReceiveCommand(headTip, commitId, headName)
 
-        // update pull request
-        updatePullRequests(repository.owner, repository.name, branch)
+        // call post commit hook
+        val error = PluginRegistry().getReceiveHooks.flatMap { hook =>
+          hook.preReceive(repository.owner, repository.name, receivePack, receiveCommand, loginAccount.userName)
+        }.headOption
 
-        // record activity
-        val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
+        error match {
+          case Some(error) =>
+            // commit is rejected
+            // TODO Notify commit failure to edited user
+            val refUpdate = git.getRepository.updateRef(headName)
+            refUpdate.setNewObjectId(headTip)
+            refUpdate.setForceUpdate(true)
+            refUpdate.update()
 
-        // create issue comment by commit message
-        createIssueComment(repository.owner, repository.name, commitInfo)
+          case None =>
+            // update refs
+            val refUpdate = git.getRepository.updateRef(headName)
+            refUpdate.setNewObjectId(commitId)
+            refUpdate.setForceUpdate(false)
+            refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+            refUpdate.update()
 
-        // close issue by commit message
-        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+            // update pull request
+            updatePullRequests(repository.owner, repository.name, branch)
 
-        //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)
-          }
+            // record activity
+            val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+            recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
+
+            // create issue comment by commit message
+            createIssueComment(repository.owner, repository.name, commitInfo)
+
+            // close issue by commit message
+            closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+
+            // call post commit hook
+            PluginRegistry().getReceiveHooks.foreach { hook =>
+              hook.postReceive(repository.owner, repository.name, receivePack, receiveCommand, loginAccount.userName)
+            }
+
+            //call web hook
+            callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
+            val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+            callWebHookOf(repository.owner, repository.name, WebHook.Push) {
+              getAccountByUserName(repository.owner).map{ ownerAccount =>
+                WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
+                  oldId = headTip, newId = commitId)
+              }
+            }
         }
       }
     }

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

@@ -63,7 +63,8 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
         "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
         "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
         "keystore"                 -> trim(label("Keystore", optional(text())))
-    )(Ldap.apply))
+    )(Ldap.apply)),
+    "skinName" -> trim(label("AdminLTE skin name", text(required)))
   )(SystemSettings.apply).verifying { settings =>
     Vector(
       if(settings.ssh && settings.baseUrl.isEmpty){
@@ -173,9 +174,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 
   post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
     try {
-      new Mailer(form.smtp).send(form.testAddress,
-        "Test message from GitBucket", "This is a test message from GitBucket.",
-        context.loginAccount.get)
+      new Mailer(context.settings.copy(smtp = Some(form.smtp), notification = true)).send(
+        to           = form.testAddress,
+        subject      = "Test message from GitBucket",
+        textMsg      = "This is a test message from GitBucket.",
+        htmlMsg      = None,
+        loginAccount = context.loginAccount
+      )
 
       "Test mail has been sent to: " + form.testAddress
 

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

@@ -76,7 +76,7 @@ trait WikiControllerBase extends ControllerBase {
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).filter(_.newPath == pageName + ".md"), repository,
+      html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true, false).filter(_.newPath == pageName + ".md"), repository,
         isEditable(repository), flash.get("info"))
     }
   })
@@ -85,7 +85,7 @@ trait WikiControllerBase extends ControllerBase {
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
+      html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true, false), repository,
         isEditable(repository), flash.get("info"))
     }
   })

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

@@ -3,18 +3,20 @@ package gitbucket.core.plugin
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Issue
 import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.model.Profile._
+import profile.api._
 
 trait IssueHook {
 
-  def created(issue: Issue, repository: RepositoryInfo)(implicit 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 = ()
+  def created(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
+  def addedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
+  def closed(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
+  def reopened(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
 
 }
 
 trait PullRequestHook extends IssueHook {
 
-  def merged(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+  def merged(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = ()
 
 }

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

@@ -4,6 +4,9 @@ import java.io.{File, FilenameFilter, InputStream}
 import java.net.URLClassLoader
 import java.nio.file.{Files, Paths, StandardWatchEventKinds}
 import java.util.Base64
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.ConcurrentHashMap
 import javax.servlet.ServletContext
 
 import gitbucket.core.controller.{Context, ControllerBase}
@@ -22,51 +25,49 @@ import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
 import play.twirl.api.Html
 
-import scala.collection.mutable
-import scala.collection.mutable.ListBuffer
+import scala.collection.JavaConverters._
 
 class PluginRegistry {
 
-  private val plugins = new ListBuffer[PluginInfo]
-  private val javaScripts = new ListBuffer[(String, String)]
-  private val controllers = new ListBuffer[(ControllerBase, String)]
-  private val images = mutable.Map[String, String]()
-  private val renderers = mutable.Map[String, Renderer]()
-  renderers ++= Seq(
-    "md" -> MarkdownRenderer, "markdown" -> MarkdownRenderer
-  )
-  private val repositoryRoutings = new ListBuffer[GitRepositoryRouting]
-  private val accountHooks = new ListBuffer[AccountHook]
-  private val receiveHooks = new ListBuffer[ReceiveHook]
-  receiveHooks += new ProtectedBranchReceiveHook()
+  private val plugins = new ConcurrentLinkedQueue[PluginInfo]
+  private val javaScripts = new ConcurrentLinkedQueue[(String, String)]
+  private val controllers = new ConcurrentLinkedQueue[(ControllerBase, String)]
+  private val images = new ConcurrentHashMap[String, String]
+  private val renderers = new ConcurrentHashMap[String, Renderer]
+  renderers.put("md", MarkdownRenderer)
+  renderers.put("markdown", MarkdownRenderer)
+  private val repositoryRoutings = new ConcurrentLinkedQueue[GitRepositoryRouting]
+  private val accountHooks = new ConcurrentLinkedQueue[AccountHook]
+  private val receiveHooks = new ConcurrentLinkedQueue[ReceiveHook]
+  receiveHooks.add(new ProtectedBranchReceiveHook())
 
-  private val repositoryHooks = new ListBuffer[RepositoryHook]
-  private val issueHooks = new ListBuffer[IssueHook]
+  private val repositoryHooks = new ConcurrentLinkedQueue[RepositoryHook]
+  private val issueHooks = new ConcurrentLinkedQueue[IssueHook]
 
-  private val pullRequestHooks = new ListBuffer[PullRequestHook]
+  private val pullRequestHooks = new ConcurrentLinkedQueue[PullRequestHook]
 
-  private val repositoryHeaders = new ListBuffer[(RepositoryInfo, Context) => Option[Html]]
-  private val globalMenus = new ListBuffer[(Context) => Option[Link]]
-  private val repositoryMenus = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
-  private val repositorySettingTabs = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
-  private val profileTabs = new ListBuffer[(Account, Context) => Option[Link]]
-  private val systemSettingMenus = new ListBuffer[(Context) => Option[Link]]
-  private val accountSettingMenus = new ListBuffer[(Context) => Option[Link]]
-  private val dashboardTabs = new ListBuffer[(Context) => Option[Link]]
-  private val issueSidebars = new ListBuffer[(Issue, RepositoryInfo, Context) => Option[Html]]
-  private val assetsMappings = new ListBuffer[(String, String, ClassLoader)]
-  private val textDecorators = new ListBuffer[TextDecorator]
+  private val repositoryHeaders = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Html]]
+  private val globalMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val repositoryMenus = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Link]]
+  private val repositorySettingTabs = new ConcurrentLinkedQueue[(RepositoryInfo, Context) => Option[Link]]
+  private val profileTabs = new ConcurrentLinkedQueue[(Account, Context) => Option[Link]]
+  private val systemSettingMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val accountSettingMenus = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val dashboardTabs = new ConcurrentLinkedQueue[(Context) => Option[Link]]
+  private val issueSidebars = new ConcurrentLinkedQueue[(Issue, RepositoryInfo, Context) => Option[Html]]
+  private val assetsMappings = new ConcurrentLinkedQueue[(String, String, ClassLoader)]
+  private val textDecorators = new ConcurrentLinkedQueue[TextDecorator]
 
-  private val suggestionProviders = new ListBuffer[SuggestionProvider]
-  suggestionProviders += new UserNameSuggestionProvider()
+  private val suggestionProviders = new ConcurrentLinkedQueue[SuggestionProvider]
+  suggestionProviders.add(new UserNameSuggestionProvider())
 
-  def addPlugin(pluginInfo: PluginInfo): Unit = plugins += pluginInfo
+  def addPlugin(pluginInfo: PluginInfo): Unit = plugins.add(pluginInfo)
 
-  def getPlugins(): List[PluginInfo] = plugins.toList
+  def getPlugins(): List[PluginInfo] = plugins.asScala.toList
 
   def addImage(id: String, bytes: Array[Byte]): Unit = {
     val encoded = Base64.getEncoder.encodeToString(bytes)
-    images += ((id, encoded))
+    images.put(id, encoded)
   }
 
   @deprecated("Use addImage(id: String, bytes: Array[Byte]) instead", "3.4.0")
@@ -79,28 +80,28 @@ class PluginRegistry {
     addImage(id, bytes)
   }
 
-  def getImage(id: String): String = images(id)
+  def getImage(id: String): String = images.get(id)
 
-  def addController(path: String, controller: ControllerBase): Unit = controllers += ((controller, path))
+  def addController(path: String, controller: ControllerBase): Unit = controllers.add((controller, path))
 
   @deprecated("Use addController(path: String, controller: ControllerBase) instead", "3.4.0")
   def addController(controller: ControllerBase, path: String): Unit = addController(path, controller)
 
-  def getControllers(): Seq[(ControllerBase, String)] = controllers.toSeq
+  def getControllers(): Seq[(ControllerBase, String)] = controllers.asScala.toSeq
 
-  def addJavaScript(path: String, script: String): Unit = javaScripts += ((path, script))
+  def addJavaScript(path: String, script: String): Unit = javaScripts.add((path, script)) //javaScripts += ((path, script))
 
-  def getJavaScript(currentPath: String): List[String] = javaScripts.filter(x => currentPath.matches(x._1)).toList.map(_._2)
+  def getJavaScript(currentPath: String): List[String] = javaScripts.asScala.filter(x => currentPath.matches(x._1)).toList.map(_._2)
 
-  def addRenderer(extension: String, renderer: Renderer): Unit = renderers += ((extension, renderer))
+  def addRenderer(extension: String, renderer: Renderer): Unit = renderers.put(extension, renderer)
 
-  def getRenderer(extension: String): Renderer = renderers.getOrElse(extension, DefaultRenderer)
+  def getRenderer(extension: String): Renderer = renderers.asScala.getOrElse(extension, DefaultRenderer)
 
-  def renderableExtensions: Seq[String] = renderers.keys.toSeq
+  def renderableExtensions: Seq[String] = renderers.keys.asScala.toSeq
 
-  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = repositoryRoutings += routing
+  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = repositoryRoutings.add(routing)
 
-  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = repositoryRoutings.toSeq
+  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = repositoryRoutings.asScala.toSeq
 
   def getRepositoryRouting(repositoryPath: String): Option[GitRepositoryRouting] = {
     PluginRegistry().getRepositoryRoutings().find {
@@ -110,73 +111,73 @@ class PluginRegistry {
     }
   }
 
-  def addAccountHook(accountHook: AccountHook): Unit = accountHooks += accountHook
+  def addAccountHook(accountHook: AccountHook): Unit = accountHooks.add(accountHook)
 
-  def getAccountHooks: Seq[AccountHook] = accountHooks.toSeq
+  def getAccountHooks: Seq[AccountHook] = accountHooks.asScala.toSeq
 
-  def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks += commitHook
+  def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks.add(commitHook)
 
-  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq
+  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.asScala.toSeq
 
-  def addRepositoryHook(repositoryHook: RepositoryHook): Unit = repositoryHooks += repositoryHook
+  def addRepositoryHook(repositoryHook: RepositoryHook): Unit = repositoryHooks.add(repositoryHook)
 
-  def getRepositoryHooks: Seq[RepositoryHook] = repositoryHooks.toSeq
+  def getRepositoryHooks: Seq[RepositoryHook] = repositoryHooks.asScala.toSeq
 
-  def addIssueHook(issueHook: IssueHook): Unit = issueHooks += issueHook
+  def addIssueHook(issueHook: IssueHook): Unit = issueHooks.add(issueHook)
 
-  def getIssueHooks: Seq[IssueHook] = issueHooks.toSeq
+  def getIssueHooks: Seq[IssueHook] = issueHooks.asScala.toSeq
 
-  def addPullRequestHook(pullRequestHook: PullRequestHook): Unit = pullRequestHooks += pullRequestHook
+  def addPullRequestHook(pullRequestHook: PullRequestHook): Unit = pullRequestHooks.add(pullRequestHook)
 
-  def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.toSeq
+  def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.asScala.toSeq
 
-  def addRepositoryHeader(repositoryHeader: (RepositoryInfo, Context) => Option[Html]): Unit = repositoryHeaders += repositoryHeader
+  def addRepositoryHeader(repositoryHeader: (RepositoryInfo, Context) => Option[Html]): Unit = repositoryHeaders.add(repositoryHeader)
 
-  def getRepositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = repositoryHeaders.toSeq
+  def getRepositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = repositoryHeaders.asScala.toSeq
 
-  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus += globalMenu
+  def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus.add(globalMenu)
 
-  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq
+  def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.asScala.toSeq
 
-  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus += repositoryMenu
+  def addRepositoryMenu(repositoryMenu: (RepositoryInfo, Context) => Option[Link]): Unit = repositoryMenus.add(repositoryMenu)
 
-  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.toSeq
+  def getRepositoryMenus: Seq[(RepositoryInfo, Context) => Option[Link]] = repositoryMenus.asScala.toSeq
 
-  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs += repositorySettingTab
+  def addRepositorySettingTab(repositorySettingTab: (RepositoryInfo, Context) => Option[Link]): Unit = repositorySettingTabs.add(repositorySettingTab)
 
-  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.toSeq
+  def getRepositorySettingTabs: Seq[(RepositoryInfo, Context) => Option[Link]] = repositorySettingTabs.asScala.toSeq
 
-  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = profileTabs += profileTab
+  def addProfileTab(profileTab: (Account, Context) => Option[Link]): Unit = profileTabs.add(profileTab)
 
-  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.toSeq
+  def getProfileTabs: Seq[(Account, Context) => Option[Link]] = profileTabs.asScala.toSeq
 
-  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus += systemSettingMenu
+  def addSystemSettingMenu(systemSettingMenu: (Context) => Option[Link]): Unit = systemSettingMenus.add(systemSettingMenu)
 
-  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.toSeq
+  def getSystemSettingMenus: Seq[(Context) => Option[Link]] = systemSettingMenus.asScala.toSeq
 
-  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus += accountSettingMenu
+  def addAccountSettingMenu(accountSettingMenu: (Context) => Option[Link]): Unit = accountSettingMenus.add(accountSettingMenu)
 
-  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.toSeq
+  def getAccountSettingMenus: Seq[(Context) => Option[Link]] = accountSettingMenus.asScala.toSeq
 
-  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = dashboardTabs += dashboardTab
+  def addDashboardTab(dashboardTab: (Context) => Option[Link]): Unit = dashboardTabs.add(dashboardTab)
 
-  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.toSeq
+  def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.asScala.toSeq
 
-  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars += issueSidebar
+  def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars.add(issueSidebar)
 
-  def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.toSeq
+  def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.asScala.toSeq
 
-  def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings += assetsMapping
+  def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings.add(assetsMapping)
 
-  def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.toSeq
+  def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.asScala.toSeq
 
-  def addTextDecorator(textDecorator: TextDecorator): Unit = textDecorators += textDecorator
+  def addTextDecorator(textDecorator: TextDecorator): Unit = textDecorators.add(textDecorator)
 
-  def getTextDecorators: Seq[TextDecorator] = textDecorators.toSeq
+  def getTextDecorators: Seq[TextDecorator] = textDecorators.asScala.toSeq
 
-  def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders += suggestionProvider
+  def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders.add(suggestionProvider)
 
-  def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.toSeq
+  def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.asScala.toSeq
 }
 
 /**
@@ -190,6 +191,7 @@ object PluginRegistry {
 
   private var watcher: PluginWatchThread = null
   private var extraWatcher: PluginWatchThread = null
+  private val initializing = new AtomicBoolean(false)
 
   /**
    * Returns the PluginRegistry singleton instance.
@@ -229,9 +231,8 @@ object PluginRegistry {
    * Install a plugin from a specified jar file.
    */
   def install(file: File, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized {
-    FileUtils.copyFile(file, new File(PluginHome, file.getName))
-
     shutdown(context, settings)
+    FileUtils.copyFile(file, new File(PluginHome, file.getName))
     instance = new PluginRegistry()
     initialize(context, settings, conn)
   }
@@ -256,13 +257,14 @@ object PluginRegistry {
     if(installedDir.exists){
       FileUtils.deleteDirectory(installedDir)
     }
-    installedDir.mkdir()
+    installedDir.mkdirs()
 
     val pluginJars = listPluginJars(pluginDir)
     val extraJars = extraPluginDir.map { extraDir => listPluginJars(new File(extraDir)) }.getOrElse(Nil)
 
     (extraJars ++ pluginJars).foreach { pluginJar =>
       val installedJar = new File(installedDir, pluginJar.getName)
+
       FileUtils.copyFile(pluginJar, installedJar)
 
       logger.info(s"Initialize ${pluginJar.getName}")
@@ -323,6 +325,14 @@ object PluginRegistry {
     instance.getPlugins().foreach { plugin =>
       try {
         plugin.pluginClass.shutdown(instance, context, settings)
+        if(watcher != null){
+          watcher.interrupt()
+          watcher = null
+        }
+        if(extraWatcher != null){
+          extraWatcher.interrupt()
+          extraWatcher = null
+        }
       } catch {
         case e: Exception => {
           logger.error(s"Error during plugin shutdown: ${plugin.pluginJar.getName}", e)
@@ -391,12 +401,15 @@ class PluginWatchThread(context: ServletContext, dir: String) extends Thread wit
           events.foreach { event =>
             logger.info(event.kind + ": " + event.context)
           }
-
-          gitbucket.core.servlet.Database() withTransaction { session =>
-            logger.info("Reloading plugins...")
-            PluginRegistry.reload(context, loadSystemSettings(), session.conn)
-            logger.info("Reloading finished.")
-          }
+          new Thread {
+            override def run(): Unit = {
+                gitbucket.core.servlet.Database() withTransaction { session =>
+                logger.info("Reloading plugins...")
+                PluginRegistry.reload(context, loadSystemSettings(), session.conn)
+                logger.info("Reloading finished.")
+              }
+            }
+          }.start()
         }
         detectedWatchKey.reset()
       }

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

@@ -3,15 +3,92 @@ package gitbucket.core.plugin
 import gitbucket.core.controller.Context
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 
+/**
+ * The base trait of suggestion providers which supplies completion proposals in some text areas.
+ */
 trait SuggestionProvider {
 
+  /**
+   * The identifier of this suggestion provider.
+   * You must specify the unique identifier in the all suggestion providers.
+   */
   val id: String
+
+  /**
+   * The trigger of this suggestion provider. When user types this character, the proposal list would be displayed.
+   * Also this is used as the prefix of the replaced string.
+   */
   val prefix: String
+
+  /**
+   * The suffix of the replaced string. The default is `" "`.
+   */
   val suffix: String = " "
+
+  /**
+   * Which contexts is this suggestion provider enabled. Currently, available contexts are `"issues"` and `"wiki"`.
+   */
   val context: Seq[String]
 
-  def values(repository: RepositoryInfo): Seq[String]
-  def template(implicit context: Context): String = "value"
+  /**
+   * If this suggestion provider has static proposal list, override this method to return it.
+   *
+   * The returned sequence is rendered as follows:
+   * <pre>
+   * [
+   *   {
+   *     "label" -> "value1",
+   *     "value" -> "value1"
+   *   },
+   *   {
+   *     "label" -> "value2",
+   *     "value" -> "value2"
+   *   },
+   * ]
+   * </pre>
+   *
+   * Each element can be accessed as `option` in `template()` or `replace()` method.
+   */
+  def values(repository: RepositoryInfo): Seq[String] = Nil
+
+  /**
+   * If this suggestion provider has static proposal list, override this method to return it.
+   *
+   * If your proposals have label and value, use this method instead of `values()`.
+   * The first element of tuple is used as a value, and the second element is used as a label.
+   *
+   * The returned sequence is rendered as follows:
+   * <pre>
+   * [
+   *   {
+   *     "label" -> "label1",
+   *     "value" -> "value1"
+   *   },
+   *   {
+   *     "label" -> "label2",
+   *     "value" -> "value2"
+   *   },
+   * ]
+   * </pre>
+   *
+   * Each element can be accessed as `option` in `template()` or `replace()` method.
+   */
+  def options(repository: RepositoryInfo): Seq[(String, String)] = values(repository).map { value => (value, value) }
+
+  /**
+   * JavaScript fragment to generate a label of completion proposal. The default is: `option.label`.
+   */
+  def template(implicit context: Context): String = "option.label"
+
+  /**
+   * JavaScript fragment to generate a replaced value of completion proposal. The default is: `option.value`
+   */
+  def replace(implicit context: Context): String = "option.value"
+
+  /**
+   * If this suggestion provider needs some additional process to assemble the proposal list (e.g. It need to use Ajax
+   * to get a proposal list from the server), then override this method and return any JavaScript code.
+   */
   def additionalScript(implicit context: Context): String = ""
 
 }
@@ -20,8 +97,6 @@ class UserNameSuggestionProvider extends SuggestionProvider {
   override val id: String = "user"
   override val prefix: String = "@"
   override val context: Seq[String] = Seq("issues")
-  override def values(repository: RepositoryInfo): Seq[String] = Nil
-  override def template(implicit context: Context): String = "'@' + value"
   override def additionalScript(implicit context: Context): String =
     s"""$$.get('${context.path}/_user/proposals', { query: '', user: true, group: false }, function (data) { user = data.options; });"""
-}
+}

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

@@ -50,7 +50,7 @@ trait HandleCommentService {
             id
         }
 
-        actionActivity foreach ( _ (owner, name, userName, issue.issueId, issue.title) )
+        actionActivity.foreach { f => f(owner, name, userName, issue.issueId, issue.title) }
 
         // call web hooks
         action match {

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

@@ -32,8 +32,11 @@ trait IssuesService {
     .list
 
   def getMergedComment(owner: String, repository: String, issueId: Int)(implicit s: Session): Option[(IssueComment, Account)] = {
-    getCommentsForApi(owner, repository, issueId)
-      .collectFirst { case (comment, account, _) if comment.action == "merged" => (comment, account) }
+    IssueComments.filter(_.byIssue(owner, repository, issueId))
+      .filter(_.action === "merge".bind)
+      .join(Accounts).on { case  t1 ~ t2 => t1.commentedUserName === t2.userName }
+      .map { case t1 ~ t2 => (t1, t2)}
+      .firstOption
   }
 
   def getComment(owner: String, repository: String, commentId: String)(implicit s: Session): Option[IssueComment] = {
@@ -199,15 +202,16 @@ trait IssuesService {
    * @return (issue, issueUser, commentCount, pullRequest, headRepo, headOwner)
    */
   def searchPullRequestByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*)
-                            (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = {
+                            (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] = {
     // get issues and comment count and labels
     searchIssueQueryBase(condition, true, offset, limit, repos)
-      .join(PullRequests).on { case t1 ~ t2 ~ i ~ t3                => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
-      .join(Repositories).on { case t1 ~ t2 ~ i ~ t3 ~ t4           => t4.byRepository(t1.userName, t1.repositoryName) }
-      .join(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5      => t5.userName === t1.openedUserName }
-      .join(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t6.userName === t4.userName }
-      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
-      .map    { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => (t1, t5, t2.commentCount, t3, t4, t6) }
+      .join    (PullRequests).on { case t1 ~ t2 ~ i ~ t3                     => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
+      .join    (Repositories).on { case t1 ~ t2 ~ i ~ t3 ~ t4                => t4.byRepository(t1.userName, t1.repositoryName) }
+      .join    (Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5           => t5.userName === t1.openedUserName }
+      .join    (Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6      => t6.userName === t4.userName }
+      .joinLeft(Accounts    ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => t7.userName === t1.assignedUserName}
+      .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => i asc }
+      .map    { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => (t1, t5, t2.commentCount, t3, t4, t6, t7) }
       .list
   }
 
@@ -327,6 +331,7 @@ trait IssuesService {
 
   def createComment(owner: String, repository: String, loginUser: String,
       issueId: Int, content: String, action: String)(implicit s: Session): Int = {
+    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
     IssueComments returning IssueComments.map(_.commentId) insert IssueComment(
       userName          = owner,
       repositoryName    = repository,
@@ -342,31 +347,33 @@ trait IssuesService {
     Issues
       .filter (_.byPrimaryKey(owner, repository, issueId))
       .map { t => (t.title, t.content.?, t.updatedDate) }
-      .update (title, content, currentDate)
+      .update(title, content, currentDate)
   }
 
   def updateAssignedUserName(owner: String, repository: String, issueId: Int, assignedUserName: Option[String])(implicit s: Session): Int = {
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.assignedUserName?, t.updatedDate)).update(assignedUserName, currentDate)
   }
 
   def updateMilestoneId(owner: String, repository: String, issueId: Int, milestoneId: Option[Int])(implicit s: Session): Int = {
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.milestoneId?, t.updatedDate)).update(milestoneId, currentDate)
   }
 
   def updatePriorityId(owner: String, repository: String, issueId: Int, priorityId: Option[Int])(implicit s: Session): Int = {
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.priorityId?).update (priorityId)
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.priorityId?, t.updatedDate)).update(priorityId, currentDate)
   }
 
-  def updateComment(commentId: Int, content: String)(implicit s: Session): Int = {
-    IssueComments.filter (_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
+  def updateComment(issueId: Int, commentId: Int, content: String)(implicit s: Session): Int = {
+    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
+    IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
   }
 
-  def deleteComment(commentId: Int)(implicit s: Session): Int = {
-    IssueComments filter (_.byPrimaryKey(commentId)) delete
+  def deleteComment(issueId: Int, commentId: Int)(implicit s: Session): Int = {
+    Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
+    IssueComments.filter(_.byPrimaryKey(commentId)).delete
   }
 
   def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean)(implicit s: Session): Int = {
-    (Issues filter (_.byPrimaryKey(owner, repository, issueId)) map(t => (t.closed, t.updatedDate))).update((closed, currentDate))
+    Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(t => (t.closed, t.updatedDate)).update(closed, currentDate)
   }
 
   /**
@@ -449,9 +456,8 @@ trait IssuesService {
   def createIssueComment(owner: String, repository: String, commit: CommitInfo)(implicit s: Session): Unit = {
     extractIssueId(commit.fullMessage).foreach { issueId =>
       if(getIssue(owner, repository, issueId).isDefined){
-        getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
-          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
-        }
+        val userName = getAccountByMailAddress(commit.committerEmailAddress).map(_.userName).getOrElse(commit.committerName)
+        createComment(owner, repository, userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
       }
     }
   }
@@ -497,14 +503,14 @@ object IssuesService {
       ).flatten ++
       labels.map(label => s"label:${label}") ++
       List(
-        milestone.map { _ match {
+        milestone.map {
           case Some(x) => s"milestone:${x}"
           case None    => "no:milestone"
-        }},
-        priority.map { _ match {
+        },
+        priority.map {
           case Some(x) => s"priority:${x}"
           case None    => "no:priority"
-        }},
+        },
         (sort, direction) match {
           case ("created" , "desc") => None
           case ("created" , "asc" ) => Some("sort:created-asc")

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

@@ -1,11 +1,10 @@
 package gitbucket.core.service
 
-import gitbucket.core.model.{ProtectedBranch, ProtectedBranchContext, CommitState}
+import gitbucket.core.model.{Session => _, _}
 import gitbucket.core.plugin.ReceiveHook
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
-
-import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
 
 
 trait ProtectedBranchService {
@@ -18,10 +17,11 @@ trait ProtectedBranchService {
       .filter(_._1.byPrimaryKey(owner, repository, branch))
       .list
       .groupBy(_._1)
+      .headOption
       .map { p => p._1 -> p._2.flatMap(_._2) }
       .map { case (t1, contexts) =>
         new ProtectedBranchInfo(t1.userName, t1.repositoryName, true, contexts, t1.statusCheckAdmin)
-      }.headOption
+      }
 
   def getProtectedBranchInfo(owner: String, repository: String, branch: String)(implicit session: Session): ProtectedBranchInfo =
     getProtectedBranchInfoOpt(owner, repository, branch).getOrElse(ProtectedBranchInfo.disabled(owner, repository))
@@ -45,12 +45,17 @@ trait ProtectedBranchService {
 
 object ProtectedBranchService {
 
-  class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService {
+  class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService with RepositoryService with AccountService {
     override def preReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)
                            (implicit session: Session): Option[String] = {
       val branch = command.getRefName.stripPrefix("refs/heads/")
       if(branch != command.getRefName){
-        getProtectedBranchInfo(owner, repository, branch).getStopReason(receivePack.isAllowNonFastForwards, command, pusher)
+        val repositoryInfo = getRepository(owner, repository)
+        if(command.getType == ReceiveCommand.Type.DELETE && repositoryInfo.exists(_.repository.defaultBranch == branch)){
+          Some(s"refusing to delete the branch: ${command.getRefName}.")
+        } else {
+          getProtectedBranchInfo(owner, repository, branch).getStopReason(receivePack.isAllowNonFastForwards, command, pusher)
+        }
       } else {
         None
       }
@@ -73,10 +78,19 @@ object ProtectedBranchService {
      * Include administrators
      * Enforce required status checks for repository administrators.
      */
-    includeAdministrators: Boolean) extends AccountService with CommitStatusService {
+    includeAdministrators: Boolean) extends AccountService with RepositoryService with CommitStatusService {
 
     def isAdministrator(pusher: String)(implicit session: Session): Boolean =
-      pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager)
+      pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager) ||
+        getCollaborators(owner, repository).exists { case (collaborator, isGroup) =>
+          if(collaborator.role == Role.ADMIN.name){
+            if(isGroup){
+              getGroupMembers(collaborator.collaboratorName).exists(gm => gm.userName == pusher)
+            } else {
+              collaborator.collaboratorName == pusher
+            }
+          } else false
+        }
 
     /**
      * Can't be force pushed

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

@@ -94,9 +94,9 @@ trait PullRequestService { self: IssuesService with CommitsService =>
 
   /**
    * for repository viewer.
-   * 1. find pull request from from `branch` to othre branch on same repository
+   * 1. find pull request from `branch` to other branch on same repository
    *   1. return if exists pull request to `defaultBranch`
-   *   2. return if exists pull request to othre branch
+   *   2. return if exists pull request to other branch
    * 2. return None
    */
   def getPullRequestFromBranch(userName: String, repositoryName: String, branch: String, defaultBranch: String)
@@ -230,7 +230,7 @@ trait PullRequestService { self: IssuesService with CommitsService =>
         helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
       }
 
-      val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)
+      val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true, false)
 
       (commits, diffs)
     }
@@ -256,7 +256,7 @@ object PullRequestService {
     val statuses: List[CommitStatus] =
       commitStatues ++ (branchProtection.contexts.toSet -- commitStatues.map(_.context).toSet).map(CommitStatus.pending(branchProtection.owner, branchProtection.repository, _))
     val hasRequiredStatusProblem = needStatusCheck && branchProtection.contexts.exists(context => statuses.find(_.context == context).map(_.state) != Some(CommitState.SUCCESS))
-    val hasProblem = hasRequiredStatusProblem || hasConflict || (!statuses.isEmpty && CommitState.combine(statuses.map(_.state).toSet) != CommitState.SUCCESS)
+    val hasProblem = hasRequiredStatusProblem || hasConflict || (statuses.nonEmpty && CommitState.combine(statuses.map(_.state).toSet) != CommitState.SUCCESS)
     val canUpdate = branchIsOutOfDate && !hasConflict
     val canMerge = hasMergePermission && !hasConflict && !hasRequiredStatusProblem
     lazy val commitStateSummary:(CommitState, String) = {

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

@@ -67,7 +67,7 @@ trait RepositorySearchService { self: IssuesService =>
         files.map { case (path, text) =>
           val (highlightText, lineNumber) = getHighlightText(text, query)
           FileSearchResult(
-            path.replaceFirst("\\.md$", ""),
+            path.stripSuffix(".md"),
             commits(path).getCommitterIdent.getWhen,
             highlightText,
             lineNumber)

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

@@ -135,7 +135,7 @@ trait RepositoryService { self: AccountService =>
           repositoryName = newRepositoryName
         )) :_*)
 
-        // TODO Drop transfered owner from collaborators?
+        // TODO Drop transferred owner from collaborators?
         Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
 
         // Update activity messages
@@ -413,6 +413,15 @@ trait RepositoryService { self: AccountService =>
     q1.union(q2).list.filter { x => filter.isEmpty || filter.exists(_.name == x._2) }.map(_._1)
   }
 
+  def hasOwnerRole(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
+    loginAccount match {
+      case Some(a) if(a.isAdmin) => true
+      case Some(a) if(a.userName == owner) => true
+      case Some(a) if(getGroupMembers(owner).exists(_.userName == a.userName)) => true
+      case Some(a) if(getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN)).contains(a.userName)) => true
+      case _ => false
+    }
+  }
 
   def hasDeveloperRole(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
     loginAccount match {

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

@@ -54,6 +54,7 @@ trait SystemSettingsService {
           ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
         }
       }
+      props.setProperty(SkinName, settings.skinName.toString)
       using(new java.io.FileOutputStream(GitBucketConf)){ out =>
         props.store(out, null)
       }
@@ -111,7 +112,8 @@ trait SystemSettingsService {
             getOptionValue(props, LdapKeystore, None)))
         } else {
           None
-        }
+        },
+        getValue(props, SkinName, "skin-blue")
       )
     }
   }
@@ -136,18 +138,18 @@ object SystemSettingsService {
     useSMTP: Boolean,
     smtp: Option[Smtp],
     ldapAuthentication: Boolean,
-    ldap: Option[Ldap]){
-    def baseUrl(request: HttpServletRequest): String = baseUrl.fold(request.baseUrl)(_.stripSuffix("/"))
+    ldap: Option[Ldap],
+    skinName: String){
 
-    def sshAddress:Option[SshAddress] =
-      for {
-        host <- sshHost if ssh
-      }
-      yield SshAddress(
-        host,
-        sshPort.getOrElse(DefaultSshPort),
-        "git"
-      )
+    def baseUrl(request: HttpServletRequest): String = baseUrl.fold {
+      val url = request.getRequestURL.toString
+      val len = url.length - (request.getRequestURI.length - request.getContextPath.length)
+      url.substring(0, len).stripSuffix("/")
+    } (_.stripSuffix("/"))
+
+    def sshAddress:Option[SshAddress] = sshHost.collect { case host if ssh =>
+      SshAddress(host, sshPort.getOrElse(DefaultSshPort), "git")
+    }
   }
 
   case class Ldap(
@@ -219,6 +221,7 @@ object SystemSettingsService {
   private val LdapTls = "ldap.tls"
   private val LdapSsl = "ldap.ssl"
   private val LdapKeystore = "ldap.keystore"
+  private val SkinName = "skinName"
 
   private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
     getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse {

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

@@ -228,16 +228,18 @@ trait WebHookPullRequestService extends WebHookService {
     callWebHookOf(repository.owner, repository.name, WebHook.PullRequest){
       for{
         (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
-        users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender))
+        users     =  getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender))
         baseOwner <- users.get(repository.owner)
         headOwner <- users.get(pullRequest.requestUserName)
         issueUser <- users.get(issue.openedUserName)
+        assignee  =  issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) }
         headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
       } yield {
         WebHookPullRequestPayload(
           action         = action,
           issue          = issue,
           issueUser      = issueUser,
+          assignee       = assignee,
           pullRequest    = pullRequest,
           headRepository = headRepo,
           headOwner      = headOwner,
@@ -273,12 +275,14 @@ trait WebHookPullRequestService extends WebHookService {
     import WebHookService._
     for{
       ((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch)
+      assignee =  issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) }
       baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName)
     } yield {
       val payload = WebHookPullRequestPayload(
         action         = action,
         issue          = issue,
         issueUser      = issueUser,
+        assignee       = assignee,
         pullRequest    = pullRequest,
         headRepository = requestRepository,
         headOwner      = headOwner,
@@ -296,16 +300,17 @@ trait WebHookPullRequestService extends WebHookService {
 
 trait WebHookPullRequestReviewCommentService extends WebHookService {
   self: AccountService with RepositoryService with PullRequestService with IssuesService with CommitsService =>
-  def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account)
+  def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo,
+                                          issue: Issue, pullRequest: PullRequest, baseUrl: String, sender: Account)
                                          (implicit s: Session, c: JsonFormat.Context): Unit = {
     import WebHookService._
     callWebHookOf(repository.owner, repository.name, WebHook.PullRequestReviewComment){
+      val users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender))
       for{
-        (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
-        users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender))
         baseOwner <- users.get(repository.owner)
         headOwner <- users.get(pullRequest.requestUserName)
         issueUser <- users.get(issue.openedUserName)
+        assignee  =  issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) }
         headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
       } yield {
         WebHookPullRequestReviewCommentPayload(
@@ -313,6 +318,7 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
           comment        = comment,
           issue          = issue,
           issueUser      = issueUser,
+          assignee       = assignee,
           pullRequest    = pullRequest,
           headRepository = headRepo,
           headOwner      = headOwner,
@@ -367,9 +373,9 @@ object WebHookService {
     repository: ApiRepository
   ) extends FieldSerializable with WebHookPayload {
     val compare = commits.size match {
-      case 0 => ApiPath(s"/${repository.full_name}") // maybe test hook on un-initalied repository
+      case 0 => ApiPath(s"/${repository.full_name}") // maybe test hook on un-initialized repository
       case 1 => ApiPath(s"/${repository.full_name}/commit/${after}")
-      case _ if before.filterNot(_=='0').isEmpty => ApiPath(s"/${repository.full_name}/compare/${commits.head.id}^...${after}")
+      case _ if before.forall(_=='0') => ApiPath(s"/${repository.full_name}/compare/${commits.head.id}^...${after}")
       case _ => ApiPath(s"/${repository.full_name}/compare/${before}...${after}")
     }
     val head_commit = commits.lastOption
@@ -424,6 +430,7 @@ object WebHookService {
     def apply(action: String,
         issue: Issue,
         issueUser: Account,
+        assignee: Option[Account],
         pullRequest: PullRequest,
         headRepository: RepositoryInfo,
         headOwner: Account,
@@ -441,6 +448,7 @@ object WebHookService {
         headRepo      = headRepoPayload,
         baseRepo      = baseRepoPayload,
         user          = ApiUser(issueUser),
+        assignee      = assignee.map(ApiUser.apply),
         mergedComment = mergedComment
       )
 
@@ -495,6 +503,7 @@ object WebHookService {
       comment: CommitComment,
       issue: Issue,
       issueUser: Account,
+      assignee: Option[Account],
       pullRequest: PullRequest,
       headRepository: RepositoryInfo,
       headOwner: Account,
@@ -502,7 +511,7 @@ object WebHookService {
       baseOwner: Account,
       sender: Account,
       mergedComment: Option[(IssueComment, Account)]
-    ) : WebHookPullRequestReviewCommentPayload = {
+    ): WebHookPullRequestReviewCommentPayload = {
       val headRepoPayload = ApiRepository(headRepository, headOwner)
       val baseRepoPayload = ApiRepository(baseRepository, baseOwner)
       val senderPayload = ApiUser(sender)
@@ -521,6 +530,7 @@ object WebHookService {
           headRepo      = headRepoPayload,
           baseRepo      = baseRepoPayload,
           user          = ApiUser(issueUser),
+          assignee      = assignee.map(ApiUser.apply),
           mergedComment = mergedComment
         ),
         repository   = baseRepoPayload,

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

@@ -237,7 +237,7 @@ trait WikiService {
           builder.finish()
           val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
             Constants.HEAD, committer.fullName, committer.mailAddress,
-            if(message.trim.length == 0) {
+            if(message.trim.isEmpty) {
               if(removed){
                 s"Rename ${currentPageName} to ${newPageName}"
               } else if(created){

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

@@ -1,37 +0,0 @@
-package gitbucket.core.servlet
-
-import javax.servlet._
-import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
-
-import gitbucket.core.service.SystemSettingsService
-
-/**
-  * A controller to provide GitHub compatible URL for Git clients.
-  */
-class GHCompatRepositoryAccessFilter extends Filter with SystemSettingsService {
-
-  /**
-    * Pattern of GitHub compatible repository URL.
-    * <code>/:user/:repo.git/</code>
-    */
-  private val githubRepositoryPattern = """^/[^/]+/[^/]+\.git/.*""".r
-
-  override def init(filterConfig: FilterConfig) = {}
-
-  override def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain) = {
-    implicit val request = req.asInstanceOf[HttpServletRequest]
-    val agent = request.getHeader("USER-AGENT")
-    val response = res.asInstanceOf[HttpServletResponse]
-    val requestPath = request.getRequestURI.substring(request.getContextPath.length)
-
-    requestPath match {
-      case githubRepositoryPattern() if agent != null && agent.toLowerCase.indexOf("git") >= 0 =>
-        response.sendRedirect(baseUrl + "/git" + requestPath)
-      case _ =>
-        chain.doFilter(req, res)
-    }
-  }
-
-  override def destroy() = {}
-
-}

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

@@ -74,7 +74,7 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
     val action = request.paths match {
       case Array(_, repositoryOwner, repositoryName, _*) =>
         Database() withSession { implicit session =>
-          getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", "")) match {
+          getRepository(repositoryOwner, repositoryName.replaceFirst("(\\.wiki)?\\.git$", "")) match {
             case Some(repository) => {
               val execute = if (!isUpdating && !repository.repository.isPrivate && settings.allowAnonymousAccess) {
                 // Authentication is not required

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

@@ -156,9 +156,13 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
         logger.debug("repository:" + owner + "/" + repository)
 
+        val settings = loadSystemSettings()
+        val baseUrl = settings.baseUrl(request)
+        val sshUrl  = settings.sshAddress.map { x => s"${x.genericUser}@${x.host}:${x.port}" }
+
         if(!repository.endsWith(".wiki")){
           defining(request) { implicit r =>
-            val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
+            val hook = new CommitLogHook(owner, repository, pusher, baseUrl, sshUrl)
             receivePack.setPreReceiveHook(hook)
             receivePack.setPostReceiveHook(hook)
           }
@@ -166,7 +170,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
         if(repository.endsWith(".wiki")){
           defining(request) { implicit r =>
-            receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.replaceFirst("\\.wiki$", ""), pusher, baseUrl))
+            receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl, sshUrl))
           }
         }
       }
@@ -178,7 +182,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
   extends PostReceiveHook with PreReceiveHook
   with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
   with WebHookPullRequestService with CommitsService {
@@ -219,7 +223,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
           val pushedIds = scala.collection.mutable.Set[String]()
           commands.asScala.foreach { command =>
             logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-            implicit val apiContext = api.JsonFormat.Context(baseUrl)
+            implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
             val refName = command.getRefName.split("/")
             val branchName = refName.drop(2).mkString("/")
             val commits = if (refName(1) == "tags") {
@@ -320,7 +324,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
 
 }
 
-class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String)
+class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
   extends PostReceiveHook with WebHookService with AccountService with RepositoryService {
 
   private val logger = LoggerFactory.getLogger(classOf[WikiCommitHook])
@@ -329,7 +333,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
     Database() withTransaction { implicit session =>
       try {
         commands.asScala.headOption.foreach { command =>
-          implicit val apiContext = api.JsonFormat.Context(baseUrl)
+          implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
           val refName = command.getRefName.split("/")
           val commitIds = if (refName(1) == "tags") {
             None
@@ -347,7 +351,6 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
                 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)
                 }
               }

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

@@ -19,7 +19,7 @@ class PluginAssetsServlet extends HttpServlet {
       .find    { case (prefix, _, _) => path.startsWith("/plugin-assets" + prefix) }
       .flatMap { case (prefix, resourcePath, classLoader) =>
         val resourceName = path.substring(("/plugin-assets" + prefix).length)
-        Option(classLoader.getResourceAsStream(resourcePath.replaceFirst("^/", "") + resourceName))
+        Option(classLoader.getResourceAsStream(resourcePath.stripPrefix("/") + resourceName))
       }
       .map { in =>
         try {

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

@@ -24,7 +24,7 @@ class PluginControllerFilter extends Filter {
     val controller = PluginRegistry().getControllers().filter { case (_, path) =>
       val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI
       val start = path.replaceFirst("/\\*$", "/")
-      path.endsWith("/*") && (requestUri + "/").startsWith(start)
+      (requestUri + "/").startsWith(start)
     }
 
     val filterChainWrapper = controller.foldLeft(chain){ case (chain, (controller, _)) =>

src/main/scala/gitbucket/core/ssh/GitCommand.scala

@@ -19,7 +19,7 @@ import org.apache.sshd.server.scp.UnknownCommand
 import org.eclipse.jgit.errors.RepositoryNotFoundException
 
 object GitCommand {
-  val DefaultCommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
+  val DefaultCommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-\+_.]+).git'\Z""".r
   val SimpleCommandRegex  = """\Agit-(upload|receive)-pack '/(.+\.git)'\Z""".r
 }
 
@@ -154,7 +154,7 @@ class DefaultGitUploadPack(owner: String, repoName: String) extends DefaultGitCo
   }
 }
 
-class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) extends DefaultGitCommand(owner, repoName)
+class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String, sshUrl: Option[String]) extends DefaultGitCommand(owner, repoName)
     with RepositoryService with AccountService with DeployKeyService {
 
   override protected def runTask(authType: AuthType): Unit = {
@@ -169,7 +169,7 @@ class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) ex
         val repository = git.getRepository
         val receive = new ReceivePack(repository)
         if (!repoName.endsWith(".wiki")) {
-          val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl)
+          val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl, sshUrl)
           receive.setPreReceiveHook(hook)
           receive.setPostReceiveHook(hook)
         }
@@ -216,7 +216,7 @@ class PluginGitReceivePack(repoName: String, routing: GitRepositoryRouting) exte
 }
 
 
-class GitCommandFactory(baseUrl: String) extends CommandFactory {
+class GitCommandFactory(baseUrl: String, sshUrl: Option[String]) extends CommandFactory {
   private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])
 
   override def createCommand(command: String): Command = {
@@ -227,7 +227,7 @@ class GitCommandFactory(baseUrl: String) extends CommandFactory {
       case SimpleCommandRegex ("upload" , repoName) if(pluginRepository(repoName)) => new PluginGitUploadPack (repoName, routing(repoName))
       case SimpleCommandRegex ("receive", repoName) if(pluginRepository(repoName)) => new PluginGitReceivePack(repoName, routing(repoName))
       case DefaultCommandRegex("upload" , owner, repoName) => new DefaultGitUploadPack (owner, repoName)
-      case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl)
+      case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl, sshUrl)
       case _ => new UnknownCommand(command)
     }
   }

src/main/scala/gitbucket/core/ssh/SshServerListener.scala

@@ -6,7 +6,7 @@ import javax.servlet.{ServletContextEvent, ServletContextListener}
 
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.service.SystemSettingsService.SshAddress
-import gitbucket.core.util.{Directory}
+import gitbucket.core.util.Directory
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
 import org.slf4j.LoggerFactory
 
@@ -22,7 +22,7 @@ object SshServer {
     provider.setOverwriteAllowed(false)
     server.setKeyPairProvider(provider)
     server.setPublickeyAuthenticator(new PublicKeyAuthenticator(sshAddress.genericUser))
-    server.setCommandFactory(new GitCommandFactory(baseUrl))
+    server.setCommandFactory(new GitCommandFactory(baseUrl, Some(s"${sshAddress.genericUser}@${sshAddress.host}:${sshAddress.port}")))
     server.setShellFactory(new NoShell(sshAddress))
   }
 

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

@@ -28,8 +28,6 @@ object FileUtil {
 
   def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
 
-  def isUploadableType(name: String): Boolean = mimeTypeWhiteList contains getMimeType(name)
-
   def isLarge(size: Long): Boolean = (size > 1024 * 1000)
 
   def isText(content: Array[Byte]): Boolean = !content.contains(0)
@@ -53,16 +51,6 @@ object FileUtil {
     }
   }
 
-  val mimeTypeWhiteList: Array[String] = Array(
-      "application/pdf",
-      "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-      "image/gif",
-      "image/jpeg",
-      "image/png",
-      "text/plain")
-
   def getLfsFilePath(owner: String, repository: String, oid: String): String =
     Directory.getLfsDir(owner, repository) + "/" + oid
 

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

@@ -22,7 +22,8 @@ object Implicits {
   // Convert to slick session.
   implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session = Database.getSession(request)
 
-  implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context = JsonFormat.Context(context.baseUrl)
+  implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context =
+    JsonFormat.Context(context.baseUrl, context.settings.sshAddress.map { x => s"${x.genericUser}@${x.host}:${x.port}" })
 
   implicit class RichSeq[A](private val seq: Seq[A]) extends AnyVal {
 
@@ -77,11 +78,6 @@ object Implicits {
 
     def gitRepositoryPath: String = request.getRequestURI.replaceFirst("^" + quote(request.getContextPath) + "/git/", "/")
 
-    def baseUrl:String = {
-      val url = request.getRequestURL.toString
-      val len = url.length - (request.getRequestURI.length - request.getContextPath.length)
-      url.substring(0, len).stripSuffix("/")
-    }
   }
 
   implicit class RichSession(private val session: HttpSession) extends AnyVal {

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

@@ -75,7 +75,7 @@ object JDBCUtil {
           var stringLiteral = false
 
           while({ length = in.read(bytes); length != -1 }){
-            for(i <- 0 to length - 1){
+            for(i <- 0 until length){
               val c = bytes(i)
               if(c == '\''){
                 stringLiteral = !stringLiteral
@@ -146,13 +146,11 @@ object JDBCUtil {
                 }
               }
 
-              val columnValues = values.map { value =>
-                value match {
-                  case x: String    => "'" + x.replace("'", "''") + "'"
-                  case x: Timestamp => "'" + dateFormat.format(x) + "'"
-                  case null         => "NULL"
-                  case x            => x
-                }
+              val columnValues = values.map { 
+                case x: String    => "'" + x.replace("'", "''") + "'"
+                case x: Timestamp => "'" + dateFormat.format(x) + "'"
+                case null         => "NULL"
+                case x            => x
               }
               sb.append(columnValues.mkString(", "))
               sb.append(");\n")

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

@@ -1,5 +1,7 @@
 package gitbucket.core.util
 
+import java.io.ByteArrayOutputStream
+
 import gitbucket.core.service.RepositoryService
 import org.eclipse.jgit.api.Git
 import Directory._
@@ -22,6 +24,7 @@ import java.util.function.Consumer
 
 import org.cache2k.{Cache2kBuilder, CacheEntry}
 import org.eclipse.jgit.api.errors.{InvalidRefNameException, JGitInternalException, NoHeadException, RefAlreadyExistsException}
+import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
 import org.eclipse.jgit.dircache.DirCacheEntry
 import org.slf4j.LoggerFactory
 
@@ -93,7 +96,7 @@ object JGitUtil {
 
     val summary = getSummaryMessage(fullMessage, shortMessage)
 
-    val description = defining(fullMessage.trim.indexOf("\n")){ i =>
+    val description = defining(fullMessage.trim.indexOf('\n')){ i =>
       if(i >= 0){
         Some(fullMessage.trim.substring(i).trim)
       } else None
@@ -114,7 +117,8 @@ object JGitUtil {
     newObjectId: Option[String],
     oldMode: String,
     newMode: String,
-    tooLarge: Boolean
+    tooLarge: Boolean,
+    patch: Option[String]
   )
 
   /**
@@ -293,7 +297,7 @@ object JGitUtil {
       @tailrec
       def findLastCommits(result:List[(ObjectId, FileMode, String, String, Option[String], RevCommit)],
                           restList:List[((ObjectId, FileMode, String, String, Option[String]), Map[RevCommit, RevCommit])],
-                          revIterator:java.util.Iterator[RevCommit]): List[(ObjectId, FileMode, String, String, Option[String], RevCommit)] ={
+                          revIterator:java.util.Iterator[RevCommit]): List[(ObjectId, FileMode, String, String, Option[String], RevCommit)] = {
         if(restList.isEmpty){
           result
         } else if(!revIterator.hasNext){ // maybe, revCommit has only 1 log. other case, restList be empty
@@ -364,9 +368,9 @@ object JGitUtil {
           (file1.isDirectory, file2.isDirectory) match {
             case (true , false) => true
             case (false, true ) => false
-           case _ => file1.name.compareTo(file2.name) < 0
+            case _ => file1.name.compareTo(file2.name) < 0
           }
-        }.toList
+        }
     }
   }
 
@@ -374,7 +378,7 @@ object JGitUtil {
    * Returns the first line of the commit message.
    */
   private def getSummaryMessage(fullMessage: String, shortMessage: String): String = {
-    defining(fullMessage.trim.indexOf("\n")){ i =>
+    defining(fullMessage.trim.indexOf('\n')){ i =>
       defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
         if(firstLine.length > shortMessage.length) shortMessage else firstLine
       }
@@ -515,9 +519,10 @@ object JGitUtil {
   }
 
   /**
-   * Returns the tuple of diff of the given commit and the previous commit id.
+   * Returns the tuple of diff of the given commit and parent commit ids.
+   * DiffInfos returned from this method don't include the patch property.
    */
-  def getDiffs(git: Git, id: String, fetchContent: Boolean = true): (List[DiffInfo], Option[String]) = {
+  def getDiffs(git: Git, id: String, fetchContent: Boolean): (List[DiffInfo], Option[String]) = {
     @scala.annotation.tailrec
     def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[RevCommit]): List[RevCommit] =
       i.hasNext match {
@@ -538,7 +543,7 @@ object JGitUtil {
         } else {
           commits(1)
         }
-        (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))
+        (getDiffs(git, oldCommit.getName, id, fetchContent, false), Some(oldCommit.getName))
 
       } else {
         // initial commit
@@ -551,7 +556,7 @@ object JGitUtil {
             buffer.append((if(!fetchContent){
               DiffInfo(
                 changeType  = ChangeType.ADD,
-                oldPath     = null,
+                oldPath     = "",
                 newPath     = treeWalk.getPathString,
                 oldContent  = None,
                 newContent  = None,
@@ -561,12 +566,13 @@ object JGitUtil {
                 newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
                 oldMode     = treeWalk.getFileMode(0).toString,
                 newMode     = treeWalk.getFileMode(0).toString,
-                tooLarge    = false
+                tooLarge    = false,
+                patch       = None
               )
             } else {
               DiffInfo(
                 changeType  = ChangeType.ADD,
-                oldPath     = null,
+                oldPath     = "",
                 newPath     = treeWalk.getPathString,
                 oldContent  = None,
                 newContent  = JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray),
@@ -576,7 +582,8 @@ object JGitUtil {
                 newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
                 oldMode     = treeWalk.getFileMode(0).toString,
                 newMode     = treeWalk.getFileMode(0).toString,
-                tooLarge    = false
+                tooLarge    = false,
+                patch       = None
               )
             }))
           }
@@ -586,7 +593,7 @@ object JGitUtil {
     }
   }
 
-  def getDiffs(git: Git, from: String, to: String, fetchContent: Boolean): List[DiffInfo] = {
+  def getDiffs(git: Git, from: String, to: String, fetchContent: Boolean, makePatch: Boolean): List[DiffInfo] = {
     val reader = git.getRepository.newObjectReader
     val oldTreeIter = new CanonicalTreeParser
     oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
@@ -612,7 +619,8 @@ object JGitUtil {
           newObjectId = Option(diff.getNewId).map(_.name),
           oldMode     = diff.getOldMode.toString,
           newMode     = diff.getNewMode.toString,
-          tooLarge    = true
+          tooLarge    = true,
+          patch       = None
         )
       } else {
         val oldIsImage = FileUtil.isImage(diff.getOldPath)
@@ -630,7 +638,8 @@ object JGitUtil {
             newObjectId = Option(diff.getNewId).map(_.name),
             oldMode     = diff.getOldMode.toString,
             newMode     = diff.getNewMode.toString,
-            tooLarge    = false
+            tooLarge    = false,
+            patch       = (if(makePatch) Some(makePatchFromDiffEntry(git, diff)) else None)
           )
         } else {
           DiffInfo(
@@ -645,13 +654,23 @@ object JGitUtil {
             newObjectId = Option(diff.getNewId).map(_.name),
             oldMode     = diff.getOldMode.toString,
             newMode     = diff.getNewMode.toString,
-            tooLarge    = false
+            tooLarge    = false,
+            patch       = (if(makePatch) Some(makePatchFromDiffEntry(git, diff)) else None)
           )
         }
       }
     }.toList
   }
 
+  private def makePatchFromDiffEntry(git: Git, diff: DiffEntry): String = {
+    val out = new ByteArrayOutputStream()
+    using(new DiffFormatter(out)){ formatter =>
+      formatter.setRepository(git.getRepository)
+      formatter.format(diff)
+      val patch = new String(out.toByteArray) // TODO charset???
+      patch.split("\n").drop(4).mkString("\n")
+    }
+  }
 
   /**
    * Returns the list of branch names of the specified commit.

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

@@ -0,0 +1,68 @@
+package gitbucket.core.util
+
+import gitbucket.core.model.Account
+import gitbucket.core.service.SystemSettingsService
+
+import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
+import SystemSettingsService.SystemSettings
+
+class Mailer(settings: SystemSettings){
+
+  def send(to: String, subject: String, textMsg: String, htmlMsg: Option[String] = None, loginAccount: Option[Account] = None): Unit = {
+    createMail(subject, textMsg, htmlMsg, loginAccount).foreach { email =>
+      email.addTo(to).send
+    }
+  }
+
+  def sendBcc(bcc: Seq[String], subject: String, textMsg: String, htmlMsg: Option[String] = None, loginAccount: Option[Account] = None): Unit = {
+    createMail(subject, textMsg, htmlMsg, loginAccount).foreach { email =>
+      bcc.foreach { address =>
+        email.addBcc(address)
+      }
+      email.send()
+    }
+  }
+
+  def createMail(subject: String, textMsg: String, htmlMsg: Option[String] = None, loginAccount: Option[Account] = None): Option[HtmlEmail] = {
+    if(settings.notification == true){
+      settings.smtp.map { smtp =>
+        val email = new HtmlEmail
+        email.setHostName(smtp.host)
+        email.setSmtpPort(smtp.port.get)
+        smtp.user.foreach { user =>
+          email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
+        }
+        smtp.ssl.foreach { ssl =>
+          email.setSSLOnConnect(ssl)
+          if(ssl == true) {
+            email.setSslSmtpPort(smtp.port.get.toString)
+          }
+        }
+        smtp.starttls.foreach { starttls =>
+          email.setStartTLSEnabled(starttls)
+          email.setStartTLSRequired(starttls)
+        }
+        smtp.fromAddress
+          .map (_ -> smtp.fromName.getOrElse(loginAccount.map(_.userName).getOrElse("GitBucket")))
+          .orElse (Some("notifications@gitbucket.com" -> loginAccount.map(_.userName).getOrElse("GitBucket")))
+          .foreach { case (address, name) =>
+            email.setFrom(address, name)
+          }
+        email.setCharset("UTF-8")
+        email.setSubject(subject)
+        email.setTextMsg(textMsg)
+        htmlMsg.foreach { msg =>
+          email.setHtmlMsg(msg)
+        }
+
+        email
+      }
+    } else None
+  }
+
+}
+
+//class MockMailer extends Notifier {
+//  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
+//              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
+//}

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

@@ -1,92 +0,0 @@
-package gitbucket.core.util
-
-import gitbucket.core.model.{Session, Account}
-import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.service.SystemSettingsService
-import gitbucket.core.servlet.Database
-
-import scala.concurrent._
-import scala.util.{Success, Failure}
-import ExecutionContext.Implicits.global
-import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
-import org.slf4j.LoggerFactory
-import gitbucket.core.controller.Context
-import SystemSettingsService.Smtp
-
-/**
- * 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(subject: String, msg: String)
-              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit
-
-}
-
-object Notifier {
-  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
-    case settings if (settings.notification && settings.useSMTP) => new Mailer(settings.smtp.get)
-    case _ => new MockMailer
-  }
-}
-
-class Mailer(private val smtp: Smtp) extends Notifier {
-  private val logger = LoggerFactory.getLogger(classOf[Mailer])
-
-  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 { session =>
-          recipients(loginAccount)(session) foreach { to =>
-            send(to, subject, msg, loginAccount)
-          }
-        }
-        "Notifications Successful."
-      }
-      f.onComplete {
-        case Success(s) => logger.debug(s)
-        case Failure(t) => logger.error("Notifications Failed.", t)
-      }
-    }
-  }
-
-  def send(to: String, subject: String, msg: String, loginAccount: Account): Unit = {
-    val email = new HtmlEmail
-    email.setHostName(smtp.host)
-    email.setSmtpPort(smtp.port.get)
-    smtp.user.foreach { user =>
-      email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
-    }
-    smtp.ssl.foreach { ssl =>
-      email.setSSLOnConnect(ssl)
-      if(ssl == true) {
-        email.setSslSmtpPort(smtp.port.get.toString)
-      }
-    }
-    smtp.starttls.foreach { starttls =>
-      email.setStartTLSEnabled(starttls)
-      email.setStartTLSRequired(starttls)
-    }
-    smtp.fromAddress
-      .map (_ -> smtp.fromName.getOrElse(loginAccount.userName))
-      .orElse (Some("notifications@gitbucket.com" -> loginAccount.userName))
-      .foreach { case (address, name) =>
-        email.setFrom(address, name)
-      }
-    email.setCharset("UTF-8")
-    email.setSubject(subject)
-    email.setHtmlMsg(msg)
-
-    email.addTo(to).send
-  }
-
-}
-class MockMailer extends Notifier {
-  def toNotify(subject: String, msg: String)
-              (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
-}

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

@@ -24,7 +24,7 @@ trait Validations {
    */
   def password: Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(!value.matches("[a-zA-Z0-9\\-_.]+")){
+      if(System.getProperty("gitbucket.validate.password") != "false" && !value.matches("[a-zA-Z0-9\\-_.]+")){
         Some(s"${name} contains invalid character.")
       } else {
         None

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

@@ -128,7 +128,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
                    repository: RepositoryService.RepositoryInfo,
                    enableWikiLink: Boolean, enableRefsLink: Boolean, enableAnchor: Boolean)(implicit context: Context): Html = {
 
-    val fileName  = filePath.reverse.head.toLowerCase
+    val fileName  = filePath.last.toLowerCase
     val extension = FileUtil.getExtension(fileName)
     val renderer  = PluginRegistry().getRenderer(extension)
     renderer.render(RenderRequest(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, enableAnchor, context))

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

@@ -1,5 +1,6 @@
 @(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.util.DatabaseConfig
+@import gitbucket.core.view.helpers
 @gitbucket.core.html.main("System settings"){
   @gitbucket.core.admin.html.menu("system"){
     @gitbucket.core.helper.html.information(info)
@@ -344,6 +345,36 @@
             </div>
           </div>
           *@
+          <!--====================================================================-->
+          <!-- AdminLTE SkinName -->
+          <!--====================================================================-->
+          <hr>
+          <label class="strong">
+            AdminLTE skin name
+          </label>
+          <div class="form-group">
+            <label class="control-label col-md-3" for="skinName">Skin name</label>
+            <div class="col-md-9">
+              <select id="skinName" name="skinName">
+                @Seq(
+                "skin-black",
+                "skin-black-light",
+                "skin-blue",
+                "skin-blue-light",
+                "skin-green",
+                "skin-green-light",
+                "skin-purple",
+                "skin-purple-light",
+                "skin-red",
+                "skin-red-light",
+                "skin-yellow",
+                "skin-yellow-light",
+                ).map{ skin =>
+                  <option @if(skin == context.settings.skinName){selected}>@skin</option>
+                }
+              </select>
+            </div>
+          </div>
         </div>
       </div>
       <div class="align-right" style="margin-top: 20px;">

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

@@ -1,8 +1,22 @@
-@(title: String)(implicit context: gitbucket.core.controller.Context)
+@(title: String, e: Option[Throwable]=None)(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main("Error"){
   <div class="content-wrapper main-center">
     <div class="content body">
       <h1>@title</h1>
+      @if(context.loginAccount.map{_.isAdmin}.getOrElse(false)){
+        @e.map { ex =>
+          <h2>@ex.getMessage</h2>
+          <table class="table table-condensed table-striped table-hover">
+            <tbody>
+            @ex.getStackTrace.map{ st =>
+            <tr><td>@st</td></tr>
+            }
+            </tbody>
+          </table>
+        }
+      } else {
+        <div>Please contact your administrator.</div>
+      }
     </div>
   </div>
-}
+}

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

@@ -11,7 +11,9 @@
 $(function(){
   @gitbucket.core.plugin.PluginRegistry().getSuggestionProviders.map { provider =>
     @if(provider.context.contains(completionContext)){
-      var @provider.id = @Html(helpers.json(provider.values(repository)));
+      var @provider.id = @Html(helpers.json(provider.options(repository).map { case (value, label) =>
+        Map("value" -> value, "label" -> label)
+      }));
       @Html(provider.additionalScript)
     }
   }
@@ -23,14 +25,14 @@ $(function(){
           match: /\B@{provider.prefix}([\-+\w]*)$/,
           search: function (term, callback) {
             callback($.map(@{provider.id}, function (proposal) {
-              return proposal.indexOf(term) === 0 ? proposal : null;
+              return proposal.value.indexOf(term) === 0 ? proposal : null;
             }));
           },
-          template: function (value) {
+          template: function (option) {
             return @{Html(provider.template)};
           },
-          replace: function (value) {
-            return '@{provider.prefix}' + value + '@{provider.suffix}';
+          replace: function (option) {
+            return '@{provider.prefix}' + @{Html(provider.replace)} + '@{provider.suffix}';
           },
           index: 1
         },
@@ -65,8 +67,6 @@ $(function(){
   url: '@context.path/upload/file/@repository.owner/@repository.name',
   maxFilesize: 10,
   clickable: @clickable,
-  acceptedFiles: @Html(FileUtil.mimeTypeWhiteList.mkString("'", ",", "'")),
-  dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, JPG, DOCX, PPTX, XLSX, TXT, or PDF.',
   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) {
     var attachFile = (file.type.match(/image\/.*/) ? '\n![' + file.name.split('.')[0] : '\n[' + file.name) +

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

@@ -18,7 +18,7 @@
   if (document.queryCommandSupported('copy')) {
     var title = $('#@copyButtonId').attr('title');
     $('#@copyButtonId').tooltip({
-      @* if default container is used then 2 lines tooltip text is displayd because tooptip width is narrow. *@
+      @* if default container is used then 2 lines tooltip text is displayed because tooptip width is narrow. *@
       container: 'body'
     });
     $('#@copyButtonId').on('click', function() {

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

@@ -10,7 +10,7 @@
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @if(showIndex){
   <div class="pull-right" style="margin-bottom: 10px;">
-    <div class="btn-group" data-toggle="buttons-radio">
+    <div class="btn-group" data-toggle="buttons">
       <input type="button" id="btn-unified" class="btn btn-default btn-small active" value="Unified">
       <input type="button" id="btn-split" class="btn btn-default btn-small" value="Split">
     </div>
@@ -151,20 +151,21 @@ $(function(){
   }
   window.viewType = 1;
   if(("&" + location.search.substring(1)).indexOf("&diff=split") != -1){
-    $('.container').removeClass('container').addClass('container-wide');
     window.viewType = 0;
   }
   renderDiffs();
 
   $('#btn-unified').click(function(){
     window.viewType = 1;
-    $('.container-wide').removeClass('container-wide').addClass('container');
+    $('#btn-unified').addClass('active');
+    $('#btn-split').removeClass('active');
     renderDiffs();
   });
 
   $('#btn-split').click(function(){
     window.viewType = 0;
-    $('.container').removeClass('container').addClass('container-wide');
+    $('#btn-unified').removeClass('active');
+    $('#btn-split').addClass('active');
     renderDiffs();
   });
 
@@ -174,6 +175,7 @@ $(function(){
     }
     $(this).closest('table').find('.not-diff').toggle();
   });
+
   $('.ignore-whitespace').change(function() {
     renderOneDiff($(this).closest("table").find(".diffText"), viewType);
   });
@@ -188,22 +190,56 @@ $(function(){
     }
     return $('<tr class="not-diff"><td colspan="3" class="comment-box-container"></td></tr>');
   }
+
   if (typeof $('#show-notes')[0] !== 'undefined' && !$('#show-notes')[0].checked) {
     $('#comment-list').children('.inline-comment').hide();
   }
+
+  function showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr){
+    // assemble Ajax url
+    var url = '@helpers.url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName@issueId.map { id => + '&issueId=@id' };
+    if (!isNaN(oldLineNumber) && oldLineNumber) {
+      url += ('&oldLineNumber=' + oldLineNumber)
+    }
+    if (!isNaN(newLineNumber) && newLineNumber) {
+      url += ('&newLineNumber=' + newLineNumber)
+    }
+    // send Ajax request
+    $.get(url, { dataType : 'html' }, function(responseContent) {
+      // create container
+      var tmp;
+      if (!isNaN(oldLineNumber) && oldLineNumber) {
+        if (!isNaN(newLineNumber) && newLineNumber) {
+          tmp = getInlineContainer();
+        } else {
+          tmp = getInlineContainer('old');
+        }
+      } else {
+        tmp = getInlineContainer('new');
+      }
+      // add comment textarea
+      tmp.addClass('inline-comment-form').children('.comment-box-container').html(responseContent);
+      $tr.nextAll(':not(.not-diff):first').before(tmp);
+      // hide reply comment field
+      $(tmp).closest('.not-diff').prev().find('.reply-comment').closest('.not-diff').hide();
+      // focus textarea
+      tmp.find('textarea').focus();
+    });
+  }
+
+  // Add comment button
   $('.diff-outside').on('click','table.diff .add-comment',function() {
     var $this  = $(this);
     var $tr    = $this.closest('tr');
     var $check = $this.closest('table:not(.diff)').find('.toggle-notes');
-    var url    = '';
+    //var url    = '';
     if (!$check.prop('checked')) {
       $check.prop('checked', true).trigger('change');
     }
     if (!$tr.nextAll(':not(.not-diff):first').prev().hasClass('inline-comment-form')) {
       var commitId = $this.closest('.table-bordered').attr('commitId'),
       fileName = $this.closest('.table-bordered').attr('fileName'),
-      oldLineNumber, newLineNumber,
-      url = '@helpers.url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName@issueId.map { id => + '&issueId=@id' };
+      oldLineNumber, newLineNumber;
       if (viewType == 0) {
         oldLineNumber = $this.parent().prev('.oldline').attr('line-number');
         newLineNumber = $this.parent().prev('.newline').attr('line-number');
@@ -211,30 +247,27 @@ $(function(){
         oldLineNumber = $this.parent().prevAll('.oldline').attr('line-number');
         newLineNumber = $this.parent().prevAll('.newline').attr('line-number');
       }
-      if (!isNaN(oldLineNumber) && oldLineNumber) {
-        url += ('&oldLineNumber=' + oldLineNumber)
-      }
-      if (!isNaN(newLineNumber) && newLineNumber) {
-        url += ('&newLineNumber=' + newLineNumber)
-      }
-      $.get(url, { dataType : 'html' }, function(responseContent) {
-        var tmp;
-        if (!isNaN(oldLineNumber) && oldLineNumber) {
-          if (!isNaN(newLineNumber) && newLineNumber) {
-            tmp = getInlineContainer();
-          } else {
-            tmp = getInlineContainer('old');
-          }
-        } else {
-          tmp = getInlineContainer('new');
-        }
-        tmp.addClass('inline-comment-form').children('.comment-box-container').html(responseContent);
-        $tr.nextAll(':not(.not-diff):first').before(tmp);
-      });
+
+      showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr);
     }
   }).on('click', 'table.diff .btn-default', function() {
+    // Cancel comment form
+    $(this).closest('.not-diff').prev().find('.reply-comment').closest('.not-diff').show();
     $(this).closest('.inline-comment-form').remove();
   });
+
+  // Reply comment
+  $('.diff-outside').on('click', '.reply-comment',function(){
+    var $this = $(this);
+    var $tr    = $this.closest('tr');
+    var commitId = $this.closest('.table-bordered').attr('commitId');
+    var fileName = $this.data('filename');
+    var oldLineNumber = $this.data('oldline');
+    var newLineNumber = $this.data('newline');
+
+    showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr);
+  });
+
   function renderOneCommitCommentIntoDiff($v, diff){
     var filename = $v.attr('filename');
     var oldline  = $v.attr('oldline');
@@ -257,6 +290,7 @@ $(function(){
       tmp.hide();
     }
   }
+
   function renderStatBar(add, del){
     if(add + del > 5){
       if(add){
@@ -282,6 +316,7 @@ $(function(){
     }
     return ret;
   }
+
   function renderOneDiff(diffText, viewType){
     var table = diffText.closest("table[data-diff-id]");
     var i = table.data("diff-id");
@@ -305,12 +340,59 @@ $(function(){
         }
       });
     }
+    return table;
   }
+
+  function renderReplyComment($table){
+    var elements = {};
+    var filename, newline, oldline;
+    $table.find('.comment-box-container .inline-comment').each(function(i, e){
+      filename = $(e).attr('filename');
+      newline = $(e).attr('newline');
+      oldline = $(e).attr('oldline');
+      var key = filename + '-' + newline + '-' + oldline;
+      elements[key] = {
+        element: $(e),
+        filename: filename,
+        newline: newline,
+        oldline: oldline
+      };
+    });
+    for(var key in elements){
+      filename = elements[key]['filename'];
+      oldline = elements[key]['oldline'];
+      newline = elements[key]['newline'];
+
+      var $v = $('<div class="commit-comment-box reply-comment-box">')
+        .append($('<input type="text" class="form-control reply-comment" placeholder="Reply...">')
+          .data('filename', filename)
+          .data('newline',  newline)
+          .data('oldline',  oldline));
+
+      var tmp;
+      if (typeof oldline !== 'undefined') {
+        if (typeof newline !== 'undefined') {
+          tmp = getInlineContainer();
+        } else {
+          tmp = getInlineContainer('old');
+        }
+        tmp.children('td:first').html($v);
+      } else {
+        tmp = getInlineContainer('new');
+        tmp.children('td:last').html($v);
+      }
+      elements[key]['element'].closest('.not-diff').after(tmp);
+    }
+  }
+
   function renderDiffs(){
     var i = 0, diffs = $('.diffText');
     function render(){
       if(diffs[i]){
-        renderOneDiff($(diffs[i]), viewType);
+        var $table = renderOneDiff($(diffs[i]), viewType);
+        @if(hasWritePermission) {
+          renderReplyComment($table);
+        }
         i++;
         setTimeout(render);
       }

src/main/twirl/gitbucket/core/helper/feed.scala.xml

@@ -2,10 +2,10 @@
 @import gitbucket.core.view.helpers
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="en-US">
   <id>tag:@context.host,2013:gitbucket</id>
-  <title>Gitbucket's activities</title>
+  <title>GitBucket's activities</title>
   <link type="application/atom+xml" rel="self" href="@context.baseUrl/activities.atom"/>
   <author>
-    <name>Gitbucket</name>
+    <name>GitBucket</name>
     <uri>@context.baseUrl</uri>
   </author>
   <updated>@helpers.datetimeRFC3339(if(activities.isEmpty) new java.util.Date else activities.map(_.activityDate).max)</updated>

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

@@ -201,7 +201,6 @@ $(function(){
       $.post('@helpers.url(repository)/issue_comments/delete/' + id,
       function(data){
         if(data > 0) {
-          $('#comment-' + id).prev('div.issue-avatar-image').remove();
           $('#comment-' + id).remove();
         }
       });
@@ -230,7 +229,6 @@ $(function(){
       function(data){
         if(data > 0) {
           $('.commit-comment-' + id).closest('.not-diff').remove();
-          $('.commit-comment-' + id).closest('.inline-comment').remove();
         }
       });
     }

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

@@ -4,9 +4,9 @@
 @defining(label.map(_.labelId).getOrElse("new")){ labelId =>
 <div id="edit-label-area-@labelId">
   <form class="form-inline">
-    <input type="text" id="labelName-@labelId" style="width: 300px; float: left; margin-right: 4px;" class="form-control" value="@label.map(_.labelName)"@if(labelId == "new"){ placeholder="New label name"}/>
+    <input type="text" id="labelName-@labelId" style="width: 300px; float: left; margin-right: 4px;" class="form-control input-sm" value="@label.map(_.labelName)"@if(labelId == "new"){ placeholder="New label name"}/>
     <div id="label-color-@labelId" class="input-group color bscp" data-color="#@label.map(_.color).getOrElse("888888")" data-color-format="hex" style="width: 100px; float: left;">
-      <input type="text" class="form-control" id="labelColor-@labelId" value="#@label.map(_.color).getOrElse("888888")" style="width: 100px;">
+      <input type="text" class="form-control input-sm" id="labelColor-@labelId" value="#@label.map(_.color).getOrElse("888888")" style="width: 100px;">
       <span class="input-group-addon"><i style="background-color: #@label.map(_.color).getOrElse("888888");"></i></span>
     </div>
     <script>
@@ -14,8 +14,8 @@
     </script>
     <span class="pull-right">
       <span id="label-error-@labelId" class="error"></span>
-      <input type="button" id="cancel-@labelId" class="btn btn-default label-edit-cancel" value="Cancel">
-      <input type="button" id="submit-@labelId" class="btn btn-success" style="margin-bottom: 0px;" value="@(if(labelId == "new") "Create label"  else "Save changes")"/>
+      <input type="button" id="cancel-@labelId" class="btn btn-sm btn-default label-edit-cancel" value="Cancel">
+      <input type="button" id="submit-@labelId" class="btn btn-sm btn-success" style="margin-bottom: 0px;" value="@(if(labelId == "new") "Create label"  else "Save changes")"/>
     </span>
   </form>
 </div>

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

@@ -7,9 +7,9 @@
   <td style="padding-top: 15px; padding-bottom: 15px;">
     <div class="milestone row" id="label-@label.labelId">
       <div class="col-md-8">
-        <div style="margin-top: 6px">
+        <div>
           <a href="@helpers.url(repository)/issues?labels=@helpers.urlEncode(label.labelName)" id="label-row-content-@label.labelId">
-            <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
+            <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; border-radius: 4px;">
               <i class="octicon octicon-tag" style="color: #@label.fontColor;"></i>
               @label.labelName
             </span>

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

@@ -16,9 +16,7 @@
     <table class="table table-bordered table-hover table-issues">
       <thead>
         <tr id="label-row-header">
-          <th style="background-color: #eee;">
-            <span class="small">@labels.size labels</span>
-          </th>
+          <th>@labels.size labels</th>
         </tr>
       </thead>
       <tbody>

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

@@ -13,15 +13,13 @@
     <table class="table table-bordered table-hover table-issues">
       <thead>
         <tr>
-          <th style="background-color: #eee;">
-            <span class="small">
-              <a class="button-link@if(state == "open"){ selected}" href="?state=open">
-                @milestones.count(_._1.closedDate.isEmpty) Open
-              </a>&nbsp;&nbsp;
-              <a class="button-link@if(state == "closed"){ selected}" href="?state=closed">
-                @milestones.count(_._1.closedDate.isDefined) Closed
-              </a>
-            </span>
+          <th>
+            <a class="button-link@if(state == "open"){ selected}" href="?state=open">
+              @milestones.count(_._1.closedDate.isEmpty) Open
+            </a>&nbsp;&nbsp;
+            <a class="button-link@if(state == "closed"){ selected}" href="?state=closed">
+              @milestones.count(_._1.closedDate.isDefined) Closed
+            </a>
           </th>
         </tr>
       </thead>

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

@@ -4,19 +4,19 @@
 @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"}/>
+    <input type="text" id="priorityName-@priorityId" style="width: 200px; float: left; margin-right: 4px;" class="form-control input-sm" 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;">
+      <input type="text" class="form-control input-sm" 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..." />
+    <input type="text" id="description-@priorityId" style="width: 500px; float: left; margin-left: 4px;" class="form-control input-sm" 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")"/>
+      <input type="button" id="cancel-@priorityId" class="btn btn-sm btn-default priority-edit-cancel" value="Cancel">
+      <input type="button" id="submit-@priorityId" class="btn btn-sm btn-success" style="margin-bottom: 0px;" value="@(if(priorityId == "new") "Create priority"  else "Save changes")"/>
     </span>
   </form>
 </div>

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

@@ -16,9 +16,7 @@
     <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>
+          <th>@priorities.size priorities</th>
         </tr>
       </thead>
       <tbody>

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

@@ -10,9 +10,9 @@
         @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">
+        <div>
           <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;">
+            <span style="background-color: #@priority.color; color: #@priority.fontColor; padding: 8px; border-radius: 4px;">
               <i class="octicon octicon-flame" style="color: #@priority.fontColor;"></i>&nbsp;@priority.priorityName
             </span>
           </a>

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

@@ -9,6 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <link rel="icon" href="@helpers.assets("/common/images/gitbucket.png")" type="image/vnd.microsoft.icon" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="@helpers.assets("/vendors/google-fonts/css/source-sans-pro.css")" rel="stylesheet">
     <link href="@helpers.assets("/vendors/bootstrap-3.3.6/css/bootstrap.min.css")" rel="stylesheet">
     <link href="@helpers.assets("/vendors/octicons-4.2.0/octicons.css")" rel="stylesheet">
     <link href="@helpers.assets("/vendors/bootstrap-datetimepicker-4.17.44/css/bootstrap-datetimepicker.min.css")" rel="stylesheet">
@@ -16,7 +17,7 @@
     <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.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(s"/vendors/AdminLTE-2.3.11/css/skins/${context.settings.skinName}.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">
@@ -42,7 +43,7 @@
     }
     <script src="@helpers.assets("/vendors/AdminLTE-2.3.11/js/app.js")" type="text/javascript"></script>
   </head>
-  <body class="skin-blue page-load @if(body.toString.contains("menu-item-hover")){sidebar-mini} @if(context.sidebarCollapse){sidebar-collapse}">
+  <body class="@context.settings.skinName 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">

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

@@ -57,7 +57,7 @@
         @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
       }
       @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){
-        @menuitem("/settings", "settings", "Settings", "tools")
+        @menuitem("/settings", "settings", "Settings", "gear")
       }
       @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu =>
         @menu(repository, context).map { link =>
@@ -88,9 +88,6 @@
                 forked from <a href="@context.path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
               </div>
             }
-            @x.description.map { description =>
-              <div class="normal muted" style="margin-left: 36px; font-size: 80%;">@Html(helpers.detectAndRenderLinks(description, repository))</div>
-            }
           }
         </div>
       </div>

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

@@ -23,7 +23,7 @@
       <div>
         <div class="show-title pull-right">
           @if(isManageable || context.loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
-            <a class="btn" href="#" id="edit">Edit</a>
+            <a class="btn btn-default" href="#" id="edit">Edit</a>
           }
           @if(context.loginAccount.isDefined){
             <a class="btn btn-success" href="@helpers.url(repository)/compare">New pull request</a>

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

@@ -11,6 +11,7 @@
   @gitbucket.core.html.menu("files", repository){
     <div class="head">
       <div class="pull-right hide-if-blame"><div class="btn-group">
+        <a href="@helpers.url(repository)/blob/@latestCommit.id/@pathList.mkString("/")" data-hotkey="y" style="display: none;">Transfer to URL with SHA</a>
         <a href="@helpers.url(repository)/find/@helpers.encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t">Find file</a>
       </div></div>
       <div class="line-age-legend">
@@ -29,6 +30,7 @@
         </ol>
         <span>Older</span>
       </div>
+      <div id="branchCtrlWrapper" style="display:inline;">
       @gitbucket.core.helper.html.branchcontrol(
         branch,
         repository,
@@ -38,6 +40,7 @@
           <li><a href="@helpers.url(repository)/blob/@helpers.encodeRefName(x)/@pathList.mkString("/")">@gitbucket.core.helper.html.checkicon(x == branch) @x</a></li>
         }
       }
+      </div>
       <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
       @pathList.zipWithIndex.map { case (section, i) =>
         @if(i == pathList.length - 1){
@@ -71,7 +74,7 @@
       </div>
     </div>
       @if(content.viewType == "text"){
-        @defining(helpers.isRenderable(pathList.reverse.head)){ isRenderable =>
+        @defining(helpers.isRenderable(pathList.last)){ isRenderable =>
           @if(!isBlame && isRenderable) {
             <div class="box-content-bottom markdown-body" style="padding-left: 20px; padding-right: 20px;">
               @helpers.renderMarkup(pathList, content.content.get, branch, repository, false, false, true)
@@ -130,14 +133,18 @@ $(window).load(function(){
         }
         var line = pos[i].id.replace(/^L/,'');
         var hash = location.hash;
+        var commitUrl = '@helpers.url(repository)/blob/@latestCommit.id/@pathList.mkString("/")';
         if(e.shiftKey == true && hash.match(/#L\d+(-L\d+)?/)){
           var lines = hash.split('-');
-          location.hash = lines[0] + '-L' + line;
+          window.history.pushState('', '', commitUrl + lines[0] + '-L' + line);
         } else {
           var p = $("#L"+line).attr('id',"");
-          location.hash = '#L' + line;
+          window.history.pushState('', '', commitUrl + '#L' + line);
           p.attr('id','L'+line);
         }
+        $("#branchCtrlWrapper .btn .muted").text("tree:");
+        $("#branchCtrlWrapper .btn .strong").text("@latestCommit.id.substring(0, 10)");
+        updateHighlighting();
       }).appendTo(pre);
     }
   }

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

@@ -7,7 +7,7 @@
     <table class="table table-hover branches">
       <thead>
         <tr>
-          <th style="background: #f5f5f5;color: #666;" colspan="3">All branches</th>
+          <th colspan="3">All branches</th>
         </tr>
       </thead>
       <tbody>
@@ -15,7 +15,7 @@
         <tr>
           <td class="branch-details">
             @if(isProtected){ <span class="octicon octicon-shield" title="This branch is protected"></span> }
-            <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch.name)" class="branch-name">@branch.name</a>
+            <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch.name)">@branch.name</a>
             <span class="branch-meta">
               <span>Updated @gitbucket.core.helper.html.datetimeago(branch.commitTime, false)
                 by <span>@helpers.user(branch.committerName, branch.committerEmailAddress, "muted-link")</span>
@@ -36,7 +36,7 @@
               }
             }
           </td>
-          <td>
+          <td class="text-right">
             <div class="branch-action">
               @if(repository.repository.defaultBranch != branch.name){
                 @branch.mergeInfo.map{ info =>

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

@@ -44,7 +44,7 @@
   <script>
     $('.btn-inline-comment').click(function(e) {
       e.preventDefault();
-      $form = $(e.target).attr('disabled', 'disabled').closest('form');
+      var $form = $(e.target).attr('disabled', 'disabled').closest('form');
       var param = {};
       $($form.serializeArray()).each(function(i, v) {
         param[v.name] = v.value;
@@ -64,7 +64,16 @@
         } else {
           tmp = '<td colspan="3" class="comment-box-container"></td>'
         }
-        $form.closest('tr').removeClass('inline-comment-form').html(tmp).find('.comment-box-container').html(data);
+        var $tr = $form.closest('tr.not-diff');
+
+        // Apply comment
+        $tr.removeClass('inline-comment-form').html(tmp).find('.comment-box-container').html(data);
+
+        // Show reply comment form
+        var replyComment = $tr.prev().find('.reply-comment').closest('.not-diff').show();
+        replyComment.remove();
+        $tr.after(replyComment);
+
         $('#comment-list').append(data);
         if (typeof $('#show-notes')[0] !== 'undefined' && !$('#show-notes')[0].checked) {
           $('#comment-list').children('.inline-comment').hide();

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

@@ -15,7 +15,7 @@
       <tr>
         <th class="box-header">
           <div class="pull-right align-right">
-            <a href="@helpers.url(repository)/tree/@commit.id" class="btn btn-small">Browse code</a>
+            <a href="@helpers.url(repository)/tree/@commit.id" class="btn btn-default">Browse code</a>
           </div>
           <div class="commit-log">@helpers.link(commit.summary, repository)</div>
           @if(commit.description.isDefined){

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

@@ -4,7 +4,9 @@
   commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
   page: Int,
   hasNext: Boolean,
-  hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+  hasWritePermission: Boolean,
+  getStatuses: String => List[gitbucket.core.model.CommitStatus],
+  getSummary: List[gitbucket.core.model.CommitStatus] => (gitbucket.core.model.CommitState, String))(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("files", repository){
@@ -63,6 +65,30 @@
                   }
                   @helpers.user(commit.committerName, commit.committerEmailAddress, "username")
                   <span class="muted">committed @gitbucket.core.helper.html.datetimeago(commit.commitTime)</span>
+                    @defining({
+                      val statuses = getStatuses(commit.id)
+                      val (summary, summaryText) = getSummary(statuses)
+                      (statuses, summary, summaryText)
+                    }){ case (statuses, summaryState, summaryText) =>
+                      @if(statuses.nonEmpty){
+                        @helpers.commitStateIcon(summaryState)
+                        <strong class="text-@{summaryState.name}">@helpers.commitStateText(summaryState, commit.id)</strong>
+                        <span class="text-@{summaryState.name}">- @summaryText checks</span>
+                        <a href="#" class="toggle-check">Show all checks</a>
+                        <div style="display: none;">
+                          @statuses.map{ status =>
+                          <div class="build-status-item">
+                            <span class="build-status-icon text-@{status.state.name}">@helpers.commitStateIcon(status.state)</span>
+                            <strong>@status.context</strong>
+                            @status.description.map { desc => <span class="muted">- @desc</span> }
+                            <span>
+                              @status.targetUrl.map { url => - <a href="@url">Details</a> }
+                            </span>
+                          </div>
+                          }
+                        </div>
+                      }
+                    }
                 </div>
               </div>
             </div>
@@ -86,5 +112,19 @@
         }
       </ul>
     </nav>
+    <script>
+      $(function () {
+        $('.toggle-check').click(function(){
+          var div = $(this).next('div');
+          if(div.is(':visible')){
+            $(this).text('Show all checks');
+          } else {
+            $(this).text('Hide all checks');
+          }
+          div.toggle();
+          return false;
+        });
+      })
+    </script>
   }
 }

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

@@ -22,9 +22,17 @@
     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){
+    @if(pathList.isEmpty) {
+      @repository.repository.description.map { description =>
+        <p class="pc" style="margin-bottom: 10px;">
+          <span class="normal muted">@Html(helpers.detectAndRenderLinks(description, repository))</span>
+        </p>
+      }
+    }
     <div class="head" style="height: 24px;">
       <div class="pull-right">
         <div class="btn-group">
+          <a href="@helpers.url(repository)/tree/@latestCommit.id/@pathList.mkString("/")" data-hotkey="y" style="display: none;">Transfer to URL with SHA</a>
           <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>
           <a href="@helpers.url(repository)/commits/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default"><i class="octicon octicon-history"></i> @if(commitCount > 10000){10000+} else {@commitCount} @helpers.plural(commitCount, "commit")</a>
         </div>
@@ -102,8 +110,8 @@
       <tr>
         <th colspan="4" class="latest-commit">
           <div>
-            <div class="pull-right align-right monospace" style="line-height: 18px;">
-              <a href="@helpers.url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a>
+            <div class="pull-right align-right" style="line-height: 18px;">
+              <a href="@helpers.url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> <span class="monospace">@latestCommit.id.substring(0, 10)</span></a>
             </div>
             <div class="author-info">
               <div class="author">
@@ -145,21 +153,35 @@
         </td>
         <td class="ellipsis-cell" style="width: 20%; min-width: 160px;">
           @if(file.isDirectory){
-            @if(file.linkUrl.isDefined){
-              <a href="@file.linkUrl">
-                <span class="simplified-path">@file.name.split("/").toList.init match {
-                  case Nil => {}
-                  case list => {@list.mkString("", "/", "/")}
-                }</span>@file.name.split("/").toList.last
-              </a>
-            } else {
-              <a href="@helpers.url(repository)/tree@{(branch :: pathList).map(helpers.encodeRefName).mkString("/", "/", "/")}@{helpers.encodeRefName(file.name)}">
-                <span class="simplified-path">@file.name.split("/").toList.init match {
-                  case Nil => {}
-                  case list => {@list.mkString("", "/", "/")}
-                }</span>@file.name.split("/").toList.last
-              </a>
-            }
+            @{file.linkUrl match {
+              case Some(linkUrl) if linkUrl.startsWith("http://") || linkUrl.startsWith("https://") => {
+                <a href={linkUrl}>
+                  <span class="simplified-path">{file.name.split("/").toList.init match {
+                    case Nil  => ""
+                    case list => list.mkString("", "/", "/")
+                  }}</span>
+                  {file.name.split("/").toList.last}
+                </a>
+              }
+              case Some(_) => {
+                <span>
+                  <span class="simplified-path">{file.name.split("/").toList.init match {
+                    case Nil  => ""
+                    case list => list.mkString("", "/", "/")
+                  }}</span>
+                  {file.name.split("/").toList.last}
+                </span>
+              }
+              case None => {
+                <a href={helpers.url(repository) + "/tree" + (branch :: pathList).map(helpers.encodeRefName).mkString("/", "/", "/") + helpers.encodeRefName(file.name)}>
+                  <span class="simplified-path">{file.name.split("/").toList.init match {
+                    case Nil  => ""
+                    case list => list.mkString("", "/", "/")
+                  }}</span>
+                  {file.name.split("/").toList.last}
+                </a>
+              }
+            }}
           } else {
             <a href="@helpers.url(repository)/blob@{(branch :: pathList).map(helpers.encodeRefName).mkString("/", "/", "/")}@{helpers.encodeRefName(file.name)}">@file.name</a>
           }
@@ -175,7 +197,7 @@
     </table>
     @readme.map { case(filePath, content) =>
       <div id="readme" class="panel panel-default">
-        <div class="panel-heading strong">@filePath.reverse.head</div>
+        <div class="panel-heading strong">@filePath.last</div>
         <div class="panel-body markdown-body" style="padding-left: 20px; padding-right: 20px;">@helpers.renderMarkup(filePath, content, branch, repository, false, false, true)</div>
       </div>
     }

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

@@ -12,7 +12,7 @@
         </tr>
       </thead>
       <tbody>
-        @repository.tags.reverse.map { tag =>
+        @repository.tags.reverseMap { tag =>
           <tr>
             <td><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(tag.name)">@tag.name</a></td>
             <td>@gitbucket.core.helper.html.datetimeago(tag.time, false)</td>

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

@@ -16,7 +16,8 @@
           <span id="error-password" class="error"></span>
           <input type="password" name="password" id="password" class="form-control" value="@password"/>
         </div>
-        <input type="submit" class="btn btn-success" value="Sign in"/>
+        <input type="hidden" name="hash"/>
+        <input type="submit" class="btn btn-success" value="Sign in" onClick="this.form.hash.value = window.location.hash;"/>
         @if(systemSettings.allowAccountRegistration){
           or <a href="@context.path/register">Create new account</a>
         }

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

@@ -50,8 +50,6 @@ $(function(){
       url: '@context.path/upload/wiki/@repository.owner/@repository.name',
       maxFilesize: 10,
       clickable: false,
-      acceptedFiles: @Html(FileUtil.mimeTypeWhiteList.mkString("'", ",", "'")),
-      dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, JPG, DOCX, PPTX, XLSX, TXT, or PDF.',
       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) {
         var attachFile = (file.type.match(/image\/.*/) ? '\n![' + file.name.split('.')[0] : '\n[' + file.name) + '](' + file.name + ')';
@@ -62,8 +60,6 @@ $(function(){
     $('.clickable').dropzone({
       url: '@context.path/upload/wiki/@repository.owner/@repository.name',
       maxFilesize: 10,
-      acceptedFiles: @Html(FileUtil.mimeTypeWhiteList.mkString("'", ",", "'")),
-      dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, JPG, DOCX, PPTX, XLSX, TXT, or PDF.',
       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) {
         var attachFile = (file.type.match(/image\/.*/) ? '\n![' + file.name.split('.')[0] : '\n[' + file.name) + '](' + file.name + ')';
@@ -78,7 +74,7 @@ $(function(){
   }
 
   $('#delete').click(function(){
-    return confirm('Are you sure you want to delete this page?'); 
+    return confirm('Are you sure you want to delete this page?');
   });
 });
 </script>

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

@@ -151,11 +151,6 @@ div.container {
   padding-right: 10px;
 }
 
-div.container-wide {
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
 div.main-center {
   margin: 0 auto;
 }
@@ -392,8 +387,8 @@ a.btn-danger:hover .octicon {
 /* Head Menu */
 /****************************************************************************/
 div.headbar {
-  padding-top: 19px;
-  margin-bottom: 20px;
+  padding-top: 4px;
+  margin-bottom: 8px;
 }
 
 /****************************************************************************/
@@ -438,8 +433,9 @@ div.repository-content {
   margin-left: 40px;
 }
 
-table.branches>thead>tr>th, table.branches>tbody>tr>td{
+table.branches>tbody>tr>td{
   padding: 12px;
+  line-height: 30px;
 }
 
 .branches .muted-link{
@@ -450,15 +446,6 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{
   color: #4183c4;
 }
 
-.branches .branch-name{
-  color: #4183c4;
-  display: inline-block;
-  padding: 2px 6px;
-  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-  background-color: rgba(209,227,237,0.5);
-  border-radius: 3px;
-}
-
 .branches .branch-meta{
   color: #aaa;
   line-height: 20px;
@@ -1169,7 +1156,8 @@ table.diff tbody tr.not-diff:hover td {
 .not-diff > .comment-box-container {
   white-space: normal;
   line-height: initial;
-  padding: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
 }
 
 .diff .oldline:before, .diff .newline:before {

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

@@ -443,7 +443,7 @@ function string_score(string, word) {
  * @param word    {String}        search word
  * @param strings {Array[String]} search targets
  * @param limit   {Integer}       result limit
- * @return {Array[{score:"float matching score", string:"string target string", matchingPositions:"Array[Interger] matchng positions"}]}
+ * @return {Array[{score:"float matching score", string:"string target string", matchingPositions:"Array[Integer] matching positions"}]}
  */
 function string_score_sort(word, strings, limit){
   var ret = [], i=0, l = (word==="")?Math.min(strings.length, limit):strings.length;
@@ -466,7 +466,7 @@ function string_score_sort(word, strings, limit){
 }
 /**
  * highlight by result.
- * @param score {string:"string target string", matchingPositions:"Array[Interger] matchng positions"}
+ * @param score {string:"string target string", matchingPositions:"Array[Integer] matching positions"}
  * @param highlight tag ex: '<b>'
  * @return array of highlighted html elements.
  */

src/main/webapp/assets/vendors/AdminLTE-2.3.11/css/AdminLTE.css

@@ -1,4 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
 /*!
  *   AdminLTE v2.3.8
  *   Author: Almsaeed Studio

src/main/webapp/assets/vendors/google-fonts/css/source-sans-pro.css

@@ -0,0 +1,66 @@
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-weight: 300;
+	src: local('SourceSansPro-LightItalic'), local('Source Sans Pro Light Italic'),
+		url(../fonts/source-sans-pro_300_italic.woff2) format('woff2'),
+		url(../fonts/source-sans-pro_300_italic.woff) format('woff'),
+		url(../fonts/source-sans-pro_300_italic.ttf) format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-weight: 400;
+	src: local('SourceSansPro-Italic'), local('Source Sans Pro Italic'),
+		url(../fonts/source-sans-pro_400_italic.woff2) format('woff2'),
+		url(../fonts/source-sans-pro_400_italic.woff) format('woff'),
+		url(../fonts/source-sans-pro_400_italic.ttf) format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-weight: 600;
+	src: local('SourceSansPro-SemiBoldItalic'), local('Source Sans Pro SemiBold Italic'),
+		url(../fonts/source-sans-pro_600_italic.woff2) format('woff2'),
+		url(../fonts/source-sans-pro_600_italic.woff) format('woff'),
+		url(../fonts/source-sans-pro_600_italic.ttf) format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 300;
+	src: local('SourceSansPro-Light'), local('Source Sans Pro Light'),
+		url(../fonts/source-sans-pro_300_normal.woff2) format('woff2'),
+		url(../fonts/source-sans-pro_300_normal.woff) format('woff'),
+		url(../fonts/source-sans-pro_300_normal.ttf) format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 400;
+	src: url(../fonts/source-sans-pro_400_normal.eot);
+	src: local('SourceSansPro-Regular'), local('Source Sans Pro Regular'),
+		url(../fonts/source-sans-pro_400_normal.woff2) format('woff2'),
+		url(../fonts/source-sans-pro_400_normal.woff) format('woff'),
+		url(../fonts/source-sans-pro_400_normal.ttf) format('truetype'),
+		url(../fonts/source-sans-pro_400_normal.eot?#iefix) format('embedded-opentype'),
+		url(../fonts/source-sans-pro_400_normal.svg) format('svg');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 600;
+	src: local('SourceSansPro-SemiBold'), local('Source Sans Pro SemiBold'),
+		url(../fonts/source-sans-pro_600_normal.woff2) format('woff2'),
+		url(../fonts/source-sans-pro_600_normal.woff) format('woff'),
+		url(../fonts/source-sans-pro_600_normal.ttf) format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 700;
+	src: local('SourceSansPro-Bold'), local('Source Sans Pro Bold'),
+		url(../fonts/source-sans-pro_700_normal.woff2) format('woff2'),
+		url(../fonts/source-sans-pro_700_normal.woff) format('woff'),
+		url(../fonts/source-sans-pro_700_normal.ttf) format('truetype');
+}